October 2020 - Wine-Commits

Zebediah Figura : ntdll: Semi-stub SystemModuleInformationEx.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: ebd92b980a46d0ae5b1c211c7b0028565c9c147d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd92b980a46d0ae5b1c211c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:08 2020 -0500 ntdll: Semi-stub SystemModuleInformationEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45666 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/unix/system.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6805cfb6a8e..70ea7d5146b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -500,7 +500,7 @@ static void test_query_module(void) status = pNtQuerySystemInformation(SystemModuleInformationEx, NULL, 0, &size); if (status == STATUS_INVALID_INFO_CLASS) { - todo_wine win_skip("SystemModuleInformationEx is not supported.\n"); + win_skip("SystemModuleInformationEx is not supported.\n"); return; } ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 7ac084a9899..faa7532cfef 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2357,6 +2357,41 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemModuleInformationEx: + { + /* FIXME: return some fake info for now */ + static const char *fake_modules[] = + { + "\\SystemRoot\\system32\\ntoskrnl.exe", + "\\SystemRoot\\system32\\hal.dll", + "\\SystemRoot\\system32\\drivers\\mountmgr.sys" + }; + + ULONG i; + RTL_PROCESS_MODULE_INFORMATION_EX *module_info = info; + + len = sizeof(*module_info) * ARRAY_SIZE(fake_modules) + sizeof(module_info->NextOffset); + if (len <= size) + { + memset( info, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) + { + SYSTEM_MODULE *sm = &module_info[i].BaseInfo; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; + module_info[i].NextOffset = sizeof(*module_info); + } + module_info[ARRAY_SIZE(fake_modules)].NextOffset = 0; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + + break; + } + case SystemHandleInformation: { struct handle_info *handle_info;

1 0

Huw Davies : riched20: Use row and para ptrs in the ensure visible function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 1abbb78a0949f238cca4b8e09aa0c7ee085d1389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abbb78a0949f238cca4b8e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:29 2020 +0000 riched20: Use row and para ptrs in the ensure visible function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 10 ++++------ dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 25 ++++++++++++------------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6a8f1e1cd71..47fe77df922 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1176,13 +1176,11 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) if (editor->nSelectionType != stPosition && memcmp(&editor->pCursors[1], &editor->pCursors[3], sizeof(ME_Cursor))) - { /* The scroll the cursor towards the other end, since it was the one * extended by ME_ExtendAnchorSelection */ - ME_EnsureVisible(editor, &editor->pCursors[1]); - } else { - ME_EnsureVisible(editor, &editor->pCursors[0]); - } + editor_ensure_visible( editor, &editor->pCursors[1] ); + else + editor_ensure_visible( editor, &editor->pCursors[0] ); ME_InvalidateSelection(editor); update_caret(editor); @@ -1520,7 +1518,7 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_InvalidateSelection(editor); ME_Repaint(editor); hide_caret(editor); - ME_EnsureVisible(editor, &tmp_curs); + editor_ensure_visible( editor, &tmp_curs ); update_caret(editor); ME_SendSelChange(editor); return success; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6a2e96a3c7c..462245db233 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4095,7 +4095,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return len; } case EM_SCROLLCARET: - ME_EnsureVisible(editor, &editor->pCursors[0]); + editor_ensure_visible( editor, &editor->pCursors[0] ); return 0; case WM_SETFONT: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ba1e5c169ff..1a2346854e7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -242,7 +242,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLS void ME_Repaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_RewrapRepaint(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) DECLSPEC_HIDDEN; -void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) DECLSPEC_HIDDEN; +void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; void ME_InvalidateSelection(ME_TextEditor *editor) DECLSPEC_HIDDEN; BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator) DECLSPEC_HIDDEN; int ME_twips2pointsX(const ME_Context *c, int x) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0c37fc7c707..180307ae01b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -117,7 +117,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) ME_UpdateScrollBar(editor); /* Ensure that the cursor is visible */ - ME_EnsureVisible(editor, &editor->pCursors[0]); + editor_ensure_visible( editor, &editor->pCursors[0] ); ITextHost_TxViewChange(editor->texthost, update_now); @@ -1269,19 +1269,17 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } -void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) +void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_Run *pRun = &pCursor->pRun->member.run; - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - ME_DisplayItem *pPara = pCursor->pPara; + ME_Run *run = &cursor->pRun->member.run; + ME_Row *row = row_from_cursor( cursor ); + ME_Paragraph *para = &cursor->pPara->member.para; int x, y, yheight; - assert(pRow); - assert(pPara); if (editor->styleFlags & ES_AUTOHSCROLL) { - x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset, TRUE); + x = run->pt.x + ME_PointFromChar( editor, run, cursor->nOffset, TRUE ); if (x > editor->horz_si.nPos + editor->sizeWindow.cx) x = x + 1 - editor->sizeWindow.cx; else if (x > editor->horz_si.nPos) @@ -1292,14 +1290,15 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) ME_HScrollAbs(editor, x); return; } - } else { - if (~editor->styleFlags & ES_AUTOVSCROLL) - return; + } + else + { + if (~editor->styleFlags & ES_AUTOVSCROLL) return; x = editor->horz_si.nPos; } - y = pPara->member.para.pt.y + pRow->member.row.pt.y; - yheight = pRow->member.row.nHeight; + y = para->pt.y + row->pt.y; + yheight = row->nHeight; if (y < editor->vert_si.nPos) ME_ScrollAbs(editor, x, y);

1 0

Zebediah Figura : ntdll/tests: Add more tests for SystemModuleInformation[Ex].
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: bf9235aa56cb73275c7c76ac3a515fb2d66c943b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf9235aa56cb73275c7c76ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:07 2020 -0500 ntdll/tests: Add more tests for SystemModuleInformation[Ex]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 71 ++++++++++++++++++++++++++++++++++--------------- include/winternl.h | 9 +++++++ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b09c57b97a7..6805cfb6a8e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -469,37 +469,64 @@ static void test_query_procperf(void) static void test_query_module(void) { + const RTL_PROCESS_MODULE_INFORMATION_EX *infoex; + SYSTEM_MODULE_INFORMATION *info; NTSTATUS status; - ULONG ReturnLength; - ULONG ModuleCount, i; + ULONG size, i; + char *buffer; - ULONG SystemInformationLength = sizeof(SYSTEM_MODULE_INFORMATION); - SYSTEM_MODULE_INFORMATION* smi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); - SYSTEM_MODULE* sm; + status = pNtQuerySystemInformation(SystemModuleInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > 0, "expected nonzero size\n"); - /* Request the needed length */ - status = pNtQuerySystemInformation(SystemModuleInformation, smi, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); - ok( ReturnLength > 0, "Expected a ReturnLength to show the needed length\n"); + info = malloc(size); + status = pNtQuerySystemInformation(SystemModuleInformation, info, size, &size); + ok(!status, "got %#x\n", status); - SystemInformationLength = ReturnLength; - smi = HeapReAlloc(GetProcessHeap(), 0, smi , SystemInformationLength); - status = pNtQuerySystemInformation(SystemModuleInformation, smi, SystemInformationLength, &ReturnLength); - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(info->ModulesCount > 0, "Expected some modules to be loaded\n"); - ModuleCount = smi->ModulesCount; - sm = &smi->Modules[0]; - /* our implementation is a stub for now */ - ok( ModuleCount > 0, "Expected some modules to be loaded\n"); + for (i = 0; i < info->ModulesCount; i++) + { + const SYSTEM_MODULE *module = &info->Modules[i]; - /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ - for (i = 0; i < ModuleCount ; i++) + ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); + ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageSize, "%u: got 0 size\n", i); + ok(module->LoadCount, "%u: got 0 load count\n", i); + } + + free(info); + + status = pNtQuerySystemInformation(SystemModuleInformationEx, NULL, 0, &size); + if (status == STATUS_INVALID_INFO_CLASS) { - ok( i == sm->LoadOrderIndex, "LoadOrderIndex (%d) should have matched %u\n", sm->LoadOrderIndex, i); - sm++; + todo_wine win_skip("SystemModuleInformationEx is not supported.\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status); + ok(size > 0, "expected nonzero size\n"); + + buffer = malloc(size); + status = pNtQuerySystemInformation(SystemModuleInformationEx, buffer, size, &size); + ok(!status, "got %#x\n", status); + + infoex = (const void *)buffer; + for (i = 0; infoex->NextOffset; i++) + { + const SYSTEM_MODULE *module = &infoex->BaseInfo; + + ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); + ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageSize, "%u: got 0 size\n", i); + ok(module->LoadCount, "%u: got 0 load count\n", i); + + infoex = (const void *)((const char *)infoex + infoex->NextOffset); } + ok(((char *)infoex - buffer) + sizeof(infoex->NextOffset) == size, + "got size %u, null terminator %u\n", size, (char *)infoex - buffer); + + free(buffer); - HeapFree( GetProcessHeap(), 0, smi); } static void test_query_handle(void) diff --git a/include/winternl.h b/include/winternl.h index fbce63655ba..bd6a2c35932 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2805,6 +2805,15 @@ typedef struct _SYSTEM_MODULE_INFORMATION #define PROCESS_CREATE_FLAGS_SUSPENDED 0x00000200 #define PROCESS_CREATE_FLAGS_EXTENDED_UNKNOWN 0x00000400 +typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX +{ + USHORT NextOffset; + SYSTEM_MODULE BaseInfo; + ULONG ImageCheckSum; + ULONG TimeDateStamp; + void *DefaultBase; +} RTL_PROCESS_MODULE_INFORMATION_EX; + #define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 #define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 #define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004

1 0

Huw Davies : riched20: Fix the struct size check in the para fmt retrieval function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 9908c5d3c44b80552947096c97146609e98430e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9908c5d3c44b80552947096c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:30 2020 +0000 riched20: Fix the struct size check in the para fmt retrieval function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e1b848cf8f9..c7a0e271510 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -928,7 +928,8 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) ME_DisplayItem *para, *para_end; PARAFORMAT2 *curFmt; - if (pFmt->cbSize < sizeof(PARAFORMAT)) { + if (pFmt->cbSize < sizeof(PARAFORMAT)) + { pFmt->dwMask = 0; return; } @@ -951,13 +952,14 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent); CHECK_FIELD(PFM_OFFSET, dxOffset); CHECK_FIELD(PFM_ALIGNMENT, wAlignment); - if (pFmt->dwMask & PFM_TABSTOPS) { + if (pFmt->dwMask & PFM_TABSTOPS) + { if (pFmt->cTabCount != para->member.para.fmt.cTabCount || memcmp(pFmt->rgxTabs, curFmt->rgxTabs, curFmt->cTabCount*sizeof(int))) pFmt->dwMask &= ~PFM_TABSTOPS; } - if (pFmt->dwMask >= sizeof(PARAFORMAT2)) + if (pFmt->cbSize >= sizeof(PARAFORMAT2)) { pFmt->dwMask &= ~((pFmt->wEffects ^ curFmt->wEffects) << 16); CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore);

1 0

Derek Lesho : winegstreamer: Insert videoconvert into decoded-video streams.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 528e6870adaa934fdd1cf7d48343e82aeaa06905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528e6870adaa934fdd1cf7d4… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 13 10:26:42 2020 -0500 winegstreamer: Insert videoconvert into decoded-video streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 125 +++++++++++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5f3c43a0204..3371585328d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; +/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType + the user throws at us through gstreamer's caps negotiation. */ +static HRESULT media_stream_connect_to_sink(struct media_stream *stream) +{ + GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + const gchar *stream_type; + + if (!source_caps) + return E_FAIL; + + stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0)); + gst_caps_unref(source_caps); + + if (!strcmp(stream_type, "video/x-raw")) + { + GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), videoconvert); + + stream->my_sink = gst_element_get_static_pad(videoconvert, "sink"); + + if (!gst_element_link(videoconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(videoconvert); + } + else + { + stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink"); + } + + if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK) + return E_FAIL; + + return S_OK; +} + static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream) { struct media_stream *object = heap_alloc_zero(sizeof(*object)); @@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD g_object_set(object->appsink, "sync", FALSE, NULL); g_object_set(object->appsink, "max-buffers", 5, NULL); - object->my_sink = gst_element_get_static_pad(object->appsink, "sink"); - gst_pad_link(object->their_src, object->my_sink); + if (FAILED(hr = media_stream_connect_to_sink(object))) + goto fail; gst_element_sync_state_with_parent(object->appsink); @@ -435,28 +472,88 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); IMFMediaTypeHandler *type_handler; + IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; + DWORD type_count = 0; + const gchar *major_type; + unsigned int i; HRESULT hr; - stream_type = mf_media_type_from_caps(current_caps); - gst_caps_unref(current_caps); - if (!stream_type) - return E_FAIL; + major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0)); + + if (!strcmp(major_type, "video/x-raw")) + { + /* These are the most common native output types of decoders: + https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-… */ + static const GUID *const video_types[] = + { + &MFVideoFormat_NV12, + &MFVideoFormat_YV12, + &MFVideoFormat_YUY2, + &MFVideoFormat_IYUV, + &MFVideoFormat_I420, + }; - hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor); + IMFMediaType *base_type = mf_media_type_from_caps(current_caps); + GUID base_subtype; - IMFMediaType_Release(stream_type); + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - if (FAILED(hr)) - return hr; + stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1); - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - return hr; + stream_types[0] = base_type; + type_count = 1; - hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type); + for (i = 0; i < ARRAY_SIZE(video_types); i++) + { + IMFMediaType *new_type; - IMFMediaTypeHandler_Release(type_handler); + if (IsEqualGUID(&base_subtype, video_types[i])) + continue; + if (FAILED(hr = MFCreateMediaType(&new_type))) + goto done; + stream_types[type_count++] = new_type; + + if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i]))) + goto done; + } + } + else + { + stream_type = mf_media_type_from_caps(current_caps); + if (stream_type) + { + stream_types = &stream_type; + type_count = 1; + } + } + + if (!type_count) + { + ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); + return E_FAIL; + } + + if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + goto done; + + if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + goto done; + +done: + gst_caps_unref(current_caps); + if (type_handler) + IMFMediaTypeHandler_Release(type_handler); + for (i = 0; i < type_count; i++) + IMFMediaType_Release(stream_types[i]); + if (stream_types != &stream_type) + heap_free(stream_types); return hr; }

1 0

Myah Caron : ntdll: Stub NtAllocateVirtualMemoryEx.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: d453db5ba205fc687f48eae9d9a66afcaa4c5d93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d453db5ba205fc687f48eae9… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:44:17 2020 +0000 ntdll: Stub NtAllocateVirtualMemoryEx. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/virtual.c | 21 +++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ include/winternl.h | 1 + 4 files changed, 39 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca427c46c04..dbd2eab1fa1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -141,6 +141,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall -syscall NtAllocateVirtualMemory(long ptr long ptr long long) +@ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) @ stub NtCallbackReturn @@ -1146,6 +1147,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private -syscall ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory +@ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject @ stub ZwCallbackReturn diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7049f234a9f..9c2cf824018 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -34,6 +34,8 @@ static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, + MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); static SYSTEM_BASIC_INFORMATION sbi; @@ -215,6 +217,24 @@ static void test_NtAllocateVirtualMemory(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); + + if (!pNtAllocateVirtualMemoryEx) + { + win_skip("NtAllocateVirtualMemoryEx() is missing\n"); + return; + } + + /* simple allocation should succeed */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 0); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemoryEx returned %08x\n", status); + + /* specifying a count of >0 with NULL parameters should fail */ + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, NULL, 1); + ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } static void test_RtlCreateUserStack(void) @@ -648,6 +668,7 @@ START_TEST(virtual) pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack"); pRtlGetEnabledExtendedFeatures = (void *)GetProcAddress(mod, "RtlGetEnabledExtendedFeatures"); + pNtAllocateVirtualMemoryEx = (void *)GetProcAddress(mod, "NtAllocateVirtualMemoryEx"); NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d79e3de662e..614159b7d90 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3452,6 +3452,21 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z return status; } +/*********************************************************************** + * NtAllocateVirtualMemoryEx (NTDLL.@) + * ZwAllocateVirtualMemoryEx (NTDLL.@) + */ +NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) +{ + if (count && !parameters) return STATUS_INVALID_PARAMETER; + + if (count) FIXME( "Ignoring %d extended parameters %p\n", count, parameters ); + + return NtAllocateVirtualMemory( process, ret, 0, size_ptr, type, protect ); +} + /*********************************************************************** * NtFreeVirtualMemory (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index 89ea58c2d93..fbce63655ba 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS);

1 0

Myah Caron : include: Introduce MEM_EXTENDED_PARAMETER.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 3c8832711ea75f6a2b9d536050d21a6d39f96cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c8832711ea75f6a2b9d5360… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:43:47 2020 +0000 include: Introduce MEM_EXTENDED_PARAMETER. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 10b3253923b..1945ee82eab 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -736,6 +736,35 @@ typedef struct _MEMORY_BASIC_INFORMATION DWORD Type; } MEMORY_BASIC_INFORMATION, *PMEMORY_BASIC_INFORMATION; +#define MEM_EXTENDED_PARAMETER_TYPE_BITS 8 + +typedef enum MEM_EXTENDED_PARAMETER_TYPE { + MemExtendedParameterInvalidType = 0, + MemExtendedParameterAddressRequirements, + MemExtendedParameterNumaNode, + MemExtendedParameterPartitionHandle, + MemExtendedParameterUserPhysicalHandle, + MemExtendedParameterAttributeFlags, + MemExtendedParameterMax +} MEM_EXTENDED_PARAMETER_TYPE, *PMEM_EXTENDED_PARAMETER_TYPE; + +typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { + struct + { + DWORD64 Type : MEM_EXTENDED_PARAMETER_TYPE_BITS; + DWORD64 Reserved : 64 - MEM_EXTENDED_PARAMETER_TYPE_BITS; + } DUMMYSTRUCTNAME; + + union + { + DWORD64 ULong64; + PVOID Pointer; + SIZE_T Size; + HANDLE Handle; + DWORD ULong; + } DUMMYUNIONNAME; +} MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; + #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04

1 0

Derek Lesho : winegstreamer: Insert audioconvert into decoded audio streams.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 93107c08f5aa7f37ad7ece9cd7ca248dba3030ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=93107c08f5aa7f37ad7ece9c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Oct 8 16:49:04 2020 -0500 winegstreamer: Insert audioconvert into decoded audio streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3371585328d..0991710755c 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -410,6 +410,19 @@ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) gst_element_sync_state_with_parent(videoconvert); } + else if (!strcmp(stream_type, "audio/x-raw")) + { + GstElement *audioconvert = gst_element_factory_make("audioconvert", NULL); + + gst_bin_add(GST_BIN(stream->parent_source->container), audioconvert); + + stream->my_sink = gst_element_get_static_pad(audioconvert, "sink"); + + if (!gst_element_link(audioconvert, stream->appsink)) + return E_FAIL; + + gst_element_sync_state_with_parent(audioconvert); + } else { stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");

1 0

Myah Caron : kernelbase: Implement VirtualAlloc2.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: c55349f6c8aa12801666145f0e345fbe3e6e11c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55349f6c8aa12801666145f… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Sat Oct 17 01:44:52 2020 +0000 kernelbase: Implement VirtualAlloc2. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 15 +++++++++++++++ include/winbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9c7babde7fd..da35b5e5c6e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1672,6 +1672,7 @@ # @ stub VerifyPackageId # @ stub VerifyPackageRelativeApplicationId # @ stub VerifyScripts +@ stdcall VirtualAlloc2(long ptr long long long ptr long) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4ead38f2bc0..2bfd3893e8e 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -299,6 +299,21 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE process, void *addr, SIZE } +/*********************************************************************** + * VirtualAlloc2 (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, + MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + LPVOID ret = addr; + + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index f1c3198c21a..82797efc2b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2744,6 +2744,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDL WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG); #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD);

1 0

Giovanni Mascellani : d2d1: Implement D2D1SinCos().
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 4f6bd00a8495c80fd6faf940cef09e875bf1a5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6bd00a8495c80fd6faf940… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:27 2020 +0330 d2d1: Implement D2D1SinCos(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 8 ++++++++ dlls/d2d1/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..943347d7884 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,14 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + TRACE("angle %.8e, s %p, c %p.\n", angle, s, c); + + *s = sinf(angle); + *c = cosf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..df1df01c051 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,36 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + unsigned int i; + float s, c; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0f, 0.0f, 1.0f}, + {1.0f, 8.41470957e-001f, 5.40302277e-001f}, + {2.0f, 9.09297407e-001f, -4.16146845e-001f}, + {M_PI / 2.0f, 1.0f, -4.37113883e-008f}, + {M_PI, -8.74227766e-008f, -1.0f}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), + "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), + "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9507,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c);

1 0

Giovanni Mascellani : d2d1: Implement D2D1Tan().
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 9cf8fab9528f9e6bffd6d96073de2e0c919bd957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cf8fab9528f9e6bffd6d960… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:28 2020 +0330 d2d1: Implement D2D1Tan(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 23 ++++++++++++++++++++++- include/d2d1_1.idl | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 410abfa5de6..7b624c7096e 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -7,5 +7,5 @@ @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) -@ stub D2D1Tan +@ stdcall D2D1Tan(float) @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 943347d7884..9c5337590cd 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -721,6 +721,13 @@ void WINAPI D2D1SinCos(float angle, float *s, float *c) *c = cosf(angle); } +float WINAPI D2D1Tan(float angle) +{ + TRACE("angle %.8e.\n", angle); + + return tanf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index df1df01c051..b269770365f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9428,7 +9428,7 @@ static void test_wic_bitmap_format(void) static void test_math(void) { unsigned int i; - float s, c; + float s, c, t; static const struct { @@ -9445,6 +9445,20 @@ static void test_math(void) {M_PI, -8.74227766e-008f, -1.0f}, }; + static const struct + { + float x; + float t; + } + t_data[] = + { + {0.0f, 0.0f}, + {1.0f, 1.55740774f}, + {2.0f, -2.18503976f}, + {M_PI / 2.0f, -2.28773320e+007f}, + {M_PI, 8.74227766e-008f}, + }; + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { D2D1SinCos(sc_data[i].x, &s, &c); @@ -9453,6 +9467,13 @@ static void test_math(void) ok(compare_float(c, sc_data[i].c, 0), "Test %u: Got unexpected cos %.8e, expected %.8e.\n", i, c, sc_data[i].c); } + + for (i = 0; i < ARRAY_SIZE(t_data); ++i) + { + t = D2D1Tan(t_data[i].x); + ok(compare_float(t, t_data[i].t, 1), + "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); + } } START_TEST(d2d1) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 6fa893edbda..bd111bd6628 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -795,3 +795,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); +[local] float __stdcall D2D1Tan(float angle);

1 0

Zebediah Figura : ntdll: Stub NtQuerySystemInformation(SystemExtendedProcessInformation).
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: ab1469597ab3382059ce4ed99b1481fd692678f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab1469597ab3382059ce4ed9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 24 10:47:15 2020 -0500 ntdll: Stub NtQuerySystemInformation(SystemExtendedProcessInformation). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b85a3c7b6ad..6ff277c2d0c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2615,6 +2615,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedProcessInformation: + FIXME("SystemExtendedProcessInformation, size %u, info %p, stub!\n", size, info); + memset( info, 0, size ); + ret = STATUS_SUCCESS; + break; + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size );

1 0

Giovanni Mascellani : d2d1: Implement D2D1Vec3Length().
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 4905921fa587bb6c194134da43827d4723bd64e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4905921fa587bb6c194134da… Author: Giovanni Mascellani <wine(a)mascellani.eu> Date: Mon Oct 26 20:27:29 2020 +0330 d2d1: Implement D2D1Vec3Length(). Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 7 +++++++ dlls/d2d1/tests/d2d1.c | 27 ++++++++++++++++++++++++++- include/d2d1_1.idl | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 7b624c7096e..0ae894109fb 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -8,4 +8,4 @@ @ stub D2D1CreateDeviceContext @ stdcall D2D1SinCos(float ptr ptr) @ stdcall D2D1Tan(float) -@ stub D2D1Vec3Length +@ stdcall D2D1Vec3Length(float float float) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9c5337590cd..6b6eab766c7 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -728,6 +728,13 @@ float WINAPI D2D1Tan(float angle) return tanf(angle); } +float WINAPI D2D1Vec3Length(float x, float y, float z) +{ + TRACE("x %.8e, y %.8e, z %.8e.\n", x, y, z); + + return sqrtf(x * x + y * y + z * z); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b269770365f..d571cfe8d15 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9427,8 +9427,8 @@ static void test_wic_bitmap_format(void) static void test_math(void) { + float s, c, t, l; unsigned int i; - float s, c, t; static const struct { @@ -9459,6 +9459,24 @@ static void test_math(void) {M_PI, 8.74227766e-008f}, }; + static const struct + { + float x; + float y; + float z; + float l; + } + l_data[] = + { + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 1.0f, 1.73205078f}, + {1.0f, 2.0f, 2.0f, 3.0f}, + {1.0f, 2.0f, 3.0f, 3.74165750f}, + }; + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { D2D1SinCos(sc_data[i].x, &s, &c); @@ -9474,6 +9492,13 @@ static void test_math(void) ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } + + for (i = 0; i < ARRAY_SIZE(l_data); ++i) + { + l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + ok(compare_float(l, l_data[i].l, 0), + "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); + } } START_TEST(d2d1) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index bd111bd6628..6eab3959cd1 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -796,3 +796,4 @@ interface ID2D1Factory1 : ID2D1Factory const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); [local] void __stdcall D2D1SinCos(float angle, float *s, float *c); [local] float __stdcall D2D1Tan(float angle); +[local] float __stdcall D2D1Vec3Length(float x, float y, float z);

1 0

Nikolay Sivov : evr/mixer: Add IMFClockStateSink stub.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 21355680e50970ff1edf8af53a67c310e9f39b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21355680e50970ff1edf8af5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:21 2020 +0300 evr/mixer: Add IMFClockStateSink stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 86 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 59d75c0476b..20b5e3b2bba 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -74,6 +74,7 @@ struct video_mixer IMFVideoProcessor IMFVideoProcessor_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFClockStateSink IMFClockStateSink_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -153,6 +154,11 @@ static struct video_mixer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFQualityAdvise_iface); } +static struct video_mixer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFClockStateSink_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -251,6 +257,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFClockStateSink)) + { + *obj = &mixer->IMFClockStateSink_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2181,6 +2191,77 @@ static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = video_mixer_quality_advise_DropTime, }; +static HRESULT WINAPI video_mixer_clock_state_sink_QueryInterface(IMFClockStateSink *iface, + REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_clock_state_sink_AddRef(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_clock_state_sink_Release(IMFClockStateSink *iface) +{ + struct video_mixer *mixer = impl_from_IMFClockStateSink(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStart(IMFClockStateSink *iface, + MFTIME systime, LONGLONG offset) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockStop(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockPause(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockRestart(IMFClockStateSink *iface, + MFTIME systime) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_clock_state_sink_OnClockSetRate(IMFClockStateSink *iface, + MFTIME systime, float rate) +{ + FIXME("%p, %f.\n", iface, rate); + + return E_NOTIMPL; +} + +static const IMFClockStateSinkVtbl video_mixer_clock_state_sink_vtbl = +{ + video_mixer_clock_state_sink_QueryInterface, + video_mixer_clock_state_sink_AddRef, + video_mixer_clock_state_sink_Release, + video_mixer_clock_state_sink_OnClockStart, + video_mixer_clock_state_sink_OnClockStop, + video_mixer_clock_state_sink_OnClockPause, + video_mixer_clock_state_sink_OnClockRestart, + video_mixer_clock_state_sink_OnClockSetRate, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -2212,6 +2293,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_mixer_quality_advise_vtbl; + object->IMFClockStateSink_iface.lpVtbl = &video_mixer_clock_state_sink_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0158a0320a7..8c82ae34f8d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -465,6 +465,10 @@ static void test_default_mixer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFClockStateSink, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Alistair Leslie-Hughes : include: Add missing DBPARAM* types and enums.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 026ccc44a6dc469d32fc361e490f1b8171eff24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=026ccc44a6dc469d32fc361e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 26 18:19:45 2020 +1100 include: Add missing DBPARAM* types and enums. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 65fd5b1d365..63617c88c00 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -800,3 +800,28 @@ typedef struct tagDBCOLUMNINFO { BYTE bScale; DBID columnid; } DBCOLUMNINFO; + +typedef DWORD DBPARAMFLAGS; + +enum DBPARAMFLAGSENUM { + DBPARAMFLAGS_ISINPUT = 0x001, + DBPARAMFLAGS_ISOUTPUT = 0x002, + DBPARAMFLAGS_ISSIGNED = 0x010, + DBPARAMFLAGS_ISNULLABLE = 0x040, + DBPARAMFLAGS_ISLONG = 0x080 +}; + +enum DBPARAMFLAGSENUM20 { + DBPARAMFLAGS_SCALEISNEGATIVE = 0x100 +}; + +typedef struct tagDBPARAMINFO { + DBPARAMFLAGS dwFlags; + DBORDINAL iOrdinal; + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBLENGTH ulParamSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBPARAMINFO;

1 0

Gijs Vermeulen : include: Add INetworkEvents and some enums to netlistmgr.idl.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 1c4350ac8f98d552ca264408a22c454bd5c5438a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4350ac8f98d552ca264408… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 14:52:20 2020 +0100 include: Add INetworkEvents and some enums to netlistmgr.idl. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netlistmgr.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/netlistmgr.idl b/include/netlistmgr.idl index e098f7225ab..d12b4a5f4b7 100644 --- a/include/netlistmgr.idl +++ b/include/netlistmgr.idl @@ -27,10 +27,26 @@ interface IEnumNetworks; interface IEnumNetworkConnections; interface INetwork; interface INetworkConnection; +interface INetworkConnectionEvents; interface INetworkCostManager; +interface INetworkEvents; interface INetworkListManager; interface INetworkListManagerEvents; +typedef [v1_enum] enum NLM_NETWORK_CLASS +{ + NLM_NETWORK_IDENTIFYING = 0x01, + NLM_NETWORK_IDENTIFIED = 0x02, + NLM_NETWORK_UNIDENTIFIED = 0x03 +} NLM_NETWORK_CLASS; + +typedef [v1_enum] enum NLM_INTERNET_CONNECTIVITY +{ + NLM_INTERNET_CONNECTIVITY_WEBHIJACK = 0x01, + NLM_INTERNET_CONNECTIVITY_PROXIED = 0x02, + NLM_INTERNET_CONNECTIVITY_CORPORATE = 0x04 +} NLM_INTERNET_CONNECTIVITY; + typedef [v1_enum] enum NLM_CONNECTIVITY { NLM_CONNECTIVITY_DISCONNECTED = 0x0000, @@ -390,3 +406,35 @@ interface INetwork : IDispatch HRESULT SetCategory( [in] NLM_NETWORK_CATEGORY NewCategory); } + +[ + object, + oleautomation, + pointer_default(unique), + uuid(dcb00004-570f-4a9b-8d69-199fdba5723b) +] +interface INetworkEvents : IUnknown +{ + typedef enum NLM_NETWORK_PROPERTY_CHANGE + { + NLM_NETWORK_PROPERTY_CHANGE_CONNECTION = 0x01, + NLM_NETWORK_PROPERTY_CHANGE_DESCRIPTION = 0x02, + NLM_NETWORK_PROPERTY_CHANGE_NAME = 0x04, + NLM_NETWORK_PROPERTY_CHANGE_ICON = 0x08, + NLM_NETWORK_PROPERTY_CHANGE_CATEGORY_VALUE = 0x10 + } NLM_NETWORK_PROPERTY_CHANGE; + + HRESULT NetworkAdded ( + [in] GUID networkId); + + HRESULT NetworkDeleted ( + [in] GUID networkId); + + HRESULT NetworkConnectivityChanged ( + [in] GUID networkId, + [in] NLM_CONNECTIVITY newConnectivity); + + HRESULT NetworkPropertyChanged( + [in] GUID networkId, + [in] NLM_NETWORK_PROPERTY_CHANGE flags); +}

1 0

Nikolay Sivov : mf/evr: Notify mixer and presenter on clock state changes.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 8680afcc06832d709c3e3b20d6801bc0d1de353e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8680afcc06832d709c3e3b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:22 2020 +0300 mf/evr: Notify mixer and presenter on clock state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 68 +++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 537d859d229..1b18e1c07a3 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -860,7 +860,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, *stream = &renderer->streams[i]->IMFStreamSink_iface; IMFStreamSink_AddRef(*stream); } - } LeaveCriticalSection(&renderer->cs); @@ -1382,21 +1381,30 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink * EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + if (renderer->state == EVR_STATE_STOPPED) { - struct video_stream *stream = renderer->streams[i]; + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; - EnterCriticalSection(&stream->cs); - if (!(stream->flags & EVR_STREAM_PREROLLED)) - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, - &GUID_NULL, S_OK, NULL); - stream->flags |= EVR_STREAM_PREROLLED; - LeaveCriticalSection(&stream->cs); + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + if (!(stream->flags & EVR_STREAM_PREROLLED)) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + stream->flags |= EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } } + renderer->state = EVR_STATE_RUNNING; + IMFVideoPresenter_OnClockStart(renderer->presenter, systime, offset); + LeaveCriticalSection(&renderer->cs); return S_OK; @@ -1411,16 +1419,28 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *i EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + IMFVideoPresenter_OnClockStop(renderer->presenter, systime); + + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_COMMAND_FLUSH, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_FLUSH, 0); + + if (renderer->state == EVR_STATE_RUNNING || + renderer->state == EVR_STATE_PAUSED) { - struct video_stream *stream = renderer->streams[i]; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_ENDSTREAMING, 0); - EnterCriticalSection(&stream->cs); - stream->flags &= ~EVR_STREAM_PREROLLED; - LeaveCriticalSection(&stream->cs); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); + + EnterCriticalSection(&stream->cs); + stream->flags &= ~EVR_STREAM_PREROLLED; + LeaveCriticalSection(&stream->cs); + } + renderer->state = EVR_STATE_STOPPED; } - renderer->state = EVR_STATE_STOPPED; LeaveCriticalSection(&renderer->cs); @@ -1436,11 +1456,17 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockPause(IMFClockStateSink * EnterCriticalSection(&renderer->cs); - for (i = 0; i < renderer->stream_count; ++i) + IMFVideoPresenter_OnClockPause(renderer->presenter, systime); + + if (renderer->state == EVR_STATE_RUNNING) { - struct video_stream *stream = renderer->streams[i]; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPaused, &GUID_NULL, S_OK, NULL); + } } + renderer->state = EVR_STATE_PAUSED; LeaveCriticalSection(&renderer->cs); @@ -1457,6 +1483,8 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink EnterCriticalSection(&renderer->cs); + IMFVideoPresenter_OnClockRestart(renderer->presenter, systime); + for (i = 0; i < renderer->stream_count; ++i) { struct video_stream *stream = renderer->streams[i];

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: ef8acacaefe6aa5415366fc77824ab3515a74e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8acacaefe6aa5415366fc7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:20 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 6 +++--- dlls/quartz/vmr9.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9c70926330e..39592afce66 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -257,7 +257,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); @@ -290,7 +290,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); @@ -317,7 +317,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aa4187404c6..fb5a846c24b 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -613,7 +613,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter)) *out = &filter->IVMRMonitorConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 08166d7a2d076c27aa963b032c1871a1bf97df64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08166d7a2d076c27aa963b03… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:19 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7eafe53be8..9c70926330e 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -253,7 +253,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE); + check_interface(filter, &IID_IVMRFilterConfig9, FALSE); check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); check_interface(filter, &IID_IVMRMixerControl9, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5f95f547e33..aa4187404c6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -605,7 +605,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMFilterMiscFlags_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) *out = &filter->IVMRFilterConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) *out = &filter->IVMRMixerBitmap9_iface;

1 0

Alexandre Julliard : gdi32: Move the Add/RemoveFontResource() implementation out of freetype.c.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 047bf2522304c8b5772902404f7683d4b746fe08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=047bf2522304c8b577290240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:04:36 2020 +0100 gdi32: Move the Add/RemoveFontResource() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 110 ++++++++++++++++++++++++++++++++++++++--------- dlls/gdi32/freetype.c | 86 +++++++----------------------------- dlls/gdi32/gdi_private.h | 11 ++++- 3 files changed, 114 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=047bf2522304c8b57729…

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig9 in renderless mode.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: f708161a478072d06866003a2c1e75e51736371f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f708161a478072d06866003a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:21 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig9 in renderless mode. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d09caea14e..7f8ce5b26f4 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -322,7 +322,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo2, FALSE); todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index fb5a846c24b..8bad3f5bdb7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -613,7 +613,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) + && filter->mode != VMR9Mode_Renderless && is_vmr9(filter)) *out = &filter->IVMRMonitorConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))

1 0

Nikolay Sivov : mf/evr: Implement OnClockSetRate().
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 0ca0b5a5ef9488d0b8de1191c2ad075fceeeee15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca0b5a5ef9488d0b8de1191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 26 17:20:23 2020 +0300 mf/evr: Implement OnClockSetRate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 1b18e1c07a3..e408b204304 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1499,9 +1499,23 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockRestart(IMFClockStateSink static HRESULT WINAPI video_renderer_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) { - FIXME("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + IMFClockStateSink *sink; - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); + + EnterCriticalSection(&renderer->cs); + + IMFVideoPresenter_OnClockSetRate(renderer->presenter, systime, rate); + if (SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFClockStateSink, (void **)&sink))) + { + IMFClockStateSink_OnClockSetRate(sink, systime, rate); + IMFClockStateSink_Release(sink); + } + + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static const IMFClockStateSinkVtbl video_renderer_clock_sink_vtbl =

1 0

Alexandre Julliard : gdi32: Move the text metrics cache into the generic font structure.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: e0872b64243d651c35c16b493971d2c785b8d997 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0872b64243d651c35c16b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 11:43:24 2020 +0100 gdi32: Move the text metrics cache into the generic font structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 159 +++++++++++++++- dlls/gdi32/freetype.c | 484 ++++++++++++++--------------------------------- dlls/gdi32/gdi_private.h | 10 +- 3 files changed, 298 insertions(+), 355 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0872b64243d651c35c1…

1 0

Alexandre Julliard : gdi32: Move the kerning pairs data into the generic font structure.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: df335e3405c19fb9e91c1fd696bb58892aab30c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df335e3405c19fb9e91c1fd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 11:50:07 2020 +0100 gdi32: Move the kerning pairs data into the generic font structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 18 +++++++++++++++--- dlls/gdi32/freetype.c | 49 +++++++++++------------------------------------- dlls/gdi32/gdi_private.h | 4 +++- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6fe211eac3d..27aa129c0de 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -426,6 +426,7 @@ struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_ font->refcount = 1; font->matrix.eM11 = font->matrix.eM22 = 1.0; font->scale_y = 1.0; + font->kern_count = -1; if (file) { @@ -468,6 +469,7 @@ void free_gdi_font( struct gdi_font *font ) HeapFree( GetProcessHeap(), 0, font->otm.otmpFaceName ); HeapFree( GetProcessHeap(), 0, font->otm.otmpFullName ); HeapFree( GetProcessHeap(), 0, font->gm ); + HeapFree( GetProcessHeap(), 0, font->kern_pairs ); HeapFree( GetProcessHeap(), 0, font ); } @@ -1179,17 +1181,27 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, static DWORD CDECL font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR *pairs ) { struct font_physdev *physdev = get_font_dev( dev ); - DWORD ret; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetKerningPairs ); return dev->funcs->pGetKerningPairs( dev, count, pairs ); } + EnterCriticalSection( &font_cs ); - ret = font_funcs->pGetKerningPairs( physdev->font, count, pairs ); + if (physdev->font->kern_count == -1) + physdev->font->kern_count = font_funcs->get_kerning_pairs( physdev->font, + &physdev->font->kern_pairs ); LeaveCriticalSection( &font_cs ); - return ret; + + if (count && pairs) + { + count = min( count, physdev->font->kern_count ); + memcpy( pairs, physdev->font->kern_pairs, count * sizeof(*pairs) ); + } + else count = physdev->font->kern_count; + + return count; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 01a66600063..16fb92dd73b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -302,8 +302,6 @@ typedef struct { struct tagGdiFont { struct gdi_font *gdi_font; - DWORD total_kern_pairs; - KERNINGPAIR *kern_pairs; struct list child_fonts; /* the following members can be accessed without locking, they are never modified after creation */ @@ -4021,8 +4019,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) { GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - ret->total_kern_pairs = (DWORD)-1; - ret->kern_pairs = NULL; list_init(&ret->child_fonts); ret->gdi_font = font; font->private = ret; @@ -4048,7 +4044,6 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); - HeapFree(GetProcessHeap(), 0, font->kern_pairs); HeapFree(GetProcessHeap(), 0, font->GSUB_Table); HeapFree(GetProcessHeap(), 0, font); } @@ -7458,31 +7453,18 @@ static DWORD parse_format0_kern_subtable(GdiFont *font, } /************************************************************* - * freetype_GetKerningPairs + * freetype_get_kerning_pairs */ -static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cPairs, KERNINGPAIR *kern_pair ) +static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *gdi_font, KERNINGPAIR **pairs ) { GdiFont *font = get_font_ptr(gdi_font); - DWORD length; + DWORD length, count = 0; void *buf; const struct TT_kern_table *tt_kern_table; const struct TT_kern_subtable *tt_kern_subtable; USHORT i, nTables; USHORT *glyph_to_char; - if (font->total_kern_pairs != (DWORD)-1) - { - if (cPairs && kern_pair) - { - cPairs = min(cPairs, font->total_kern_pairs); - memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - } - else cPairs = font->total_kern_pairs; - return cPairs; - } - - font->total_kern_pairs = 0; - length = freetype_get_font_data(gdi_font, MS_KERN_TAG, 0, NULL, 0); if (length == GDI_ERROR) @@ -7563,21 +7545,19 @@ static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cP */ if (tt_kern_subtable_copy.coverage.bits.format == 0) { - DWORD new_chunk, old_total = font->total_kern_pairs; + DWORD new_chunk, old_total = count; new_chunk = parse_format0_kern_subtable(font, (const struct TT_format0_kern_subtable *)(tt_kern_subtable + 1), glyph_to_char, NULL, 0); - font->total_kern_pairs += new_chunk; + count += new_chunk; - if (!font->kern_pairs) - font->kern_pairs = HeapAlloc(GetProcessHeap(), 0, - font->total_kern_pairs * sizeof(*font->kern_pairs)); + if (!*pairs) + *pairs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(**pairs)); else - font->kern_pairs = HeapReAlloc(GetProcessHeap(), 0, font->kern_pairs, - font->total_kern_pairs * sizeof(*font->kern_pairs)); + *pairs = HeapReAlloc(GetProcessHeap(), 0, *pairs, count * sizeof(**pairs)); parse_format0_kern_subtable(font, (const struct TT_format0_kern_subtable *)(tt_kern_subtable + 1), - glyph_to_char, font->kern_pairs + old_total, new_chunk); + glyph_to_char, *pairs + old_total, new_chunk); } else TRACE("skipping kerning table format %u\n", tt_kern_subtable_copy.coverage.bits.format); @@ -7587,14 +7567,7 @@ static DWORD CDECL freetype_GetKerningPairs( struct gdi_font *gdi_font, DWORD cP HeapFree(GetProcessHeap(), 0, glyph_to_char); HeapFree(GetProcessHeap(), 0, buf); - - if (cPairs && kern_pair) - { - cPairs = min(cPairs, font->total_kern_pairs); - memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - } - else cPairs = font->total_kern_pairs; - return cPairs; + return count; } static const struct font_backend_funcs font_funcs = @@ -7603,7 +7576,6 @@ static const struct font_backend_funcs font_funcs = freetype_FontIsLinked, freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, - freetype_GetKerningPairs, freetype_SelectFont, freetype_AddFontResourceEx, freetype_RemoveFontResourceEx, @@ -7616,6 +7588,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_outline, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, + freetype_get_kerning_pairs, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1f744d1bf2b..8036dfb986b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -313,6 +313,8 @@ struct gdi_font DWORD gm_size; struct glyph_metrics **gm; OUTLINETEXTMETRICW otm; + KERNINGPAIR *kern_pairs; + int kern_count; /* the following members can be accessed without locking, they are never modified after creation */ void *private; /* font backend private data */ DWORD handle; @@ -359,7 +361,6 @@ struct font_backend_funcs BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); - DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *pAddFontResourceEx)( LPCWSTR file, DWORD flags, PVOID pdv ); @@ -377,6 +378,7 @@ struct font_backend_funcs GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); + DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair ); void (CDECL *destroy_font)( struct gdi_font *font ); };

1 0

Alexandre Julliard : gdi32: Move the fonts directory helper functions out of freetype.c.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: f3a75923a671e5bc07eaec43c79369e0b8974e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a75923a671e5bc07eaec43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:03:21 2020 +0100 gdi32: Move the fonts directory helper functions out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/font.c | 43 ++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 60 +++++++----------------------------------------- dlls/gdi32/gdi_private.h | 4 ++++ 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a94abad599d..3b78f5e132f 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -52,4 +52,4 @@ C_SRCS = \ RC_SRCS = gdi32.rc -freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" +font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 27aa129c0de..2331c7cf784 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -350,6 +350,49 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifndef WINE_FONT_DIR +#define WINE_FONT_DIR "fonts" +#endif + +void get_font_dir( WCHAR *path ) +{ + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + + if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) + { + const char fontdir[] = WINE_FONT_DIR; + strcatW( path, slashW ); + MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); + } + else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) + { + strcatW( path, fontsW ); + } + if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); + else path[1] = '\\'; /* change \??\ to \\?\ */ +} + +void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) +{ + static const WCHAR slashW[] = {'\\',0}; + + get_font_dir( path ); + strcatW( path, slashW ); + strcatW( path, file ); +} + +void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) +{ + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + + GetWindowsDirectoryW( path, MAX_PATH ); + strcatW( path, fontsW ); + strcatW( path, file ); +} + /* realized font objects */ #define FIRST_FONT_HANDLE 1 diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 16fb92dd73b..7129acfeb5c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -225,10 +225,6 @@ MAKE_FUNCPTR(FcPatternGetString); #define GASP_GRIDFIT 0x01 #define GASP_DOGRAY 0x02 -#ifndef WINE_FONT_DIR -#define WINE_FONT_DIR "fonts" -#endif - /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -2858,46 +2854,6 @@ static void load_mac_fonts(void) #endif -static void get_font_dir( WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; - static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; - static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - - if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) - { - const char fontdir[] = WINE_FONT_DIR; - strcatW( path, slashW ); - MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); - } - else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) - { - strcatW( path, fontsW ); - } - if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); - else path[1] = '\\'; /* change \??\ to \\?\ */ -} - -static void get_data_dir_path( LPCWSTR file, WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\','\0'}; - - get_font_dir( path ); - strcatW( path, slashW ); - strcatW( path, file ); -} - -static void get_winfonts_dir_path(LPCWSTR file, WCHAR *path) -{ - static const WCHAR slashW[] = {'\\','\0'}; - - GetWindowsDirectoryW(path, MAX_PATH); - strcatW(path, fontsW); - strcatW(path, slashW); - strcatW(path, file); -} - static void load_system_fonts(void) { HKEY hkey; @@ -2910,10 +2866,10 @@ static void load_system_fonts(void) dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && type == REG_SZ) { - get_winfonts_dir_path( data, pathW ); + get_fonts_win_dir_path( data, pathW ); if (!add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) { - get_data_dir_path( data, pathW ); + get_fonts_data_dir_path( data, pathW ); add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); } } @@ -3110,12 +3066,12 @@ static INT CDECL freetype_AddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ - get_winfonts_dir_path( file, path ); + get_fonts_win_dir_path( file, path ); ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); /* Try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ if (!ret) { - get_data_dir_path( file, path ); + get_fonts_data_dir_path( file, path ); ret = add_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); } } @@ -3163,11 +3119,11 @@ static BOOL CDECL freetype_RemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID if (!ret && !strchrW(file, '\\')) { - get_winfonts_dir_path( file, path ); + get_fonts_win_dir_path( file, path ); ret = remove_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); if (!ret) { - get_data_dir_path( file, path ); + get_fonts_data_dir_path( file, path ); ret = remove_font_resource( path, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); } } @@ -3615,10 +3571,10 @@ static void init_font_list(void) { WCHAR pathW[MAX_PATH]; - get_winfonts_dir_path( data, pathW ); + get_fonts_win_dir_path( data, pathW ); if (!add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) { - get_data_dir_path( data, pathW ); + get_fonts_data_dir_path( data, pathW ); add_font_resource( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); } } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8036dfb986b..d7680464b6a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -382,6 +382,10 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; +extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; +extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; +extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; + extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the AddFontMemResourceEx() implementation out of freetype.c.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: f6d9908e4864efd59e26c41129aeef6880c53b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d9908e4864efd59e26c411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 12:05:19 2020 +0100 gdi32: Move the AddFontMemResourceEx() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 44 +++++++++++++++++++++++++++++--------------- dlls/gdi32/freetype.c | 35 +++++++++-------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2e926fa52fc..af87c66498f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5429,34 +5429,48 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) /*********************************************************************** * AddFontMemResourceEx (GDI32.@) */ -HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) +HANDLE WINAPI AddFontMemResourceEx( PVOID ptr, DWORD size, PVOID pdv, DWORD *pcFonts ) { HANDLE ret; DWORD num_fonts; + void *copy; - if (!pbFont || !cbFont || !pcFonts) + if (!ptr || !size || !pcFonts) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } if (!font_funcs) return NULL; + if (!(copy = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + memcpy( copy, ptr, size ); + EnterCriticalSection( &font_cs ); - ret = font_funcs->pAddFontMemResourceEx( pbFont, cbFont, pdv, &num_fonts ); + num_fonts = font_funcs->add_mem_font( copy, size, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); LeaveCriticalSection( &font_cs ); - if (ret) + + if (!num_fonts) { - __TRY - { - *pcFonts = num_fonts; - } - __EXCEPT_PAGE_FAULT - { - WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); - RemoveFontMemResourceEx(ret); - ret = 0; - } - __ENDTRY + HeapFree( GetProcessHeap(), 0, copy ); + return NULL; + } + + /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? + * For now return something unique but quite random + */ + ret = (HANDLE)((INT_PTR)copy ^ 0x87654321); + + __TRY + { + *pcFonts = num_fonts; + } + __EXCEPT_PAGE_FAULT + { + WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); + RemoveFontMemResourceEx( ret ); + ret = 0; } + __ENDTRY + TRACE( "Returning handle %p\n", ret ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 286af040355..9ed6077443f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2107,6 +2107,14 @@ static INT CDECL freetype_add_font( const WCHAR *file, DWORD flags ) return ret; } +/************************************************************* + * freetype_add_mem_font + */ +static INT CDECL freetype_add_mem_font( void *ptr, SIZE_T size, DWORD flags ) +{ + return AddFontToList( NULL, NULL, ptr, size, flags ); +} + /************************************************************* * freetype_remove_font */ @@ -3049,31 +3057,6 @@ static void delete_external_font_keys(void) if(winnt_key) RegCloseKey(winnt_key); } -/************************************************************* - * freetype_AddFontMemResourceEx - * - */ -static HANDLE CDECL freetype_AddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) -{ - PVOID pFontCopy = HeapAlloc(GetProcessHeap(), 0, cbFont); - - TRACE("Copying %d bytes of data from %p to %p\n", cbFont, pbFont, pFontCopy); - memcpy(pFontCopy, pbFont, cbFont); - - *pcFonts = AddFontToList(NULL, NULL, pFontCopy, cbFont, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); - if (*pcFonts == 0) - { - TRACE("AddFontToList failed\n"); - HeapFree(GetProcessHeap(), 0, pFontCopy); - return 0; - } - /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? - * For now return something unique but quite random - */ - TRACE("Returning handle %lx\n", ((INT_PTR)pFontCopy)^0x87654321); - return (HANDLE)(((INT_PTR)pFontCopy)^0x87654321); -} - static WCHAR *get_ttf_file_name( LPCWSTR font_file, LPCWSTR font_path ) { WCHAR *fullname; @@ -7477,9 +7460,9 @@ static const struct font_backend_funcs font_funcs = freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, freetype_SelectFont, - freetype_AddFontMemResourceEx, freetype_CreateScalableFontResource, freetype_add_font, + freetype_add_mem_font, freetype_remove_font, freetype_alloc_font, freetype_get_font_data, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4fd59cfd9bc..32cdace5c7d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,10 +370,10 @@ struct font_backend_funcs DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); - HANDLE (CDECL *pAddFontMemResourceEx)( void *font, DWORD size, PVOID pdv, DWORD *count ); BOOL (CDECL *pCreateScalableFontResource)( DWORD hidden, LPCWSTR resource, LPCWSTR font_file, LPCWSTR font_path ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); + INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); BOOL (CDECL *alloc_font)( struct gdi_font *font );

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 80fa0b93a69a8784d35fc672136240fa701595be URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fa0b93a69a8784d35fc672… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:22 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7f8ce5b26f4..b682aa10adf 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -254,7 +254,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8bad3f5bdb7..5bbc107cc2d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -603,7 +603,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface;

1 0

Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: a6d1ee860c620e802f2f3619bb495704c7e80d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d1ee860c620e802f2f3619… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:23 2020 +0100 quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index b682aa10adf..df18bd5f2d5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig, FALSE); check_interface(filter, &IID_IVMRMixerBitmap, FALSE); check_interface(filter, &IID_IVMRMixerControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5bbc107cc2d..a24dbc62977 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -611,7 +611,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count) *out = &filter->IVMRMixerControl9_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig) && !is_vmr9(filter)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && filter->mode != VMR9Mode_Renderless && is_vmr9(filter))

1 0

Michael Stefaniuc : wmic: Use wide-char string literals.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 0269297091da259b5fe6f46ec4f96f3371d1d7fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0269297091da259b5fe6f46e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 25 23:40:42 2020 +0100 wmic: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 81 ++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f31a69a4241..1372c0986e9 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -31,36 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmic); -static const WCHAR biosW[] = - {'b','i','o','s',0}; -static const WCHAR computersystemW[] = - {'c','o','m','p','u','t','e','r','s','y','s','t','e','m',0}; -static const WCHAR cpuW[] = - {'c','p','u',0}; -static const WCHAR logicaldiskW[] = - {'L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR nicW[] = - {'n','i','c',0}; -static const WCHAR osW[] = - {'o','s',0}; -static const WCHAR processW[] = - {'p','r','o','c','e','s','s',0}; - -static const WCHAR win32_biosW[] = - {'W','i','n','3','2','_','B','I','O','S',0}; -static const WCHAR win32_computersystemW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; -static const WCHAR win32_logicaldiskW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR win32_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; -static const WCHAR win32_operatingsystemW[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR win32_processW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; -static const WCHAR win32_processorW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; - static const struct { const WCHAR *alias; @@ -68,13 +38,13 @@ static const struct } alias_map[] = { - { biosW, win32_biosW }, - { computersystemW, win32_computersystemW }, - { cpuW, win32_processorW }, - { logicaldiskW, win32_logicaldiskW }, - { nicW, win32_networkadapterW }, - { osW, win32_operatingsystemW }, - { processW, win32_processW } + { L"bios", L"Win32_BIOS" }, + { L"computersystem", L"Win32_ComputerSystem" }, + { L"cpu", L"Win32_Processor" }, + { L"LogicalDisk", L"Win32_LogicalDisk" }, + { L"nic", L"Win32_NetworkAdapter" }, + { L"os", L"Win32_OperatingSystem" }, + { L"process", L"Win32_Process" } }; static const WCHAR *find_class( const WCHAR *alias ) @@ -139,21 +109,20 @@ static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) static int output_error( int msg ) { - static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); - return output_string( GetStdHandle(STD_ERROR_HANDLE), fmtW, buffer ); + return output_string( GetStdHandle(STD_ERROR_HANDLE), L"%s", buffer ); } static int output_header( const WCHAR *prop, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}, fmtW[] = {'%','-','*','s','\r','\n',0}; + static const WCHAR bomW[] = {0xfeff}; int len; DWORD count; WCHAR buffer[8192]; - len = swprintf( buffer, ARRAY_SIZE(buffer), fmtW, column_width, prop ); + len = swprintf( buffer, ARRAY_SIZE(buffer), L"%-*s\r\n", column_width, prop ); if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ { @@ -167,15 +136,11 @@ static int output_header( const WCHAR *prop, ULONG column_width ) static int output_line( const WCHAR *str, ULONG column_width ) { - static const WCHAR fmtW[] = {'%','-','*','s','\r','\n',0}; - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), fmtW, column_width, str ); + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s\r\n", column_width, str ); } static int query_prop( const WCHAR *class, const WCHAR *propname ) { - static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - static const WCHAR wqlW[] = {'W','Q','L',0}; HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; @@ -199,16 +164,16 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) (void **)&locator ); if (hr != S_OK) goto done; - if (!(path = SysAllocString( cimv2W ))) goto done; + if (!(path = SysAllocString(L"ROOT\\CIMV2" ))) goto done; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = lstrlenW( class ) + ARRAY_SIZE(select_allW); + len = lstrlenW( class ) + ARRAY_SIZE(L"SELECT * FROM "); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - lstrcpyW( query, select_allW ); + lstrcpyW( query, L"SELECT * FROM " ); lstrcatW( query, class ); - if (!(wql = SysAllocString( wqlW ))) goto done; + if (!(wql = SysAllocString(L"WQL" ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); if (hr != S_OK) goto done; @@ -267,12 +232,6 @@ done: int __cdecl wmain(int argc, WCHAR *argv[]) { - static const WCHAR getW[] = {'g','e','t',0}; - static const WCHAR quitW[] = {'q','u','i','t',0}; - static const WCHAR exitW[] = {'e','x','i','t',0}; - static const WCHAR pathW[] = {'p','a','t','h',0}; - static const WCHAR classW[] = {'c','l','a','s','s',0}; - static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0}; const WCHAR *class, *value; int i; @@ -282,20 +241,18 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (i >= argc) goto not_supported; - if (!wcsicmp( argv[i], quitW ) || - !wcsicmp( argv[i], exitW )) + if (!wcsicmp( argv[i], L"quit" ) || !wcsicmp( argv[i], L"exit" )) { return 0; } - if (!wcsicmp( argv[i], classW) || - !wcsicmp( argv[i], contextW )) + if (!wcsicmp( argv[i], L"class") || !wcsicmp( argv[i], L"context" )) { WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - if (!wcsicmp( argv[i], pathW )) + if (!wcsicmp( argv[i], L"path" )) { if (++i >= argc) { @@ -317,7 +274,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (++i >= argc) goto not_supported; - if (!wcsicmp( argv[i], getW )) + if (!wcsicmp( argv[i], L"get" )) { if (++i >= argc) goto not_supported;

1 0

Huw Davies : riched20: Use row ptrs in the cursor from virtual co-ords function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 0fda889f3528cf7929c3b8540ed6315f0eb25e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fda889f3528cf7929c3b854… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:39 2020 +0000 riched20: Use row ptrs in the cursor from virtual co-ords function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 16 +++++++--------- dlls/riched20/editor.h | 2 ++ dlls/riched20/para.c | 19 +++++++++++++++++++ dlls/riched20/row.c | 4 ++-- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0c5f221a7c4..5af4cd04d55 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -952,7 +952,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL final_eop ) { ME_Paragraph *para = editor_first_para( editor ); - ME_DisplayItem *row = NULL; + ME_Row *row = NULL, *next_row; BOOL isExact = TRUE; x -= editor->rcFormat.left; @@ -966,7 +966,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, if (para->nFlags & MEPF_ROWSTART) para = pixel_pos_in_table_row( x, y, para ); y -= para->pt.y; - row = ME_FindItemFwd( para_get_di( para ), diStartRow); + row = para_first_row( para ); break; } else if (para->nFlags & MEPF_ROWSTART) @@ -977,24 +977,22 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, /* find row */ while (row) { - ME_DisplayItem *next_row; - - if (y < row->member.row.pt.y + row->member.row.nHeight) break; - next_row = ME_FindItemFwd(row, diStartRow); + if (y < row->pt.y + row->nHeight) break; + next_row = row_next( row ); if (!next_row) break; row = next_row; } - if (!row && !final_eop) + if (!row && !final_eop && para_prev( para )) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ isExact = FALSE; - row = ME_FindItemBack( para_get_di( para ), diStartRow); + row = para_end_row( para_prev( para ) ); } - if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; + if (row) return row_cursor( editor, row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cf5e2d84fc2..7025ddceea7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -213,7 +213,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; +ME_Row *para_end_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Row *para_first_row( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; BOOL para_in_table( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *para_join( ME_TextEditor *editor, ME_Paragraph *para, BOOL use_first_fmt ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index db258947916..e1b848cf8f9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -130,6 +130,25 @@ ME_Cell *para_cell( ME_Paragraph *para ) return &para->pCell->member.cell; } +ME_Row *para_first_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + +ME_Row *para_end_row( ME_Paragraph *para ) +{ + ME_DisplayItem *item; + + para = para_next( para ); + item = ME_FindItemBack( para_get_di( para ), diStartRowOrParagraph ); + if (!item || item->type != diStartRow) return NULL; + return &item->member.row; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a149231dcbe..ce8de935a19 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -28,8 +28,8 @@ ME_Row *row_next( ME_Row *row ) { ME_DisplayItem *item; - item = ME_FindItemFwd( row_get_di( row ), diStartRow ); - if (!item) return NULL; + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + if (!item || item->type != diStartRow) return NULL; return &item->member.row; }

1 0

Huw Davies : riched20: Pass a row ptr to the cursor from row function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: b47e5d0d232b5cc407a95351c99176fb2e3c61e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47e5d0d232b5cc407a95351… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:38 2020 +0000 riched20: Pass a row ptr to the cursor from row function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 66 ++++++++++++++++++++++++-------------------------- dlls/riched20/editor.h | 7 ++++++ dlls/riched20/row.c | 29 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4da6898bef8..0c5f221a7c4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -903,40 +903,39 @@ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) return para; } - -static BOOL cursor_from_row( ME_TextEditor *editor, ME_DisplayItem *pRow, - int x, ME_Cursor *cursor ) +static BOOL row_cursor( ME_TextEditor *editor, ME_Row *row, int x, + ME_Cursor *cursor ) { - ME_DisplayItem *pNext, *pLastRun; - ME_Row *row = &pRow->member.row; - BOOL exact = TRUE; + ME_Run *run, *last; + BOOL exact = TRUE; - if (x < row->pt.x) - { - x = row->pt.x; - exact = FALSE; - } - pNext = ME_FindItemFwd(pRow, diRunOrStartRow); - assert(pNext->type == diRun); - cursor->nOffset = 0; - do { - int run_x = pNext->member.run.pt.x; - int width = pNext->member.run.nWidth; - - if (x >= run_x && x < run_x+width) + if (x < row->pt.x) { - cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE, TRUE); - cursor->pRun = pNext; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return exact; + x = row->pt.x; + exact = FALSE; } - pLastRun = pNext; - pNext = ME_FindItemFwd(pNext, diRunOrStartRow); - } while(pNext && pNext->type == diRun); - cursor->pRun = pLastRun; - cursor->pPara = ME_GetParagraph( cursor->pRun ); - return FALSE; + run = row_first_run( row ); + assert( run ); + cursor->nOffset = 0; + do + { + if (x >= run->pt.x && x < run->pt.x + run->nWidth) + { + cursor->nOffset = ME_CharFromPoint( editor, x - run->pt.x, run, TRUE, TRUE ); + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return exact; + } + last = run; + run = row_next_run( row, run ); + } while (run); + + run = last; + + cursor->pRun = run_get_di( run ); + cursor->pPara = para_get_di( run->para ); + return FALSE; } /* Finds the run and offset from the pixel position. @@ -995,8 +994,7 @@ static BOOL cursor_from_virtual_coords( ME_TextEditor *editor, int x, int y, row = ME_FindItemBack( para_get_di( para ), diStartRow); } - - if (row) return cursor_from_row( editor, row, x, result ) && isExact; + if (row) return row_cursor( editor, &row->member.row, x, result ) && isExact; ME_SetCursorToEnd(editor, result, TRUE); return FALSE; @@ -1279,7 +1277,7 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL /* row not found - ignore */ return; } - cursor_from_row( editor, pItem, x, pCursor ); + row_cursor( editor, &pItem->member.row, x, pCursor ); assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); } @@ -1329,7 +1327,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); @@ -1383,7 +1381,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) pLast = p; } while(1); - cursor_from_row( editor, pLast, x, pCursor ); + row_cursor( editor, &pLast->member.row, x, pCursor ); } assert(pCursor->pRun); assert(pCursor->pRun->type == diRun); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68c54c2b328..cf5e2d84fc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,10 +111,17 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *row_get_di( ME_Row *row ) +{ + return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); +} /* run.c */ void cursor_from_char_ofs( ME_TextEditor *editor, int char_ofs, ME_Cursor *cursor ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 1bf153f6ca9..a149231dcbe 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -24,6 +24,35 @@ #include "editor.h" +ME_Row *row_next( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diStartRow ); + if (!item) return NULL; + return &item->member.row; +} + +ME_Run *row_first_run( ME_Row *row ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRunOrStartRow ); + assert( item->type == diRun ); + return &item->member.run; +} + +ME_Run *row_next_run( ME_Row *row, ME_Run *run ) +{ + ME_DisplayItem *item; + + assert( row == &ME_FindItemBack( run_get_di( run ), diStartRow )->member.row ); + + item = ME_FindItemFwd( run_get_di( run ), diRunOrStartRow ); + if (!item || item->type == diStartRow) return NULL; + return &item->member.run; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */

1 0

Michael Stefaniuc : wmiutils: Use wide-char string literals.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 20971961f7ffb38abbf3cc4f6f63e271edd4f828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20971961f7ffb38abbf3cc4f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 25 23:40:41 2020 +0100 wmiutils: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/statuscode.c | 8 +-- dlls/wmiutils/tests/path.c | 141 +++++++++++++++------------------------------ 2 files changed, 50 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20971961f7ffb38abbf3…

1 0

Vitaly Lipatov : ncrypt: Add NCryptIsKeyHandle stub.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 98c67d8679b144e8ef4d72e81d8c8c1af2414e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c67d8679b144e8ef4d72e8… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Oct 24 15:34:08 2020 +0300 ncrypt: Add NCryptIsKeyHandle stub. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c0cc05c43ca..a8dda3c54a0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -132,6 +132,12 @@ SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const W return NTE_NOT_SUPPORTED; } +BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) +{ + FIXME("(0x%lx): stub\n", hKey); + return FALSE; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 2b5a4fca420..0e92609790c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -78,7 +78,7 @@ @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported(long wstr long) -@ stub NCryptIsKeyHandle +@ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey @ stdcall NCryptOpenKey(long ptr wstr long long)

1 0

Olivier F. R. Dierick : windowscodecs: Include system header png.h before Windows headers.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 195d0b5308580a0584296c909c2d76b799035423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195d0b5308580a0584296c90… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Oct 24 23:10:52 2020 +0200 windowscodecs: Include system header png.h before Windows headers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50050 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 201f5c700d3..93ff6e056ec 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -25,6 +25,9 @@ #include "wine/port.h" #include <stdarg.h> +#ifdef SONAME_LIBPNG +#include <png.h> +#endif #define NONAMELESSUNION @@ -43,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBPNG -#include <png.h> - static void *libpng_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(png_create_info_struct);

1 0

Huw Davies : riched20: Use row helpers for Home/End key handling.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: f45408b24ac6745b9a917f82abeb42d9ec530112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45408b24ac6745b9a917f82… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:41 2020 +0000 riched20: Use row helpers for Home/End key handling. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 650c065dbe0..49ae1b2769a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1375,19 +1375,11 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pCursor->pRun->type == diRun); } -static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowHome( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - if (pRow) { - ME_DisplayItem *pRun; - - pRun = ME_FindItemFwd(pRow, diRun); - if (pRun) { - pCursor->pRun = pRun; - assert(pCursor->pPara == ME_GetParagraph(pRun)); - pCursor->nOffset = 0; - } - } + ME_Row *row = row_from_cursor( cursor ); + + row_first_cursor( row, cursor ); } static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) @@ -1395,14 +1387,11 @@ static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) ME_SetCursorToStart(editor, pCursor); } -static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) +static void ME_ArrowEnd( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *pRow; + ME_Row *row = row_from_cursor( cursor ); - pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); - assert(pRow); - pCursor->pRun = ME_FindItemBack(pRow, diRun); - pCursor->nOffset = (pRow->type == diStartRow) ? pCursor->pRun->member.run.len : 0; + row_end_cursor( row, cursor, FALSE ); } static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor)

1 0

Rémi Bernon : mscoree/tests: Test querying interfaces with generated GUID.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 6b450f8deb984fd4deb1e7e4501855b781d4dff6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b450f8deb984fd4deb1e7e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:45 2020 +0200 mscoree/tests: Test querying interfaces with generated GUID. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 6 ++++++ dlls/mscoree/tests/comtest.cs | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 8c2ae955cef..659eb9059a7 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -33,6 +33,8 @@ HMODULE hmscoree; +DEFINE_GUID(IID_ITest2, 0x50adb433, 0xf6c5, 0x3b30, 0x92,0x0a, 0x55,0x57,0x11,0x86,0x75,0x09); + typedef enum _run_type { run_type_current_working_directory = 0, @@ -156,6 +158,7 @@ static void run_registry_test(run_type run) char buffer[256]; ITest *test = NULL; HRESULT hr, result_expected; + IUnknown *unk = NULL; HKEY hkey; DWORD ret; int i = 0; @@ -184,6 +187,9 @@ static void run_registry_test(run_type run) hr = ITest_Func(test, &i); ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); + hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); + todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); } diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs index f6461450331..536cd807691 100644 --- a/dlls/mscoree/tests/comtest.cs +++ b/dlls/mscoree/tests/comtest.cs @@ -30,12 +30,22 @@ namespace DLL void Func(ref int i); } + [ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest2 + { + void Func2(ref int i); + } + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] - public class Test : ITest + public class Test : ITest, ITest2 { public void Func(ref int i) { i = 42; } + public void Func2(ref int i) + { + i = 43; + } } }

1 0

Huw Davies : riched20: Use row ptrs in the cursor to co-ordinates function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 6b3fd7869a73e715db066810bcb594cdefc94242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3fd7869a73e715db066810… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:42 2020 +0000 riched20: Use row ptrs in the cursor to co-ordinates function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 24 +++++++++++------------- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 49ae1b2769a..834f9fd3afe 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -218,31 +218,29 @@ int set_selection_cursors(ME_TextEditor *editor, int from, int to) } -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height) +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, + int *x, int *y, int *height ) { - ME_DisplayItem *row; - ME_Run *run = &pCursor->pRun->member.run; - ME_Paragraph *para = &pCursor->pPara->member.para; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + ME_Paragraph *para = &cursor->pPara->member.para; ME_Run *size_run = run, *prev; ME_Context c; int run_x; - assert(height && x && y); assert(~para->nFlags & MEPF_REWRAP); - row = ME_FindItemBack( run_get_di( run ), diStartRowOrParagraph ); - assert(row && row->type == diStartRow); + row = row_from_cursor( cursor ); ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - if (!pCursor->nOffset && (prev = run_prev( run ))) size_run = prev; + if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; - run_x = ME_PointFromCharContext( &c, run, pCursor->nOffset, TRUE ); + run_x = ME_PointFromCharContext( &c, run, cursor->nOffset, TRUE ); *height = size_run->nAscent + size_run->nDescent; *x = c.rcView.left + run->pt.x + run_x - editor->horz_si.nPos; - *y = c.rcView.top + para->pt.y + row->member.row.nBaseline + *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); return; @@ -252,7 +250,7 @@ void create_caret(ME_TextEditor *editor) { int x, y, height; - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); editor->caret_height = height; editor->caret_hidden = TRUE; @@ -281,7 +279,7 @@ void update_caret(ME_TextEditor *editor) if (!editor->bHaveFocus) return; if (!ME_IsSelection(editor)) { - ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + cursor_coords( editor, &editor->pCursors[0], &x, &y, &height ); if (height != editor->caret_height) create_caret(editor); x = min(x, editor->rcFormat.right-1); ITextHost_TxSetCaretPos(editor->texthost, x, y); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e197e3e9a9b..f4484f57d39 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -164,6 +164,7 @@ static inline ME_DisplayItem *run_get_di( ME_Run *run ) } /* caret.c */ +void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, int *x, int *y, int *height ) DECLSPEC_HIDDEN; void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int set_selection_cursors(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; @@ -192,7 +193,6 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, int ME_GetTextLength(ME_TextEditor *editor) DECLSPEC_HIDDEN; int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) DECLSPEC_HIDDEN; ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) DECLSPEC_HIDDEN; /* context.c */ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2f2e5e09d1f..21b63911954 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2734,11 +2734,11 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) { case tomStart: cursor_from_char_ofs( editor, This->start, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; case tomEnd: cursor_from_char_ofs( editor, This->end, &cursor ); - ME_GetCursorCoordinates(editor, &cursor, &x, &y, &height); + cursor_coords( editor, &cursor, &x, &y, &height ); break; default: FIXME("bStart value %d not handled\n", value);

1 0

Rémi Bernon : mscoree: Fallback to assembly name if codebase path is invalid.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 7b0a939a1fb9f0acc7b450cd849fb4e1d93eb499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b0a939a1fb9f0acc7b450cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:46 2020 +0200 mscoree: Fallback to assembly name if codebase path is invalid. Also use the InprocServer32 key values if there's no subkeys, as shown by the test results. L.A.Noire game crashes on startup after failing to load its ErrorHandler assembly, that has an invalid CodeBase path in the registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 44 +++++++++++++++++++++++++++++-------------- dlls/mscoree/tests/comtest.c | 3 ++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index f50eb5a0cd7..cf8acae09e0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1747,6 +1747,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) HKEY key, subkey; LONG res; int offset = 0; + HANDLE file = INVALID_HANDLE_VALUE; DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; WCHAR classname[350], subkeyName[256]; @@ -1782,7 +1783,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) offset = lstrlenW(wszFileSlash); lstrcpyW(filename, codebase + offset); + + file = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); } + + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); else { WCHAR assemblyname[MAX_PATH + 8]; @@ -1791,27 +1797,37 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WARN("CodeBase value cannot be found, trying Assembly.\n"); /* get the last subkey of InprocServer32 */ res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); - if (res != ERROR_SUCCESS || numKeys == 0) - goto cleanup; - numKeys--; - keyLength = ARRAY_SIZE(subkeyName); - res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); - if (res != ERROR_SUCCESS) - goto cleanup; - res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); - if (res != ERROR_SUCCESS) - goto cleanup; - dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); - RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; + if (numKeys > 0) + { + numKeys--; + keyLength = ARRAY_SIZE(subkeyName); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + } + else + { + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(key, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); + if (res != ERROR_SUCCESS) + goto cleanup; + } hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); if (FAILED(hr)) { /* - * The registry doesn't have a CodeBase entry and it's not in the GAC. + * The registry doesn't have a CodeBase entry or the file isn't there, and it's not in the GAC. * * Use the Assembly Key to retrieve the filename. * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 659eb9059a7..b62d527bb95 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -180,7 +180,8 @@ static void run_registry_test(run_type run) ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); - todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + todo_wine_if(result_expected != S_OK) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); if (hr == S_OK) {

1 0

Rémi Bernon : mscoree/tests: Test invalid assembly paths in registry.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: 7612ff5930c7de8c2279f2b6613c8dbaeea9894e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7612ff5930c7de8c2279f2b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 23 08:51:44 2020 +0200 mscoree/tests: Test invalid assembly paths in registry. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/comtest.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index f65e1bc6c25..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid shell32 +IMPORTS = ole32 shlwapi uuid shell32 advapi32 C_SRCS = \ comtest.c \ diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 12b112417d5..8c2ae955cef 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -148,6 +148,51 @@ static void run_test(BOOL expect_success) } IClassFactory_Release(classFactory); } + +} + +static void run_registry_test(run_type run) +{ + char buffer[256]; + ITest *test = NULL; + HRESULT hr, result_expected; + HKEY hkey; + DWORD ret; + int i = 0; + + if (run == run_type_exe_directory) result_expected = S_OK; + else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + + ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + RegDeleteKeyValueA(hkey, "InprocServer32", "CodeBase"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Class"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Assembly"); + RegDeleteKeyValueA(hkey, "InprocServer32", NULL); + RegDeleteKeyA(hkey, "InprocServer32"); + RegCloseKey(hkey); } static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) @@ -247,6 +292,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) SetCurrentDirectoryA(path_tmp); run_test(run == run_type_exe_directory); + run_registry_test(run); cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE)

1 0

Huw Davies : riched20: Use row and para helpers for the selection function.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: aaf29c799121dc388310d06c7fc0ef0512462547 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf29c799121dc388310d06c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 26 08:46:40 2020 +0000 riched20: Use row and para helpers for the selection function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 38 ++++++++++++++------------------------ dlls/riched20/editor.h | 3 +++ dlls/riched20/row.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5af4cd04d55..650c065dbe0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -818,38 +818,28 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[1] = editor->pCursors[0]; ME_MoveCursorWords(editor, &editor->pCursors[1], -1); break; - case stLine: case stParagraph: - { - ME_DisplayItem *pItem; - ME_DIType fwdSearchType, backSearchType; - if (selectionType == stParagraph) { - backSearchType = diParagraph; - fwdSearchType = diParagraphOrEnd; - } else { - backSearchType = diStartRow; - fwdSearchType = diStartRowOrParagraphOrEnd; - } - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, fwdSearchType); - assert(pItem); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; - pItem = ME_FindItemBack(pItem, backSearchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; break; + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + + row_first_cursor( row, editor->pCursors + 1 ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; } case stDocument: /* Select everything with cursor anchored from the start of the text */ - editor->nSelectionType = stDocument; ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); break; default: assert(0); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7025ddceea7..e197e3e9a9b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -111,7 +111,10 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar) DECLSPEC_HIDDEN; /* row.c */ +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC_HIDDEN; +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; +ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ce8de935a19..ba082244cfc 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -53,6 +53,35 @@ ME_Run *row_next_run( ME_Row *row, ME_Run *run ) return &item->member.run; } +ME_Row *row_from_cursor( ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemBack( cursor->pRun, diStartRow ); + return &item->member.row; +} + +void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) +{ + ME_DisplayItem *item; + + item = ME_FindItemFwd( row_get_di( row ), diRun ); + cursor->pRun = item; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = 0; +} + +void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) +{ + ME_DisplayItem *item, *run; + + item = ME_FindItemFwd( row_get_di( row ), diStartRowOrParagraphOrEnd ); + run = ME_FindItemBack( item, diRun ); + cursor->pRun = run; + cursor->pPara = para_get_di( cursor->pRun->member.run.para ); + cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; +} + /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */

1 0

Alexandre Julliard : gdi32: Set the font file name directly at creation time.
by Alexandre Julliard Oct. 26, 2020

Oct. 26, 2020

Module: wine Branch: master Commit: a89595a259b6748e461ea0b731ccf7f73a01014f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a89595a259b6748e461ea0b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 11:37:03 2020 +0100 gdi32: Set the font file name directly at creation time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 64 ++++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 52 +++++++++++++++++++-------------------- dlls/gdi32/gdi_private.h | 8 +++--- 3 files changed, 63 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a89595a259b6748e461e…

1 0

Alexandre Julliard : Wine release 5.20
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: website Branch: master Commit: d1b52f77d582566bd6e0be5f3b36abc7750ceacb URL: https://source.winehq.org/git/website.git/?a=commit;h=d1b52f77d582566bd6e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:27:33 2020 +0200 Wine release 5.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020102301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020102301.xml b/news/en/2020102301.xml new file mode 100644 index 00000000..fa0ef4aa --- /dev/null +++ b/news/en/2020102301.xml @@ -0,0 +1,16 @@ +<news> +<date>October 23, 2020</date> +<title>Wine 5.20 Released</title> +<body> +<p> The Wine development release 5.20 is now available.</p> +<p> <a href="{$root}/announce/5.20">What's new</a> in this release: +<ul> + <li>More work on the DSS cryptographic provider.</li> + <li>A number of fixes for windowless RichEdit.</li> + <li>Support for FLS callbacks.</li> + <li>Window resizing in the new console host.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Jan Sikorski : windowscodecs/tests: Add 32bppRGBA/BGRA converter tests.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 9668d44f4d90129c3752e725ee905e22b7367983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9668d44f4d90129c3752e725… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 22 15:07:29 2020 +0200 windowscodecs/tests: Add 32bppRGBA/BGRA converter tests. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 87f68207c6c..0429b7a3af6 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1890,6 +1890,9 @@ START_TEST(converter) test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); test_conversion(&testdata_32bppRGBA, &testdata_24bppBGR, "32bppRGBA -> 24bppBGR", FALSE); + test_conversion(&testdata_32bppRGBA, &testdata_32bppBGRA, "32bppRGBA -> 32bppBGRA", FALSE); + test_conversion(&testdata_32bppBGRA, &testdata_32bppRGBA, "32bppBGRA -> 32bppRGBA", FALSE); + test_conversion(&testdata_64bppRGBA, &testdata_32bppRGBA, "64bppRGBA -> 32bppRGBA", FALSE); test_conversion(&testdata_64bppRGBA, &testdata_32bppRGB, "64bppRGBA -> 32bppRGB", FALSE);

1 0

Nikolay Sivov : mf: Add default attributes for sample copier.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: d063fff62e1ab7c91b5e5b192ac98eca94504e9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d063fff62e1ab7c91b5e5b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:33:28 2020 +0300 mf: Add default attributes for sample copier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 16 ++++++++++++++-- dlls/mf/tests/mf.c | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 53264258137..c48fc81a1d2 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1523,7 +1523,8 @@ static ULONG WINAPI sample_copier_transform_Release(IMFTransform *iface) if (!refcount) { - IMFAttributes_Release(transform->attributes); + if (transform->attributes) + IMFAttributes_Release(transform->attributes); if (transform->buffer_type) IMFMediaType_Release(transform->buffer_type); DeleteCriticalSection(&transform->cs); @@ -1999,6 +2000,7 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) { struct sample_copier *object; + HRESULT hr; TRACE("%p.\n", transform); @@ -2008,10 +2010,20 @@ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) object->IMFTransform_iface.lpVtbl = &sample_copier_transform_vtbl; object->refcount = 1; - MFCreateAttributes(&object->attributes, 0); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + goto failed; + + IMFAttributes_SetUINT32(object->attributes, &MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE, 1); + *transform = &object->IMFTransform_iface; return S_OK; + +failed: + + IMFTransform_Release(&object->IMFTransform_iface); + + return hr; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6699c1ca9d1..b110c0ec9ef 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3660,6 +3660,7 @@ static BOOL is_sample_copier_available_type(IMFMediaType *type) static void test_sample_copier(void) { + IMFAttributes *attributes, *attributes2; DWORD in_min, in_max, out_min, out_max; IMFMediaType *mediatype, *mediatype2; MFT_OUTPUT_STREAM_INFO output_info; @@ -3668,9 +3669,9 @@ static void test_sample_copier(void) DWORD input_count, output_count; MFT_OUTPUT_DATA_BUFFER buffer; IMFMediaBuffer *media_buffer; - IMFAttributes *attributes; + DWORD count, flags, status; IMFTransform *copier; - DWORD flags, status; + UINT32 value; HRESULT hr; hr = MFCreateSampleCopierMFT(&copier); @@ -3678,6 +3679,16 @@ static void test_sample_copier(void) hr = IMFTransform_GetAttributes(copier, &attributes); ok(hr == S_OK, "Failed to get transform attributes, hr %#x.\n", hr); + hr = IMFTransform_GetAttributes(copier, &attributes2); + ok(hr == S_OK, "Failed to get transform attributes, hr %#x.\n", hr); + ok(attributes == attributes2, "Unexpected instance.\n"); + IMFAttributes_Release(attributes2); + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + hr = IMFAttributes_GetUINT32(attributes, &MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!value, "Unexpected value %u.\n", value); IMFAttributes_Release(attributes); hr = IMFTransform_GetInputStreamAttributes(copier, 0, &attributes);

1 0

Jeff Smith : comdlg32: Set background to transparent for font dialog sample text.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 4273004e65addb70b3f7d91e95eb3d5da31ffa3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4273004e65addb70b3f7d91e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Oct 21 00:49:33 2020 -0500 comdlg32: Set background to transparent for font dialog sample text. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50034 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 69ea3f9ebf1..db2780e1218 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1186,6 +1186,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE /* Draw the sample text itself */ hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); SetTextColor( hdc, lpcf->rgbColors ); + SetBkMode( hdc, TRANSPARENT ); DrawTextW( hdc, sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]],

1 0

Jan Sikorski : windowscodecs: Add 32bppRGBA to 32bppBGRA copy.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: c5b351c35da76c4e1119292dab256959eb188e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b351c35da76c4e1119292d… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 22 15:07:28 2020 +0200 windowscodecs: Add 32bppRGBA to 32bppBGRA copy. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bf2ed9d74f0..bc10a9eccc4 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -722,6 +722,15 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe pbBuffer[cbStride*y+4*x+3] = 0xff; } return S_OK; + case format_32bppRGBA: + if (prc) + { + HRESULT res; + res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(res)) return res; + reverse_bgr8(4, pbBuffer, prc->Width, prc->Height, cbStride); + } + return S_OK; case format_32bppBGRA: if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer);

1 0

Nikolay Sivov : evr/mixer: Send sample requests when switching to streaming mode.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 2d8798163700dc81db042fa1cfbb783f4b032783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d8798163700dc81db042fa1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:33:29 2020 +0300 evr/mixer: Send sample requests when switching to streaming mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 48875a200fd..c0d46ce5331 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "evr9.h" +#include "evcode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -44,6 +45,7 @@ struct input_stream MFVideoNormalizedRect rect; unsigned int zorder; IMFSample *sample; + unsigned int sample_requested : 1; }; struct rt_format @@ -995,6 +997,15 @@ static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DW return E_NOTIMPL; } +static void video_mixer_request_sample(struct video_mixer *mixer, unsigned int idx) +{ + if (!mixer->event_sink || mixer->inputs[idx].sample_requested) + return; + + IMediaEventSink_Notify(mixer->event_sink, EC_SAMPLE_NEEDED, idx, 0); + mixer->inputs[idx].sample_requested = 1; +} + static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { struct video_mixer *mixer = impl_from_IMFTransform(iface); @@ -1039,6 +1050,12 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, EnterCriticalSection(&mixer->cs); + if (!mixer->is_streaming) + { + for (i = 0; i < mixer->input_count; ++i) + video_mixer_request_sample(mixer, i); + } + mixer->is_streaming = message == MFT_MESSAGE_NOTIFY_BEGIN_STREAMING; LeaveCriticalSection(&mixer->cs); @@ -1078,6 +1095,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW else { mixer->is_streaming = 1; + input->sample_requested = 0; input->sample = sample; IMFSample_AddRef(input->sample); }

1 0

Jan Sikorski : windowscodecs: Add a missing FIXME.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: f3752eb58f306aa08dd2a586111fee5e35d46e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3752eb58f306aa08dd2a586… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 22 15:07:27 2020 +0200 windowscodecs: Add a missing FIXME. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e4f5c5f9b2..bf2ed9d74f0 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -859,6 +859,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe } return S_OK; default: + FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; } }

1 0

Austin English : dpvsetup: Add stub program.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 9b8188a96079de29d4fb10ccc44cc12d53bdacfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b8188a96079de29d4fb10cc… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 20 04:02:02 2020 -0500 dpvsetup: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/dpvsetup/Makefile.in | 8 ++++++++ programs/dpvsetup/main.c | 33 +++++++++++++++++++++++++++++++++ programs/dpvsetup/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index 816e12f75ab..1afc057f3e9 100755 --- a/configure +++ b/configure @@ -1762,6 +1762,7 @@ enable_cscript enable_dism enable_dplaysvr enable_dpnsvr +enable_dpvsetup enable_dxdiag enable_eject enable_expand @@ -21221,6 +21222,7 @@ wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr +wine_fn_config_makefile programs/dpvsetup enable_dpvsetup wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject wine_fn_config_makefile programs/expand enable_expand diff --git a/configure.ac b/configure.ac index bd7acca29c6..372785ee0fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3967,6 +3967,7 @@ WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) +WINE_CONFIG_MAKEFILE(programs/dpvsetup) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) WINE_CONFIG_MAKEFILE(programs/expand) diff --git a/programs/dpvsetup/Makefile.in b/programs/dpvsetup/Makefile.in new file mode 100644 index 00000000000..189da196c8c --- /dev/null +++ b/programs/dpvsetup/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dpvsetup.exe + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/programs/dpvsetup/main.c b/programs/dpvsetup/main.c new file mode 100644 index 00000000000..d72ede7e4ab --- /dev/null +++ b/programs/dpvsetup/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpvsetup); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/dpvsetup/version.rc b/programs/dpvsetup/version.rc new file mode 100644 index 00000000000..ed2ada993f9 --- /dev/null +++ b/programs/dpvsetup/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine dpvsetup" +#define WINE_FILENAME_STR "dpvsetup.exe" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dplaysvr: Add stub program.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 73afd2648c003fbddb657fc8a3f8f53a86754dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73afd2648c003fbddb657fc8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 20 04:02:01 2020 -0500 dplaysvr: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/dplaysvr/Makefile.in | 8 ++++++++ programs/dplaysvr/main.c | 33 +++++++++++++++++++++++++++++++++ programs/dplaysvr/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index 5672688a0d7..816e12f75ab 100755 --- a/configure +++ b/configure @@ -1760,6 +1760,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dplaysvr enable_dpnsvr enable_dxdiag enable_eject @@ -21218,6 +21219,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dxdiag enable_dxdiag wine_fn_config_makefile programs/eject enable_eject diff --git a/configure.ac b/configure.ac index a57697a0ddf..bd7acca29c6 100644 --- a/configure.ac +++ b/configure.ac @@ -3965,6 +3965,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dxdiag) WINE_CONFIG_MAKEFILE(programs/eject) diff --git a/programs/dplaysvr/Makefile.in b/programs/dplaysvr/Makefile.in new file mode 100644 index 00000000000..9c8eda44513 --- /dev/null +++ b/programs/dplaysvr/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dplaysvr.exe + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/programs/dplaysvr/main.c b/programs/dplaysvr/main.c new file mode 100644 index 00000000000..1de98684760 --- /dev/null +++ b/programs/dplaysvr/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dplaysvr); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/dplaysvr/version.rc b/programs/dplaysvr/version.rc new file mode 100644 index 00000000000..4a84f681116 --- /dev/null +++ b/programs/dplaysvr/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine dplaysvr" +#define WINE_FILENAME_STR "dplaysvr.exe" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : mfplat: Implement GetVideoService() for the device manager.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 267b365f4ace076f6faed25ebdd3d807b5c8e126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267b365f4ace076f6faed25e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:59:39 2020 +0300 mfplat: Implement GetVideoService() for the device manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 28 ++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 68aa2cdaa2d..1c51fafff1e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8689,12 +8689,32 @@ static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager return hr; } -static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, - REFIID riid, void **service) +static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE hdevice, + REFIID riid, void **service) { - FIXME("(%p, %p, %s, %p): stub.\n", iface, device, debugstr_guid(riid), service); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), service); + + EnterCriticalSection(&manager->cs); + + if (!manager->device) + hr = MF_E_DXGI_DEVICE_NOT_INITIALIZED; + else if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) + hr = MF_E_DXGI_NEW_VIDEO_DEVICE; + else if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_OPEN) + hr = IDXGIDevice_QueryInterface(manager->device, riid, service); + else + hr = E_HANDLE; + } + + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE hdevice, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17371a0e1c0..971469ec574 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4530,6 +4530,7 @@ static void test_dxgi_device_manager(void) struct test_thread_param param; HANDLE handle1, handle, thread; UINT token, token2; + IUnknown *unk; HRESULT hr; if (!pMFCreateDXGIDeviceManager) @@ -4560,6 +4561,9 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); + hr = IMFDXGIDeviceManager_GetVideoService(manager, NULL, &IID_ID3D11Device, (void **)&unk); + ok(hr == MF_E_DXGI_DEVICE_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); ok(hr == MF_E_DXGI_DEVICE_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); @@ -4593,6 +4597,12 @@ static void test_dxgi_device_manager(void) EXPECT_REF(manager, 1); EXPECT_REF(d3d11_dev, 2); + /* GetVideoService() on device change. */ + handle = NULL; + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!handle, "Unexpected handle value %p.\n", handle); + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); @@ -4603,11 +4613,32 @@ static void test_dxgi_device_manager(void) EXPECT_REF(d3d11_dev2, 2); EXPECT_REF(d3d11_dev, 1); + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_ID3D11Device, (void **)&unk); + ok(hr == MF_E_DXGI_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + handle = NULL; hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!handle, "Unexpected handle value %p.\n", handle); + hr = IMFDXGIDeviceManager_GetVideoService(manager, NULL, &IID_ID3D11Device, (void **)&unk); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_ID3D11Device, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_IDXGIDevice, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + handle1 = NULL; hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Tag wine-5.20 : Alexandre Julliard : Release 5.20
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: refs/tags/wine-5.20 Tag: 9e85717088c324698e0e66b3eac2ec1239fc80b6 URL: https://source.winehq.org/git/wine.git/?a=tag;h=9e85717088c324698e0e66b3eac… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20

1 0

Alexandre Julliard : Release 5.20.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 6373792eec0f122295723cae77b0115e6c96c3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6373792eec0f122295723cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 933 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 454 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6373792eec0f12229572…

1 0

Nikolay Sivov : evr/mixer: Request more sample on successful ProcessOutput().
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b8507acf53eacc716187ee7046ab0dcec288dc2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8507acf53eacc716187ee70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:33:30 2020 +0300 evr/mixer: Request more sample on successful ProcessOutput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c0d46ce5331..59d75c0476b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1038,6 +1038,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, { IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; + mixer->inputs[i].sample_requested = 0; } } @@ -1150,6 +1151,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D struct video_mixer *mixer = impl_from_IMFTransform(iface); IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + unsigned int i; HRESULT hr; TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); @@ -1168,8 +1170,26 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D { if (mixer->is_streaming) { - FIXME("Streaming state is not handled.\n"); - hr = E_NOTIMPL; + for (i = 0; i < mixer->input_count; ++i) + { + if (!mixer->inputs[i].sample) + { + hr = MF_E_TRANSFORM_NEED_MORE_INPUT; + break; + } + } + + /* FIXME: for now discard input */ + + if (SUCCEEDED(hr)) + { + for (i = 0; i < mixer->input_count; ++i) + { + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; + video_mixer_request_sample(mixer, i); + } + } } else {

1 0

Nikolay Sivov : mfplat: Implement DXGI device manager handle management.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b0ab5255ad19df4070ae7c69608cf1c57d8a2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ab5255ad19df4070ae7c69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:59:38 2020 +0300 mfplat: Implement DXGI device manager handle management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 248 ++++++++++++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 156 +++++++++++++++++++++++++++- include/mfapi.h | 4 + 3 files changed, 380 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0ab5255ad19df4070ae…

1 0

Alexandre Julliard : gdi32: Don't bother caching the font type.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: a13492b3766ed1d71e3a42b43dbc544f297e67d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13492b3766ed1d71e3a42b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 20:14:49 2020 +0200 gdi32: Don't bother caching the font type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 718c7f3407e..cf8b2c66e22 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3239,7 +3239,7 @@ struct fontdir #include <poppack.h> static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, - NEWTEXTMETRICEXW *pntm, LPDWORD ptype); + NEWTEXTMETRICEXW *pntm); static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) { @@ -3249,7 +3249,6 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) WCHAR *family_name; ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; - DWORD type; if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); @@ -3259,14 +3258,14 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (face) { family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); + GetEnumStructs( face, family_name, &elf, &ntm ); release_face( face ); HeapFree( GetProcessHeap(), 0, family_name ); } pFT_Done_Face( ft_face ); if (!face) return FALSE; - if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE; + if (!(ntm.ntmTm.tmPitchAndFamily & TMPF_TRUETYPE)) return FALSE; memset( fd, 0, sizeof(*fd) ); @@ -5217,8 +5216,19 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l return n; } +static UINT get_font_type( const NEWTEXTMETRICEXW *ntm ) +{ + UINT ret = 0; + + if (ntm->ntmTm.tmPitchAndFamily & TMPF_TRUETYPE) ret |= TRUETYPE_FONTTYPE; + if (ntm->ntmTm.tmPitchAndFamily & TMPF_DEVICE) ret |= DEVICE_FONTTYPE; + if (!(ntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) ret |= RASTER_FONTTYPE; + return ret; +} + + static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, - NEWTEXTMETRICEXW *pntm, LPDWORD ptype) + NEWTEXTMETRICEXW *pntm) { struct gdi_font *gdi_font; GdiFont *font; @@ -5229,7 +5239,6 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX TRACE("Cached\n"); *pelf = face->cached_enum_data->elf; *pntm = face->cached_enum_data->ntm; - *ptype = face->cached_enum_data->type; return; } @@ -5303,20 +5312,11 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX pelf->elfLogFont.lfQuality = DRAFT_QUALITY; pelf->elfLogFont.lfPitchAndFamily = (pntm->ntmTm.tmPitchAndFamily & 0xf1) + 1; - *ptype = 0; - if (pntm->ntmTm.tmPitchAndFamily & TMPF_TRUETYPE) - *ptype |= TRUETYPE_FONTTYPE; - if (pntm->ntmTm.tmPitchAndFamily & TMPF_DEVICE) - *ptype |= DEVICE_FONTTYPE; - if(!(pntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) - *ptype |= RASTER_FONTTYPE; - face->cached_enum_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*face->cached_enum_data)); if (face->cached_enum_data) { face->cached_enum_data->elf = *pelf; face->cached_enum_data->ntm = *pntm; - face->cached_enum_data->type = *ptype; } free_gdi_font(gdi_font); @@ -5347,10 +5347,10 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha { ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; - DWORD type = 0; - DWORD i; + DWORD type, i; - GetEnumStructs( face, face->family->family_name, &elf, &ntm, &type ); + GetEnumStructs( face, face->family->family_name, &elf, &ntm ); + type = get_font_type( &ntm ); for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET;

1 0

Alexandre Julliard : makefiles: Explicitly create destination dirs when installing symlinks.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: ec99ba1b29a78bdace93bd30819d6a90f78e091d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec99ba1b29a78bdace93bd30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 12:41:12 2020 +0200 makefiles: Explicitly create destination dirs when installing symlinks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50039 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2eed620b429..90a21ef825c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2434,24 +2434,28 @@ static void output_winegcc_command( struct makefile *make, int is_cross ) * * Output a rule to create a symlink. */ -static void output_symlink_rule( const char *src_name, const char *link_name ) +static void output_symlink_rule( const char *src_name, const char *link_name, int create_dir ) { - const char *name; - - output( "\trm -f %s && ", link_name ); + const char *name = strrchr( link_name, '/' ); + char *dir = NULL; - /* dest path with a directory needs special handling if ln -s isn't supported */ - if (strcmp( ln_s, "ln -s" ) && ((name = strrchr( link_name, '/' )))) + if (name) { - char *dir = xstrdup( link_name ); + dir = xstrdup( link_name ); dir[name - link_name] = 0; - output( "cd %s && %s %s %s\n", *dir ? dir : "/", ln_s, src_name, name + 1 ); - free( dir ); } + + output( "\t" ); + if (create_dir && dir && *dir) output( "%s -d %s && ", root_src_dir_path( "tools/install-sh" ), dir ); + output( "rm -f %s && ", link_name ); + + /* dest path with a directory needs special handling if ln -s isn't supported */ + if (dir && strcmp( ln_s, "ln -s" )) + output( "cd %s && %s %s %s\n", *dir ? dir : "/", ln_s, src_name, name + 1 ); else - { output( "%s %s %s\n", ln_s, src_name, link_name ); - } + + free( dir ); } @@ -2474,7 +2478,7 @@ static void output_srcdir_symlink( struct makefile *make, const char *obj ) if (src_name[0] != '/' && make->obj_dir) src_name = concat_paths( get_relative_path( make->obj_dir, "" ), src_name ); - output_symlink_rule( src_name, dst_file ); + output_symlink_rule( src_name, dst_file, 0 ); strarray_add( &make->all_targets, obj ); } @@ -2524,7 +2528,7 @@ static void output_install_commands( struct makefile *make, struct strarray file install_sh, tools_dir_path( make, files.str[i] ), dest ); break; case 'y': /* symlink */ - output_symlink_rule( files.str[i], dest ); + output_symlink_rule( files.str[i], dest, 1 ); break; default: assert(0); @@ -2648,7 +2652,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *make ) lib = strmake( "lib%s.%s", make->importlib, ext[i] ); dst = strmake( "dlls/%s", lib ); output( "%s: %s\n", dst, obj_dir_path( make, lib )); - output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst ); + output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst, 0 ); strarray_add( &ret, dst ); } return ret; @@ -3496,7 +3500,7 @@ static void output_shared_lib( struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] )); + output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); add_install_rule( make, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -3608,7 +3612,7 @@ static void output_programs( struct makefile *make ) for (j = 0; j < symlinks.count; j++) { output( "%s: %s\n", obj_dir_path( make, symlinks.str[j] ), obj_dir_path( make, program )); - output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] )); + output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] ), 0 ); } strarray_addall( &make->all_targets, symlinks );

1 0

Hans Leidekker : wbemprox: Also return system properties from IWbemClassObject::GetNames.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b1ceb7853cf0d7abe99fd917e65a22507795f7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ceb7853cf0d7abe99fd917… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 21:25:49 2020 +0200 wbemprox: Also return system properties from IWbemClassObject::GetNames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50038 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 61 ++++++++++++++++++++++++++++++--------------- dlls/wbemprox/tests/query.c | 17 +++++++++++++ 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 525381d88d2..3d60825f24e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1375,40 +1375,61 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { + static const WCHAR * const system_props[] = + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; SAFEARRAY *sa; BSTR str; - UINT i, table_index, result_index, num_props; + UINT i, table_index, result_index, count = 0; struct table *table; HRESULT hr; - LONG j; + LONG j = 0; if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - - num_props = count_result_properties( view, table_index ); - if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - table = view->table[table_index]; - for (i = 0, j = 0; i < table->num_cols; i++) - { - BOOL is_system; - if (is_method( table, i )) continue; - if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) count += ARRAY_SIZE(system_props); + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) + { + if (!is_method( table, i ) && is_result_prop( view, table->columns[i].name )) count++; + } + } - is_system = is_system_prop( table->columns[i].name ); - if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; - else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, count ))) return E_OUTOFMEMORY; - str = SysAllocString( table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) + { + for (j = 0; j < ARRAY_SIZE(system_props); j++) + { + str = SysAllocString( system_props[j] ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + SysFreeString( str ); + } + } + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) { + if (is_method( table, i ) || !is_result_prop( view, table->columns[i].name )) continue; + + str = SysAllocString( table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } SysFreeString( str ); - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + j++; } - SysFreeString( str ); - j++; } + *props = sa; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d1ce42d64cb..7ba55dffdfb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,6 +460,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; + SAFEARRAY *names; + LONG bound, i; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -484,6 +486,21 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } + names = NULL; + hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( names != NULL, "names not set\n" ); + hr = SafeArrayGetUBound( names, 1, &bound ); + ok( hr == S_OK, "got %08x\n", hr ); + for (i = 0; i <= bound; i++) + { + BSTR str; + hr = SafeArrayGetElement( names, &i, &str ); + ok( hr == S_OK, "%d: got %08x\n", i, hr ); + SysFreeString( str ); + } + SafeArrayDestroy( names ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr );

1 0

Huw Davies : riched20: Use run and para ptrs in the cursor move lines function.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: c8862864fec884272a46aa477c1e218b3a2b8c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8862864fec884272a46aa47… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:05 2020 +0100 riched20: Use run and para ptrs in the cursor move lines function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 63 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 9676636a64e..bb462b034b7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1241,13 +1241,17 @@ static void ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; - ME_DisplayItem *pOldPara = pCursor->pPara; - ME_DisplayItem *pItem, *pNewPara; + ME_Paragraph *old_para = &pCursor->pPara->member.para, *new_para; + ME_DisplayItem *pItem; int x = ME_GetXForArrow(editor, pCursor); if (editor->bCaretAtEnd && !pCursor->nOffset) - if (!ME_PrevRun(&pOldPara, &pRun, TRUE)) - return; + { + ME_Run *prev = run_prev_all_paras( &pRun->member.run ); + if (!prev) return; + pRun = run_get_di( prev ); + old_para = prev->para; + } if (nRelOfs == -1) { @@ -1262,25 +1266,23 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToStart(editor, pCursor); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWEND || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWEND || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_start( &pOldPara->member.para )->prev_para; - if (pNewPara->type == diTextStart) - return; /* At the top, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_prev( table_row_start( old_para )); + if (!new_para) return; /* At the top, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow); } - if (pNewPara->member.para.nFlags & MEPF_ROWEND) + if (new_para->nFlags & MEPF_ROWEND) { /* Brought into a table row */ - ME_Cell *cell = &ME_FindItemBack(pNewPara, diCell)->member.cell; - while (x < cell->pt.x && cell->prev_cell) - cell = &cell->prev_cell->member.cell; - if (cell->next_cell) /* else - we are still at the end of the row */ - pItem = ME_FindItemBack(cell->next_cell, diStartRow); + ME_Cell *cell = table_row_end_cell( new_para ); + while (x < cell->pt.x && cell_prev( cell )) + cell = cell_prev( cell ); + if (cell_next( cell )) /* else - we are still at the end of the row */ + pItem = ME_FindItemBack( cell_get_di( cell_next( cell ) ), diStartRow ); } } else @@ -1293,25 +1295,22 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToEnd(editor, pCursor, TRUE); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWSTART || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWSTART || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_end( &pOldPara->member.para )->next_para; - if (pNewPara->type == diTextEnd) - return; /* At the bottom, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_next( table_row_end( old_para ) ); + if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow ); } - if (pNewPara->member.para.nFlags & MEPF_ROWSTART) + if (new_para->nFlags & MEPF_ROWSTART) { /* Brought into a table row */ - ME_DisplayItem *cell = ME_FindItemFwd(pNewPara, diCell); - while (cell->member.cell.next_cell && - x >= cell->member.cell.next_cell->member.cell.pt.x) - cell = cell->member.cell.next_cell; - pItem = ME_FindItemFwd(cell, diStartRow); + ME_Cell *cell = table_row_first_cell( new_para ); + while (cell_next( cell ) && x >= cell_next( cell )->pt.x) + cell = cell_next( cell ); + pItem = ME_FindItemFwd( cell_get_di( cell ), diStartRow ); } } if (!pItem)

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetMethodQualifierSet.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 09e32f57b713a55bcb7487c1e1dff987d02438d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e32f57b713a55bcb7487c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 11:15:56 2020 +0200 wbemprox: Implement IWbemClassObject::GetMethodQualifierSet. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e048fb3db82..d24d8cbb5ca 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -971,8 +971,11 @@ static HRESULT WINAPI class_object_GetMethodQualifierSet( LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet) { - FIXME("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); + + return WbemQualifierSet_create( co->name, wszMethod, (void **)ppQualSet ); } static HRESULT WINAPI class_object_GetMethodOrigin(

1 0

Ziqing Hui : gdiplus: Support StringFormatNoWrap for GdipMeasureString.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: c509060f52eb2c2e8f95111046c5010f9686eb31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c509060f52eb2c2e8f951110… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 23 10:22:10 2020 +0800 gdiplus: Support StringFormatNoWrap for GdipMeasureString. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 190f45d64a2..291f6a94b9d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5270,7 +5270,7 @@ GpStatus gdip_format_string(HDC hdc, if(*(stringdup + sum + fit) == ' ') while(*(stringdup + sum + fit) == ' ') fit++; - else + else if (!(format->attr & StringFormatFlagsNoWrap)) while(*(stringdup + sum + fit - 1) != ' '){ fit--; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 24fc91a1bfe..d1022b1af5b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4900,10 +4900,8 @@ todo_wine rect.Height = 32000.0; status = GdipMeasureString(graphics, string2, -1, font, &rect, format_no_wrap, &bounds, &glyphs, &lines); expect(Ok, status); - todo_wine { expectf_(width_M_M, bounds.Width, 0.1); expect(3, glyphs); - } expect(1, lines); status = GdipDeleteFont(font);

1 0

Ziqing Hui : gdiplus/tests: Add tests for GdipMeasureString with StringFormatFlagsNoWrap.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 3f228497a891fd135cbad4674f23afed0119fe72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f228497a891fd135cbad467… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 23 10:22:00 2020 +0800 gdiplus/tests: Add tests for GdipMeasureString with StringFormatFlagsNoWrap. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 55 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1dbb0ae279f..24fc91a1bfe 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4449,8 +4449,9 @@ static void test_measure_string(void) { static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; static const WCHAR string[] = { 'A','0','1',0 }; + static const WCHAR string2[] = { 'M',' ','M','M',0 }; HDC hdc; - GpStringFormat *format; + GpStringFormat *format, *format_no_wrap; CharacterRange range; GpRegion *region; GpGraphics *graphics; @@ -4458,7 +4459,7 @@ static void test_measure_string(void) GpFont *font; GpStatus status; RectF bounds, rect; - REAL width, height, width_1, width_2; + REAL width, height, width_1, width_2, width_MM, width_M_M; REAL margin_x, margin_y, width_rgn, height_rgn; int lines, glyphs; @@ -4856,6 +4857,55 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + /* Measure "MM" */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2 + 2, 2, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + width_MM = bounds.Width; + + /* Measure "M M" */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, 3, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + width_M_M = bounds.Width; + + /* With wrap */ + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_M_M; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, -1, font, &rect, NULL, &bounds, &glyphs, &lines); + expect(Ok, status); + expectf_(width_MM, bounds.Width, 0.1); + expect(4, glyphs); + expect(2, lines); + + /* Without wrap */ + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format_no_wrap); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_M_M; + rect.Height = 32000.0; + status = GdipMeasureString(graphics, string2, -1, font, &rect, format_no_wrap, &bounds, &glyphs, &lines); + expect(Ok, status); + todo_wine { + expectf_(width_M_M, bounds.Width, 0.1); + expect(3, glyphs); + } + expect(1, lines); + status = GdipDeleteFont(font); expect(Ok, status); @@ -4866,6 +4916,7 @@ todo_wine GdipDeleteFontFamily(family); GdipDeleteRegion(region); GdipDeleteStringFormat(format); + GdipDeleteStringFormat(format_no_wrap); } static void test_measured_extra_space(void)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 3f2ff588bae7d580d8c726162c732f5e176b1f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2ff588bae7d580d8c72616… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Oct 23 07:47:27 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 150 +++++++++++++++++++-------------------------------------------- 1 file changed, 45 insertions(+), 105 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6bfb480ee59..846a3149b1f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5025,11 +5025,11 @@ msgstr "DLL:n alustus epäonnistui.\n" #: dlls/kernel32/winerror.mc:1373 msgid "Shutdown in progress.\n" -msgstr "Sulkeminen meneillään.\n" +msgstr "Sammutus meneillään.\n" #: dlls/kernel32/winerror.mc:1378 msgid "No shutdown in progress.\n" -msgstr "Sulkeminen ei meneillään.\n" +msgstr "Ei sammutusta meneillään.\n" #: dlls/kernel32/winerror.mc:1383 msgid "I/O device error.\n" @@ -6924,16 +6924,12 @@ msgid "No Signature found in file.\n" msgstr "Tiedostosta ei löytynyt allekirjoitusta.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Taso ei kelpaa.\n" +msgstr "Kutsu ei kelpaa.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Arvo ei saatavilla.\n" +msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7107,11 +7103,11 @@ msgstr "Objektia tai arvoa ei löydy.\n" #: dlls/mferror/mferror.mc:235 msgid "Value is not available.\n" -msgstr "Arvo ei saatavilla.\n" +msgstr "Arvo ei ole saatavilla.\n" #: dlls/mferror/mferror.mc:242 msgid "Clock is not available.\n" -msgstr "Kello ei saatavilla.\n" +msgstr "Kello ei ole saatavilla.\n" #: dlls/mferror/mferror.mc:263 msgid "Multiple subscribers are not supported.\n" @@ -10032,16 +10028,12 @@ msgid "Line Islands Daylight Time" msgstr "Linesaarten kesäaika" #: dlls/tzres/tzres.rc:90 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Kiinan normaaliaika" +msgstr "Kuuban normaaliaika" #: dlls/tzres/tzres.rc:91 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Kiinan kesäaika" +msgstr "Kuuban kesäaika" #: dlls/tzres/tzres.rc:134 msgid "Jordan Standard Time" @@ -10240,16 +10232,12 @@ msgid "US Eastern Daylight Time" msgstr "Itäinen kesäaika (USA)" #: dlls/tzres/tzres.rc:176 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Korean normaaliaika" +msgstr "Pohjois-Korean normaaliaika" #: dlls/tzres/tzres.rc:177 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Korean kesäaika" +msgstr "Pohjois-Korean kesäaika" #: dlls/tzres/tzres.rc:212 msgid "Tasmania Standard Time" @@ -10564,16 +10552,12 @@ msgid "Egypt Daylight Time" msgstr "Egyptin kesäaika" #: dlls/tzres/tzres.rc:104 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Keskinen normaaliaika (Meksiko)" +msgstr "Itäinen normaaliaika (Meksiko)" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Keskinen kesäaika (Meksiko)" +msgstr "Itäinen kesäaika (Meksiko)" #: dlls/tzres/tzres.rc:148 msgid "Mauritius Standard Time" @@ -10778,153 +10762,115 @@ msgstr "&Lisää ikkunoita..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Ylivuoto" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Muisti ei riitä." +msgstr "Muisti ei riitä" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Tämä taulukko on kiinteä tai väliaikaisesti lukittu" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Tietotyyppi ei täsmää.\n" +msgstr "Tyyppi ei täsmää" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "I/O-laitteen virhe.\n" +msgstr "Laitteen I/O-virhe" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Tiedosto on jo olemassa.\n" +msgstr "Tiedosto on jo olemassa" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Levy täynnä.\n" +msgstr "Levy täynnä" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Liian monta avointa tiedostoa.\n" +msgstr "Liian monta tiedostoa" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Pääsy estetty.\n" +msgstr "Pääsy estetty" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Polun-/tiedostonkäyttövirhe" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Polkua ei löydy.\n" +msgstr "Polkua ei löydy" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(arvoa ei asetettu)" +msgstr "Objektimuuttujaa ei ole asetettu" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Annettu puskuri ei kelpaa.\n" +msgstr "Null-arvon käyttö ei kelpaa" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Tarvittavaa väliaikaistiedostoa ei voida luoda" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Automaatiopalvelin ei voi luoda objektia" +msgstr "ActiveX-komponentti ei voi luoda objektia" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Luokka ei tue automaatiota" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "Tiedostonimeä tai luokan nimeä ei löydy automaatio-operaatiossa" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Objekti ei tue nimettyjä argumentteja" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Objekti ei tue tätä toimintoa" +msgstr "Objekti ei tue nykyistä alueellista asetusta" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Elementtiä ei löydy.\n" +msgstr "Nimettyä argumenttia ei löydy" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Väärä määrä argumentteja tai virhe ominaisuuden asettamisessa" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Objektiluokkarikkomus" +msgstr "Objekti ei ole kokoelma" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Viestistä ei löytynyt määriteltyä kontrollia" +msgstr "Määriteltyä DLL-funktiota ei löydy" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "Muuttuja käyttää automaatiotyyppiä, jota VBScript ei tue" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "Etäpalvelinta ei ole tai se ei ole tavoitettavissa" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Viallinen tai määrittämätön viittaus" #: dlls/vbscript/vbscript.rc:62 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript -käännösvirhe" +msgstr "Microsoft VBScript -käännösvirhe" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript -suoritusvirhe" +msgstr "Microsoft VBScript -suoritusvirhe" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11022,33 +10968,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Voimaantulopäiväys" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Turvallisuus" +msgstr "Salausprotokolla" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" msgstr "Allekirjoitus" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Tiedostojärjestelmän salaus" +msgstr "Salauksen tyyppi" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Yksityisyyden vahvuus" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bittiä" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n"

1 0

Huw Davies : riched20: Use cell ptrs in the table position to offset function.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 2c2020ddb5fc2a222f861cf05d89a991ea03621f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c2020ddb5fc2a222f861cf0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:04 2020 +0100 riched20: Use cell ptrs in the table position to offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5d49d11bd3b..9676636a64e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -880,21 +880,21 @@ int ME_GetCursorOfs(const ME_Cursor *cursor) /* Helper function for ME_FindPixelPos to find paragraph within tables */ static ME_Paragraph *pixel_pos_in_table_row( int x, int y, ME_Paragraph *para ) { - ME_DisplayItem *cell, *next_cell; + ME_Cell *cell, *next_cell; assert( para->nFlags & MEPF_ROWSTART ); - cell = para_next( para )->pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); /* find the cell we are in */ - while ((next_cell = cell->member.cell.next_cell) != NULL) + while ((next_cell = cell_next( cell )) != NULL) { - if (x < next_cell->member.cell.pt.x) + if (x < next_cell->pt.x) { - para = &ME_FindItemFwd( cell, diParagraph )->member.para; + para = cell_first_para( cell ); /* Found the cell, but there might be multiple paragraphs in * the cell, so need to search down the cell for the paragraph. */ - while (cell == para->pCell) + while (cell == para_cell( para )) { if (y < para->pt.y + para->nHeight) {

1 0

Zebediah Figura : quartz/tests: Use compare_double() to test IBasicVideo::get_AvgTimePerFrame().
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: f4b04e2e84e55d2e35d183c7c8a22b0a2e3bb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b04e2e84e55d2e35d183c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 15:16:42 2020 -0500 quartz/tests: Use compare_double() to test IBasicVideo::get_AvgTimePerFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index f1b19aa6634..d7eafe53be8 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdint.h> #define COBJMACROS #include "dshow.h" #include "d3d9.h" @@ -65,6 +66,23 @@ static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TY && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static BOOL compare_double(double f, double g, unsigned int ulps) +{ + uint64_t x = *(ULONGLONG *)&f; + uint64_t y = *(ULONGLONG *)&g; + + if (f < 0) + x = ~x + 1; + else + x |= ((ULONGLONG)1)<<63; + if (g < 0) + y = ~y + 1; + else + y |= ((ULONGLONG)1)<<63; + + return (x>y ? x-y : y-x) <= ulps; +} + static IFilterGraph2 *create_graph(void) { IFilterGraph2 *ret; @@ -2707,7 +2725,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l);

1 0

Michael Stefaniuc : inetcomm: Zero terminate the mhtml WCHAR strings.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 87fc5320d68ec4f1624388435ac5db76010932c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fc5320d68ec4f162438843… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 23 11:20:00 2020 +0200 inetcomm: Zero terminate the mhtml WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 8 +++----- dlls/inetcomm/protocol.c | 27 +++++++++++++-------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index eda9a911bbf..74c5c670d15 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3697,8 +3697,6 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx size_t len; HRESULT hres; - static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; - WARN("(0x%08x, %p, %p, %s, %p, %p) semi-stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); if(!IsEqualGUID(&IID_IUnknown, riid)) { @@ -3713,12 +3711,12 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx TRACE("display name %s\n", debugstr_w(display_name)); len = lstrlenW(display_name); - mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); + mhtml_url = heap_alloc(len*sizeof(WCHAR) + sizeof(L"mhtml:")); if(!mhtml_url) return E_OUTOFMEMORY; - memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); + lstrcpyW(mhtml_url, L"mhtml:"); + lstrcatW(mhtml_url, display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index e50e5a625c3..e272689a9ac 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -59,8 +59,8 @@ typedef struct { WCHAR url[1]; } MimeHtmlBinding; -static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; -static const WCHAR mhtml_separatorW[] = {'!','x','-','u','s','c',':'}; +static const WCHAR mhtml_prefixW[] = L"mhtml:"; +static const WCHAR mhtml_separatorW[] = L"!x-usc:"; static inline LPWSTR heap_strdupW(LPCWSTR str) { @@ -82,16 +82,16 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) + if(wcsnicmp(url, mhtml_prefixW, lstrlenW(mhtml_prefixW))) return E_FAIL; - r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); + r->mhtml = url + lstrlenW(mhtml_prefixW); p = wcschr(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) - p += ARRAY_SIZE(mhtml_separatorW); + if(!wcsncmp(p, mhtml_separatorW, lstrlenW(mhtml_separatorW))) + p += lstrlenW(mhtml_separatorW); else p++; }else { @@ -656,7 +656,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - size_t len = ARRAY_SIZE(mhtml_prefixW); + size_t len = lstrlenW(mhtml_prefixW); mhtml_url_t url; WCHAR *p; HRESULT hres; @@ -669,27 +669,26 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { + if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, len)) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); + len += lstrlenW(pwzRelativeUrl) + lstrlenW(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; } - memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); - p = pwzResult + ARRAY_SIZE(mhtml_prefixW); + lstrcpyW(pwzResult, mhtml_prefixW); + p = pwzResult + lstrlenW(mhtml_prefixW); memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); p += url.mhtml_len; if(*pwzRelativeUrl) { - memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); - p += ARRAY_SIZE(mhtml_separatorW); - lstrcpyW(p, pwzRelativeUrl); + lstrcpyW(p, mhtml_separatorW); + lstrcatW(p, pwzRelativeUrl); }else { *p = 0; }

1 0

Michael Stefaniuc : inetcomm: Use wide-char string literals.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 33ab097d6de5d5bd318ce15db9f04658b1cccafc URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ab097d6de5d5bd318ce15d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 23 11:20:01 2020 +0200 inetcomm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/internettransport.c | 2 +- dlls/inetcomm/tests/mimeintl.c | 2 +- dlls/inetcomm/tests/mimeole.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index dcce0d9df17..f7060abe9e7 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); -static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0}; +static const WCHAR wszClassName[] = L"ThorConnWndClass"; #define IX_READ (WM_USER + 0) #define IX_READLINE (WM_USER + 1) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 09f9dae8d8c..11ec68d3223 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -235,7 +235,7 @@ static void test_convert(void) ULONG read; PROPVARIANT prop_in, prop_out; static char test_string[] = "test string"; - static WCHAR test_stringW[] = {'t','e','s','t',' ','s','t','r','i','n','g',0}; + static WCHAR test_stringW[] = L"test string"; hr = MimeOleGetInternat(&internat); ok(hr == S_OK, "ret %08x\n", hr); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index afd25af015c..04edd3773fd 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -826,7 +826,6 @@ static void test_mhtml_message(void) static void test_MessageSetProp(void) { static const char topic[] = "wine topic"; - static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0}; HRESULT hr; IMimeMessage *msg; IMimeBody *body; @@ -906,7 +905,7 @@ static void test_MessageSetProp(void) if(hr == S_OK) { ok(prop.vt == VT_LPWSTR, "type %d\n", prop.vt); - ok(!lstrcmpW(prop.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(prop.u.pwszVal)); + ok(!lstrcmpW(prop.u.pwszVal, L"wine topic"), "got %s\n", wine_dbgstr_w(prop.u.pwszVal)); PropVariantClear(&prop); } @@ -1488,8 +1487,6 @@ static void test_mhtml_protocol_info(void) unsigned i, exlen; HRESULT hres; - static const WCHAR http_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','o','r','g',0}; - hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); @@ -1516,8 +1513,9 @@ static void test_mhtml_protocol_info(void) } } - hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); + hres = IInternetProtocolInfo_CombineUrl(protocol_info, L"http://test.org", L"http://test.org", + ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url), + &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info);

1 0

Huw Davies : riched20: Use cell and para ptrs in the table border drawing function.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: ff23a6d79290a5d0f689af2b8dca98d868665dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff23a6d79290a5d0f689af2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:02 2020 +0100 riched20: Use cell and para ptrs in the table border drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 84 +++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 30c0d7f57fd..42f370c857c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -689,30 +689,31 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT } } -static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) +static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) { if (!c->editor->bEmulateVersion10) /* v4.1 */ { - if (para->pCell) + if (para_cell( para )) { RECT rc; - ME_Cell *cell = &para->pCell->member.cell; - ME_DisplayItem *paraAfterRow; + ME_Cell *cell = para_cell( para ); + ME_Paragraph *after_row; HPEN pen, oldPen; LOGBRUSH logBrush; HBRUSH brush; COLORREF color; POINT oldPt; int width; - BOOL atTop = (para->pCell != para->prev_para->member.para.pCell); - BOOL atBottom = (para->pCell != para->next_para->member.para.pCell); + BOOL atTop = (para == cell_first_para( cell )); + BOOL atBottom = (para == cell_end_para( cell )); int top = c->pt.y + (atTop ? cell->pt.y : para->pt.y); int bottom = (atBottom ? c->pt.y + cell->pt.y + cell->nHeight : top + para->nHeight + (atTop ? cell->yTextOffset : 0)); rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; - if (atTop) { + if (atTop) + { /* Erase gap before text if not all borders are the same height. */ width = max(ME_twips2pointsY(c, cell->border.top.width), 1); rc.top = top + width; @@ -725,14 +726,17 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) * The order borders are draw in is left, top, bottom, right in order * to be consistent with native richedit. This is noticeable from the * overlap of borders of different colours. */ - if (!(para->nFlags & MEPF_ROWEND)) { + if (!(para->nFlags & MEPF_ROWEND)) + { rc.top = top; rc.bottom = bottom; if (cell->border.left.width > 0) { color = cell->border.left.colorRef; width = max(ME_twips2pointsX(c, cell->border.left.width), 1); - } else { + } + else + { color = RGB(192,192,192); width = 1; } @@ -749,12 +753,15 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) MoveToEx(c->hDC, oldPt.x, oldPt.y, NULL); } - if (atTop) { + if (atTop) + { if (cell->border.top.width > 0) { brush = CreateSolidBrush(cell->border.top.colorRef); width = max(ME_twips2pointsY(c, cell->border.top.width), 1); - } else { + } + else + { brush = GetStockObject(LTGRAY_BRUSH); width = 1; } @@ -767,29 +774,24 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) /* Draw the bottom border if at the last paragraph in the cell, and when * in the last row of the table. */ - if (atBottom) { + if (atBottom) + { int oldLeft = rc.left; width = max(ME_twips2pointsY(c, cell->border.bottom.width), 1); - paraAfterRow = table_row_end( para )->next_para; - if (paraAfterRow->member.para.nFlags & MEPF_ROWSTART) { - ME_DisplayItem *nextEndCell; - nextEndCell = ME_FindItemBack( para_get_di( table_row_end( &paraAfterRow->member.para ) ), diCell ); - assert(nextEndCell && !nextEndCell->member.cell.next_cell); - rc.left = c->pt.x + nextEndCell->member.cell.pt.x; - /* FIXME: Native draws FROM the bottom of the table rather than - * TO the bottom of the table in this case, but just doing so here - * will cause the next row to erase the border. */ - /* - rc.top = bottom; - rc.bottom = rc.top + width; - */ + after_row = para_next( table_row_end( para ) ); + if (after_row->nFlags & MEPF_ROWSTART) + { + ME_Cell *next_end; + next_end = table_row_end_cell( after_row ); + assert( next_end && !cell_next( next_end ) ); + rc.left = c->pt.x + next_end->pt.x; } - if (rc.left < rc.right) { - if (cell->border.bottom.width > 0) { + if (rc.left < rc.right) + { + if (cell->border.bottom.width > 0) brush = CreateSolidBrush(cell->border.bottom.colorRef); - } else { + else brush = GetStockObject(LTGRAY_BRUSH); - } rc.bottom = bottom; rc.top = rc.bottom - width; FillRect(c->hDC, &rc, brush); @@ -800,15 +802,17 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) } /* Right border only drawn if at the end of the table row. */ - if (!cell->next_cell->member.cell.next_cell && - !(para->nFlags & MEPF_ROWSTART)) + if (!cell_next( cell_next( cell ) ) && !(para->nFlags & MEPF_ROWSTART)) { rc.top = top; rc.bottom = bottom; - if (cell->border.right.width > 0) { + if (cell->border.right.width > 0) + { color = cell->border.right.colorRef; width = max(ME_twips2pointsX(c, cell->border.right.width), 1); - } else { + } + else + { color = RGB(192,192,192); width = 1; } @@ -825,13 +829,15 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) MoveToEx(c->hDC, oldPt.x, oldPt.y, NULL); } } - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { /* Draw simple table border */ - if (para->fmt.dwMask & PFM_TABLE && para->fmt.wEffects & PFE_TABLE) { + if (para_in_table( para )) + { HPEN pen = NULL, oldpen = NULL; int i, firstX, startX, endX, rowY, rowBottom, nHeight; POINT oldPt; - PARAFORMAT2 *pNextFmt; pen = CreatePen(PS_SOLID, 0, para->border.top.colorRef); oldpen = SelectObject(c->hDC, pen); @@ -853,11 +859,9 @@ static void ME_DrawTableBorders( ME_Context *c, ME_Paragraph *para ) i = para->fmt.cTabCount - 1; endX = startX + ME_twips2pointsX(c, para->fmt.rgxTabs[i] & 0x00ffffff) + 1; LineTo(c->hDC, endX, rowY); - pNextFmt = &para->next_para->member.para.fmt; /* The bottom of the row only needs to be drawn if the next row is * not a table. */ - if (!(pNextFmt && pNextFmt->dwMask & PFM_TABLE && pNextFmt->wEffects && - para->nRows == 1)) + if (!(para_next( para ) && para_in_table( para_next( para ) ) && para->nRows == 1)) { /* Decrement rowBottom to draw the bottom line within the row, and * to not draw over this line when drawing the vertical lines. */ @@ -1026,7 +1030,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) no++; } - ME_DrawTableBorders( c, para ); + draw_table_borders( c, para ); draw_para_number( c, para ); SetTextAlign(c->hDC, align);

1 0

Huw Davies : riched20: Remove the caret at end hack.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: dd134546f4d9e4235acb1f2f760e3383182a29ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd134546f4d9e4235acb1f2f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:06 2020 +0100 riched20: Remove the caret at end hack. The end of one run already has a different cursor to the beginning of the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 111 +++++++++--------------------------------------- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 1 - dlls/riched20/table.c | 5 +-- 4 files changed, 21 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd134546f4d9e4235acb…

1 0

Huw Davies : riched20: Use cell ptrs in the wrapping functions.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 2809ac2b78c426a35d0a15d871f3f0443eed4c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2809ac2b78c426a35d0a15d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:03 2020 +0100 riched20: Use cell ptrs in the wrapping functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 105 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4f6eb82cea7..046a7fd5423 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -185,6 +185,8 @@ static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) static void ME_BeginRow(ME_WrapContext *wc) { + ME_Cell *cell; + wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; @@ -195,19 +197,18 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->bWordWrap = FALSE; if (wc->para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &ME_FindItemBack( para_get_di( wc->para ), diCell)->member.cell; + cell = table_row_end_cell( wc->para ); cell->nWidth = 0; } } - else if (wc->para->pCell) + else if (para_cell( wc->para )) { - ME_Cell *cell = &wc->para->pCell->member.cell; int width; + cell = para_cell( wc->para ); width = cell->nRightBoundary; - if (cell->prev_cell) - width -= cell->prev_cell->member.cell.nRightBoundary; - if (!cell->prev_cell) + if (cell_prev( cell )) width -= cell_prev( cell )->nRightBoundary; + else { int rowIndent = table_row_end( wc->para )->fmt.dxStartIndent; width -= rowIndent; @@ -217,13 +218,14 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->nAvailWidth = cell->nWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; wc->bWordWrap = TRUE; - } else { + } + else wc->nAvailWidth = wc->context->nAvailWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } + wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ - wc->para->fmt.dwMask & PFM_TABLE && wc->para->fmt.wEffects & PFE_TABLE) + para_in_table( wc->para )) /* Shift the text down because of the border. */ wc->pt.y++; } @@ -843,7 +845,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag else { int dxStartIndent = para->fmt.dxStartIndent; - if (para->pCell) dxStartIndent += table_row_end( para )->fmt.dxOffset; + if (para_cell( wc.para )) dxStartIndent += table_row_end( para )->fmt.dxOffset; wc.nLeftMargin = ME_twips2pointsX( c, dxStartIndent + para->fmt.dxOffset ); wc.nFirstMargin = ME_twips2pointsX( c, dxStartIndent ); @@ -916,33 +918,36 @@ static void update_repaint( ME_Paragraph *para, struct repaint_range *repaint ) static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_range *repaint ) { + ME_Cell *cell; + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_Paragraph *end_row_para = table_row_end( para ); int borderWidth = 0; - cell->member.cell.pt = c->pt; + + cell = table_row_first_cell( para ); + cell->pt = c->pt; /* Offset the text by the largest top border width. */ - while (cell->member.cell.next_cell) + while (cell_next( cell )) { - borderWidth = max(borderWidth, cell->member.cell.border.top.width); - cell = cell->member.cell.next_cell; + borderWidth = max( borderWidth, cell->border.top.width ); + cell = cell_next( cell ); } if (borderWidth > 0) { borderWidth = max(ME_twips2pointsY(c, borderWidth), 1); while (cell) { - cell->member.cell.yTextOffset = borderWidth; - cell = cell->member.cell.prev_cell; + cell->yTextOffset = borderWidth; + cell = cell_prev( cell ); } c->pt.y += borderWidth; } if (end_row_para->fmt.dxStartIndent > 0) { - cell = ME_FindItemFwd( para_get_di( para ), diCell); - cell->member.cell.pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); - c->pt.x = cell->member.cell.pt.x; + cell = table_row_first_cell( para ); + cell->pt.x += ME_twips2pointsX( c, end_row_para->fmt.dxStartIndent ); + c->pt.x = cell->pt.x; } } else if (para->nFlags & MEPF_ROWEND) @@ -950,74 +955,66 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran /* Set all the cells to the height of the largest cell */ ME_Paragraph *start_row_para = table_row_start( para ); int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); - para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + + cell = table_row_end_cell( para ); + para->nWidth = cell->pt.x + cell->nWidth; if (!(para_next( para )->nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ - cell = cell->member.cell.prev_cell; - while (cell) - { - bottomBorder = max(bottomBorder, cell->member.cell.border.bottom.width); - cell = cell->member.cell.prev_cell; - } + while ((cell = cell_prev( cell ))) + bottomBorder = max( bottomBorder, cell->border.bottom.width ); + bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack( para_get_di( para ), diCell ); + cell = table_row_end_cell( para ); } - prevHeight = cell->member.cell.nHeight; - nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; - cell->member.cell.nHeight = nHeight; + prevHeight = cell->nHeight; + nHeight = cell_prev( cell )->nHeight + bottomBorder; + cell->nHeight = nHeight; para->nHeight = nHeight; - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; - while (cell->member.cell.prev_cell) + while (cell_prev( cell )) { - cell = cell->member.cell.prev_cell; - cell->member.cell.nHeight = nHeight; + cell = cell_prev( cell ); + cell->nHeight = nHeight; } + /* Also set the height of the start row paragraph */ start_row_para->nHeight = nHeight; c->pt.x = start_row_para->pt.x; - c->pt.y = cell->member.cell.pt.y + nHeight; + c->pt.y = cell->pt.y + nHeight; if (prevHeight < nHeight) { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ update_repaint( para, repaint ); - cell = ME_FindItemBack( para_get_di( para ), diCell ); + cell = cell_prev( table_row_end_cell( para ) ); while (cell) { - update_repaint( &ME_FindItemBack(cell, diParagraph)->member.para, repaint ); - cell = cell->member.cell.prev_cell; + update_repaint( cell_end_para( cell ), repaint ); + cell = cell_prev( cell ); } } } - else if (para->pCell && para->pCell != para_next( para )->pCell) + else if ((cell = para_cell( para )) && para == cell_end_para( cell )) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &para->pCell->member.cell; cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ - if (cell->prev_cell) - cell->nHeight = max(cell->nHeight, cell->prev_cell->member.cell.nHeight); + if (cell_prev( cell )) + cell->nHeight = max( cell->nHeight, cell_prev( cell )->nHeight ); c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; - cell->next_cell->member.cell.pt = c->pt; - if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) + cell_next( cell )->pt = c->pt; + if (!(para_next( para )->nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (para->pCell) - { - /* Next paragraph in the same cell. */ - c->pt.x = para->pCell->member.cell.pt.x; - } - else - /* Normal paragraph */ + if ((cell = para_cell( para ))) /* Next paragraph in the same cell. */ + c->pt.x = cell->pt.x; + else /* Normal paragraph */ c->pt.x = 0; c->pt.y += para->nHeight; }

1 0

Zebediah Figura : winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 458dfcb95a9d8877921574535fc0d8d08084ac6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=458dfcb95a9d887792157453… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:16 2020 -0500 winegstreamer: Respect integer promotion rules when clamping timestamp + diff. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6279c2c28c0..68b12cf8f14 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2060,7 +2060,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil /* The documentation specifies that timestamp + diff must be nonnegative. */ diff = qm.Late * 100; - if (timestamp < -diff) + if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp);

1 0

Joachim Priesner : ntdll: Fix read buffer overflow in find_file_in_dir().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: e533a26dcff611f312e5bfce47061d2155476c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e533a26dcff611f312e5bfce… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Oct 22 18:29:49 2020 +0200 ntdll: Fix read buffer overflow in find_file_in_dir(). Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index afb552be098..d12a3ffb119 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2550,6 +2550,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i goto not_found; } } + /* if that did not work, restore previous state of unix_name */ + unix_name[pos - 1] = 0; } close( fd ); }

1 0

Paul Gofman : ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 36dcb6965146022c1a1f15c1653d5d713036db3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36dcb6965146022c1a1f15c1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Oct 21 22:52:24 2020 +0300 ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50010 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6fbb612825b..a332f961908 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1086,7 +1086,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rsi\n\t" "pushq %rdi\n\t" "leaq 0x200(%rcx),%rsi\n\t" - "leaq 0x60(%rsp),%rdi\n\t" + "leaq 0x70(%rsp),%rdi\n\t" "movq $0x14,%rcx\n\t" "cld\n\t" "rep; movsq\n\t"

1 0

Zebediah Figura : winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 63cf882e392478f8df339a3aa45940af9fe75936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cf882e392478f8df339a3a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 22 11:10:17 2020 -0500 winegstreamer: DirectShow and GStreamer proportions are inverted with respect to each other. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 22 +++++++++++++++++++++ dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++-------------- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 60b38a48f5a..57d40d19a89 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -37,9 +37,31 @@ #include "dshow.h" #include "strmif.h" #include "mfobjects.h" +#include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) extern LONG object_locks; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68b12cf8f14..9f5e147b7ed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2032,45 +2032,57 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) return IPin_Release(&pin->pin.pin.IPin_iface); } -static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstClockTime timestamp; GstClockTimeDiff diff; - GstEvent *evt; + GstEvent *event; - TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, - qm.Type, qm.Proportion, - wine_dbgstr_longlong(qm.Late), - wine_dbgstr_longlong(qm.TimeStamp)); + TRACE("pin %p, sender %p, type %s, proportion %u, late %s, timestamp %s.\n", + pin, sender, q.Type == Famine ? "Famine" : "Flood", q.Proportion, + debugstr_time(q.Late), debugstr_time(q.TimeStamp)); mark_wine_thread(); - /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + /* GST_QOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but * DirectShow filters might use Famine, so check that there actually is an * underrun. */ - if (qm.Type == Famine && qm.Proportion > 1000) + if (q.Type == Famine && q.Proportion < 1000) type = GST_QOS_TYPE_UNDERFLOW; /* DirectShow filters sometimes pass negative timestamps (Audiosurf uses the * current time instead of the time of the last buffer). GstClockTime is * unsigned, so clamp it to 0. */ - timestamp = max(qm.TimeStamp * 100, 0); + timestamp = max(q.TimeStamp * 100, 0); /* The documentation specifies that timestamp + diff must be nonnegative. */ - diff = qm.Late * 100; + diff = q.Late * 100; if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; - evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); + /* DirectShow "Proportion" describes what percentage of buffers the upstream + * filter should keep (i.e. dropping the rest). If frames are late, the + * proportion will be less than 1. For example, a proportion of 500 means + * that the element should drop half of its frames, essentially because + * frames are taking twice as long as they should to arrive. + * + * GStreamer "proportion" is the inverse of this; it describes how much + * faster the upstream element should produce frames. I.e. if frames are + * taking twice as long as they should to arrive, we want the frames to be + * decoded twice as fast, and so we pass 2.0 to GStreamer. */ - if (!evt) { - WARN("Failed to create QOS event\n"); - return E_INVALIDARG; + if (!q.Proportion) + { + WARN("Ignoring quality message with zero proportion.\n"); + return S_OK; } - gst_pad_push_event(pin->my_sink, evt); + if (!(event = gst_event_new_qos(type, 1000.0 / q.Proportion, diff, timestamp))) + ERR("Failed to create QOS event.\n"); + + gst_pad_push_event(pin->my_sink, event); return S_OK; }

1 0

Gijs Vermeulen : qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 4aabbaaf95444c0b88978128a25a65e4ecf12743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aabbaaf95444c0b88978128… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Oct 22 18:14:56 2020 +0200 qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46950 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 3 +++ dlls/qcap/tests/capturegraph.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b4f83956f0e..b98a321cb3a 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -343,6 +343,9 @@ static HRESULT WINAPI fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2 TRACE("graph %p, category %s, majortype %s, filter %p, iid %s, out %p.\n", graph, debugstr_guid(category), debugstr_guid(majortype), filter, debugstr_guid(iid), out); + if (!filter) + return E_POINTER; + if (category && IsEqualGUID(category, &LOOK_DOWNSTREAM_ONLY)) return find_interface_recurse(PINDIR_OUTPUT, NULL, NULL, filter, iid, out); diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index c37ac515734..cdd9a27828a 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -384,6 +384,10 @@ static void test_find_interface(void) /* Test search order without any restrictions applied. */ + hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype, + NULL, &testiid, (void **)&unk); + ok(hr == E_POINTER, "got hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests_from_filter2); ++i) { hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype,

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put CursorType.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 7287bd50077ce5d187e5435e9192ffcdc73e2d3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7287bd50077ce5d187e5435e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 22 14:46:20 2020 +0200 msado15: Implement _Recordset get/put CursorType. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a5096e5c4ff..e3dd83a4309 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -44,6 +44,7 @@ struct recordset LONG index; VARIANT *data; CursorLocationEnum cursor_location; + CursorTypeEnum cursor_type; }; struct fields @@ -910,14 +911,22 @@ static HRESULT WINAPI recordset_put_CacheSize( _Recordset *iface, LONG size ) static HRESULT WINAPI recordset_get_CursorType( _Recordset *iface, CursorTypeEnum *cursor_type ) { - FIXME( "%p, %p\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %p\n", iface, cursor_type ); + + *cursor_type = recordset->cursor_type; + return S_OK; } static HRESULT WINAPI recordset_put_CursorType( _Recordset *iface, CursorTypeEnum cursor_type ) { - FIXME( "%p, %d\n", iface, cursor_type ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + + TRACE( "%p, %d\n", iface, cursor_type ); + + recordset->cursor_type = cursor_type; + return S_OK; } static HRESULT WINAPI recordset_get_EOF( _Recordset *iface, VARIANT_BOOL *eof ) @@ -1546,6 +1555,7 @@ HRESULT Recordset_create( void **obj ) recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; + recordset->cursor_type = adOpenForwardOnly; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index adf9fb30bc2..e95df49c2c2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -68,6 +68,7 @@ static void test_Recordset(void) LONG refs, count, state; VARIANT missing, val, index; CursorLocationEnum location; + CursorTypeEnum cursor; BSTR name; HRESULT hr; @@ -144,6 +145,11 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( location == adUseServer, "got %d\n", location ); + cursor = adOpenUnspecified; + hr = _Recordset_get_CursorType( recordset, &cursor ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr );

1 0

Nikolay Sivov : evr/mixer: Implement GetOutputStatus().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: d63ff3403b323cf03522ca0a41b29446f6f11b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63ff3403b323cf03522ca0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:45 2020 +0300 evr/mixer: Implement GetOutputStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 32 +++++++++++++++++++++++++++++--- dlls/evr/tests/evr.c | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b87b621835e..2c2fda51cd1 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -934,11 +934,37 @@ static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, return hr; } -static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *flags) +static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *status) { - FIXME("%p, %p.\n", iface, flags); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = S_OK; + unsigned int i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, status); + + if (!status) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (!mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else + { + *status = MFT_OUTPUT_STATUS_SAMPLE_READY; + for (i = 0; i < mixer->input_count; ++i) + { + if (!mixer->inputs[i].sample) + { + *status = 0; + break; + } + } + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 776f61bbbe7..7cf127d4d8c 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2098,6 +2098,12 @@ static void test_mixer_samples(void) hr = IMFTransform_GetInputStatus(mixer, 1, &status); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputStatus(mixer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2132,6 +2138,11 @@ static void test_mixer_samples(void) hr = IMFTransform_GetInputStatus(mixer, 1, &status); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + status = ~0u; + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + IMFMediaType_Release(video_type); memset(&buffer, 0, sizeof(buffer)); @@ -2190,6 +2201,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + status = ~0u; + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2198,6 +2214,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_GetOutputStatus(mixer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : gdi32: Move the get_glyph_outline() helper to the font function interface.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: a3b08dd3f3e621d87782aff22447a95511b80a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b08dd3f3e621d87782aff2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:56:47 2020 +0200 gdi32: Move the get_glyph_outline() helper to the font function interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 80 ++++++++++++++++++++++------- dlls/gdi32/freetype.c | 130 +++-------------------------------------------- dlls/gdi32/gdi_private.h | 9 +--- 3 files changed, 73 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b08dd3f3e621d87782…

1 0

Huw Davies : riched20: Use cell ptrs in the rtf writing code.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: b2c812e3a3f8c3286373433635c4b653704c3d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c812e3a3f8c32863734336… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:49 2020 +0100 riched20: Use cell ptrs in the rtf writing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 182a725dbad..9e79eda274d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -316,7 +316,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs ME_Run *run = first; ME_FontTableItem *table = pStream->fonttbl; unsigned int i; - ME_DisplayItem *pCell = NULL; + ME_Cell *cell = NULL; ME_Paragraph *prev_para = NULL; do @@ -336,12 +336,10 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs if (run->para->fmt.wNumbering) add_font_to_fonttbl( pStream, run->para->para_num.style ); - if ((pCell = run->para->pCell)) + if ((cell = para_cell( run->para ))) { - ME_Border* borders[4] = { &pCell->member.cell.border.top, - &pCell->member.cell.border.left, - &pCell->member.cell.border.bottom, - &pCell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) if (borders[i]->width > 0) add_color_to_colortbl( pStream, borders[i]->colorRef ); @@ -389,7 +387,7 @@ static BOOL stream_out_font_and_colour_tbls( ME_OutStream *pStream, ME_Run *firs static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream, ME_Paragraph *para ) { - ME_DisplayItem *cell; + ME_Cell *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; const char sideChar[4] = {'t','l','b','r'}; @@ -399,19 +397,16 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream if (!editor->bEmulateVersion10) /* v4.1 */ { PARAFORMAT2 *pFmt = &table_row_end( para )->fmt; - para = table_row_start( para ); - cell = para->next_para->member.para.pCell; - assert(cell); + cell = table_row_first_cell( para ); + assert( cell ); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { - ME_Border* borders[4] = { &cell->member.cell.border.top, - &cell->member.cell.border.left, - &cell->member.cell.border.bottom, - &cell->member.cell.border.right }; + ME_Border* borders[4] = { &cell->border.top, &cell->border.left, + &cell->border.bottom, &cell->border.right }; for (i = 0; i < 4; i++) { if (borders[i]->width) @@ -425,9 +420,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream sprintf(props + strlen(props), "\\brdrcf%u", idx); } } - sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); - cell = cell->member.cell.next_cell; - } while (cell->member.cell.next_cell); + sprintf( props + strlen(props), "\\cellx%d", cell->nRightBoundary ); + cell = cell_next( cell ); + } while (cell_next( cell )); } else /* v1.0 - 3.0 */ {

1 0

Alexandre Julliard : gdi32: Move the font critical section out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 26f8b4a7bc131acd910c41748bda6971a84148c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26f8b4a7bc131acd910c4174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:54:35 2020 +0200 gdi32: Move the font critical section out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/gdi32/freetype.c | 95 ++++-------------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 125 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26f8b4a7bc131acd910c…

1 0

Michael Stefaniuc : cryptnet: Use wide-char string literals.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 081f5ae24f8264c203f6ec1a577b5ae77c943a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081f5ae24f8264c203f6ec1a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 22 12:46:00 2020 +0200 cryptnet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 2e0ab21f89b..5243481ff28 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', - 'd','l','l',0 }; /*********************************************************************** * DllRegisterServer (CRYPTNET.@) @@ -48,11 +46,11 @@ HRESULT WINAPI DllRegisterServer(void) { TRACE("\n"); CryptRegisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, 0, L"cryptnet.dll"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap", - cryptNet, "LdapProvOpenStore"); + L"cryptnet.dll", "LdapProvOpenStore"); CryptRegisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, - CERT_STORE_PROV_LDAP_W, cryptNet, "LdapProvOpenStore"); + CERT_STORE_PROV_LDAP_W, L"cryptnet.dll", "LdapProvOpenStore"); return S_OK; } @@ -63,7 +61,7 @@ HRESULT WINAPI DllUnregisterServer(void) { TRACE("\n"); CryptUnregisterDefaultOIDFunction(X509_ASN_ENCODING, - CRYPT_OID_VERIFY_REVOCATION_FUNC, cryptNet); + CRYPT_OID_VERIFY_REVOCATION_FUNC, L"cryptnet.dll"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, "Ldap"); CryptUnregisterOIDFunction(0, CRYPT_OID_OPEN_STORE_PROV_FUNC, CERT_STORE_PROV_LDAP_W); @@ -851,28 +849,6 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL, return FALSE; } -static const WCHAR x509cacert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','x','5','0','9','-','c','a','-','c','e','r','t',0 }; -static const WCHAR x509emailcert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','e','m','a','i','l','-','c','e','r','t', - 0 }; -static const WCHAR x509servercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','s','e','r','v','e','r','-','c','e','r', - 't',0 }; -static const WCHAR x509usercert[] = { 'a','p','p','l','i','c','a','t','i','o', - 'n','/','x','-','x','5','0','9','-','u','s','e','r','-','c','e','r','t',0 }; -static const WCHAR pkcs7cert[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','e','r','t','i','f','c','a','t','e', - 's',0 }; -static const WCHAR pkixCRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','p','k','i','x','-','c','r','l',0 }; -static const WCHAR pkcs7CRL[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','c','r','l',0 }; -static const WCHAR pkcs7sig[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','s','i','g','n','a','t','u','r','e',0 }; -static const WCHAR pkcs7mime[] = { 'a','p','p','l','i','c','a','t','i','o','n', - '/','x','-','p','k','c','s','7','-','m','i','m','e',0 }; - static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, LPCSTR pszObjectOid, DWORD dwRetrievalFlags, DWORD dwTimeout, PCRYPT_BLOB_ARRAY pObject, PFN_FREE_ENCODED_OBJECT_FUNC *ppfnFreeObject, @@ -908,9 +884,14 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, &hHost); if (ret) { - static LPCWSTR types[] = { x509cacert, x509emailcert, - x509servercert, x509usercert, pkcs7cert, pkixCRL, pkcs7CRL, - pkcs7sig, pkcs7mime, NULL }; + static LPCWSTR types[] = + { + L"application/x-x509-ca-cert", L"application/x-x509-email-cert", + L"application/x-x509-server-cert", L"application/x-x509-user-cert", + L"application/x-pkcs7-certifcates", L"application/pkix-crl", + L"application/x-pkcs7-crl", L"application/x-pkcs7-signature", + L"application/x-pkcs7-mime", NULL + }; HINTERNET hHttp = HttpOpenRequestW(hHost, NULL, components.lpszUrlPath, NULL, NULL, types, INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_UI,

1 0

Nikolay Sivov : evr/mixer: Fill output surfaces when not streaming.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 775daad7efcd272a35dc01178b18d701d0924e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=775daad7efcd272a35dc0117… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:46 2020 +0300 evr/mixer: Fill output surfaces when not streaming. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 19 ++++++++--- 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 2c2fda51cd1..b4bf1ed0967 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -712,6 +712,13 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const return count ? S_OK : hr; } +static HRESULT video_mixer_open_device_handle(struct video_mixer *mixer) +{ + IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); + mixer->device_handle = NULL; + return IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle); +} + static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDirectXVideoProcessorService **service) { HRESULT hr; @@ -728,9 +735,7 @@ static HRESULT video_mixer_get_processor_service(struct video_mixer *mixer, IDir &IID_IDirectXVideoProcessorService, (void **)service); if (hr == DXVA2_E_NEW_VIDEO_DEVICE) { - IDirect3DDeviceManager9_CloseDeviceHandle(mixer->device_manager, mixer->device_handle); - mixer->device_handle = NULL; - if (SUCCEEDED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(mixer->device_manager, &mixer->device_handle))) + if (SUCCEEDED(hr = video_mixer_open_device_handle(mixer))) continue; } break; @@ -1083,12 +1088,86 @@ static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DW return hr; } +static HRESULT video_mixer_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) +{ + IMFMediaBuffer *buffer; + IMFGetService *gs; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetBufferByIndex(sample, 0, &buffer))) + return hr; + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + IMFMediaBuffer_Release(buffer); + if (FAILED(hr)) + return hr; + + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)surface); + IMFGetService_Release(gs); + return hr; +} + +static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDevice9 **device) +{ + HRESULT hr; + + for (;;) + { + hr = IDirect3DDeviceManager9_LockDevice(mixer->device_manager, mixer->device_handle, + device, TRUE); + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) + { + if (SUCCEEDED(hr = video_mixer_open_device_handle(mixer))) + continue; + } + break; + } + + return hr; +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, - MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) + MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); + + if (!buffers || !count || !buffers->pSample) + return E_INVALIDARG; + + if (count > 1) + FIXME("Multiple buffers are not handled.\n"); + + *status = 0; + + EnterCriticalSection(&mixer->cs); + + if (SUCCEEDED(hr = video_mixer_get_sample_surface(buffers->pSample, &surface))) + { + if (mixer->is_streaming) + { + FIXME("Streaming state is not handled.\n"); + hr = E_NOTIMPL; + } + else + { + if (SUCCEEDED(hr = video_mixer_get_d3d_device(mixer, &device))) + { + IDirect3DDevice9_ColorFill(device, surface, NULL, 0); + IDirect3DDeviceManager9_UnlockDevice(mixer->device_manager, mixer->device_handle, FALSE); + IDirect3DDevice9_Release(device); + } + } + IDirect3DSurface9_Release(surface); + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static const IMFTransformVtbl video_mixer_transform_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7cf127d4d8c..fc74a11496b 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2062,6 +2062,7 @@ static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; MFT_OUTPUT_DATA_BUFFER buffer; + IMFVideoProcessor *processor; IDirect3DSurface9 *surface; IMFDesiredSample *desired; IDirect3DDevice9 *device; @@ -2086,6 +2087,9 @@ static void test_mixer_samples(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(mixer, &IID_IMFVideoProcessor, (void **)&processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); @@ -2147,7 +2151,6 @@ static void test_mixer_samples(void) memset(&buffer, 0, sizeof(buffer)); hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* It needs a sample with a backing surface. */ @@ -2156,7 +2159,6 @@ todo_wine buffer.pSample = sample; hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample); @@ -2175,17 +2177,25 @@ todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); +todo_wine ok(color == D3DCOLOR_ARGB(0x10, 0xff, 0x00, 0x00), "Unexpected color %#x.\n", color); /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); -todo_wine + ok(!color, "Unexpected color %#x.\n", color); + + hr = IMFVideoProcessor_SetBackgroundColor(processor, RGB(0, 0, 255)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_surface_color(surface, 0, 0); ok(!color, "Unexpected color %#x.\n", color); IMFDesiredSample_Clear(desired); @@ -2231,6 +2241,7 @@ todo_wine IDirect3DSurface9_Release(surface); + IMFVideoProcessor_Release(processor); IMFTransform_Release(mixer); IDirect3DDevice9_Release(device);

1 0

Alexandre Julliard : gdi32: Move the GetGlyphIndices() implementation out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 5bdc6e0fe64222d8d7d383616f5e230928af011a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bdc6e0fe64222d8d7d38361… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:13:52 2020 +0200 gdi32: Move the GetGlyphIndices() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 44 +++++++++++++++++++-- dlls/gdi32/freetype.c | 100 ++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 76 insertions(+), 71 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8c85614cb49..9c4fec88e1a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1103,17 +1103,55 @@ static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT count, WORD *gi, DWORD flags ) { struct font_physdev *physdev = get_font_dev( dev ); - DWORD ret; + UINT default_char; + char ch; + BOOL used, got_default = FALSE; + int i; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetGlyphIndices ); return dev->funcs->pGetGlyphIndices( dev, str, count, gi, flags ); } + + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + { + default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + got_default = TRUE; + } + EnterCriticalSection( &font_cs ); - ret = font_funcs->pGetGlyphIndices( physdev->font, str, count, gi, flags ); + + for (i = 0; i < count; i++) + { + UINT glyph = str[i]; + + if (!font_funcs->get_glyph_index( physdev->font, &glyph )) + { + glyph = 0; + if (physdev->font->codepage == CP_SYMBOL) + { + if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; + else if (str[i] < 0x100) glyph = str[i]; + } + else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + &ch, 1, NULL, &used ) && !used) + glyph = (unsigned char)ch; + } + if (!glyph) + { + if (!got_default) + { + default_char = font_funcs->get_default_glyph( physdev->font ); + got_default = TRUE; + } + glyph = default_char; + } + gi[i] = glyph; + } + LeaveCriticalSection( &font_cs ); - return ret; + return count; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b06a26b9e34..718c7f3407e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5661,89 +5661,54 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return pFT_Get_Char_Index(font->ft_face, glyph); } -/* helper for freetype_GetGlyphIndices */ -static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) +/************************************************************* + * freetype_get_glyph_index + */ +static BOOL CDECL freetype_get_glyph_index( struct gdi_font *gdi_font, UINT *glyph ) { - struct gdi_font *gdi_font = font->gdi_font; - WCHAR wc = (WCHAR)glyph; - BOOL default_used = FALSE; - BOOL *default_used_pointer = NULL; - FT_UInt ret; - char buf; + GdiFont *font = get_font_ptr( gdi_font ); - if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) - return get_glyph_index(font, glyph); + if (font->ft_face->charmap->encoding == FT_ENCODING_NONE) return FALSE; - if (codepage_sets_default_used(gdi_font->codepage)) - default_used_pointer = &default_used; - if(!WideCharToMultiByte(gdi_font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) - || default_used) + if (font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - if (gdi_font->codepage == CP_SYMBOL && wc < 0x100) - ret = (unsigned char)wc; - else - ret = 0; - } - else - ret = (unsigned char)buf; - TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); - return ret; -} - -static FT_UInt get_default_char_index(GdiFont *font) -{ - FT_UInt default_char; + if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + { + WCHAR wc = *glyph; + char ch; - if (FT_IS_SFNT(font->ft_face)) - { - TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); - default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); - } - else - { - TEXTMETRICW textm; - get_text_metrics(font, &textm); - default_char = textm.tmDefaultChar; + if (WideCharToMultiByte( CP_ACP, 0, &wc, 1, &ch, 1, NULL, NULL )) + *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + } + return TRUE; } - return default_char; + if ((*glyph = pFT_Get_Char_Index( font->ft_face, *glyph ))) + *glyph = get_GSUB_vert_glyph( font, *glyph ); + + return TRUE; } /************************************************************* - * freetype_GetGlyphIndices + * freetype_get_default_glyph */ -static DWORD CDECL freetype_GetGlyphIndices( struct gdi_font *gdi_font, LPCWSTR lpstr, - INT count, LPWORD pgi, DWORD flags ) +static UINT CDECL freetype_get_default_glyph( struct gdi_font *gdi_font ) { - GdiFont *font = get_font_ptr(gdi_font); - int i; - WORD default_char; - BOOL got_default = FALSE; - - if (flags & GGI_MARK_NONEXISTING_GLYPHS) - { - default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ - got_default = TRUE; - } + GdiFont *font = get_font_ptr( gdi_font ); + FT_WinFNT_HeaderRec winfnt; + TT_OS2 *pOS2; - for(i = 0; i < count; i++) + if ((pOS2 = pFT_Get_Sfnt_Table( font->ft_face, ft_sfnt_os2 ))) { - pgi[i] = get_gdi_glyph_index(font, lpstr[i]); - if (pgi[i] == 0) - { - if (!got_default) - { - default_char = get_default_char_index(font); - got_default = TRUE; - } - pgi[i] = default_char; - } - else - pgi[i] = get_GSUB_vert_glyph(font, pgi[i]); + UINT glyph = pOS2->usDefaultChar; + freetype_get_glyph_index( gdi_font, &glyph ); + return glyph; } - return count; + if (!pFT_Get_WinFNT_Header( font->ft_face, &winfnt )) return winfnt.default_char + winfnt.first_char; + return 32; } + static inline BOOL is_identity_FMAT2(const FMAT2 *matrix) { static const FMAT2 identity = { 1.0, 0.0, 0.0, 1.0 }; @@ -7838,7 +7803,6 @@ static const struct font_backend_funcs font_funcs = freetype_FontIsLinked, freetype_GetCharWidthInfo, freetype_GetFontUnicodeRanges, - freetype_GetGlyphIndices, freetype_GetKerningPairs, freetype_GetOutlineTextMetrics, freetype_GetTextMetrics, @@ -7849,6 +7813,8 @@ static const struct font_backend_funcs font_funcs = freetype_CreateScalableFontResource, freetype_alloc_font, freetype_get_font_data, + freetype_get_glyph_index, + freetype_get_default_glyph, freetype_get_glyph_outline, freetype_destroy_font }; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2302dc5a7a7..6d1caf6c65e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -356,7 +356,6 @@ struct font_backend_funcs BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); - DWORD (CDECL *pGetGlyphIndices)( struct gdi_font *font, const WCHAR *str, INT count, WORD *gi, DWORD flags ); DWORD (CDECL *pGetKerningPairs)( struct gdi_font *font, DWORD count, KERNINGPAIR *pairs ); UINT (CDECL *pGetOutlineTextMetrics)( struct gdi_font *font, UINT size, OUTLINETEXTMETRICW *metrics ); BOOL (CDECL *pGetTextMetrics)( struct gdi_font *font, TEXTMETRICW *metrics ); @@ -371,6 +370,8 @@ struct font_backend_funcs BOOL (CDECL *alloc_font)( struct gdi_font *font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, void *buf, DWORD count ); + BOOL (CDECL *get_glyph_index)( struct gdi_font *gdi_font, UINT *glyph ); + UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); void (CDECL *destroy_font)( struct gdi_font *font );

1 0

Alexandre Julliard : gdi32: Move the GetFontFileData() implementation out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 2d15ea5012e1fbd9e16a86c69d68b587128832ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d15ea5012e1fbd9e16a86c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:57:48 2020 +0200 gdi32: Move the GetFontFileData() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++- dlls/gdi32/freetype.c | 99 +++++++++++++----------------------------------- dlls/gdi32/gdi_private.h | 15 ++++++-- 3 files changed, 49 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d15ea5012e1fbd9e16a…

1 0

Huw Davies : riched20: Simplify some of the drawing code using a few helpers.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 6488613a3ad605d5640cff29aa86d65b2531b419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6488613a3ad605d5640cff29… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:50 2020 +0100 riched20: Simplify some of the drawing code using a few helpers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 3 +++ dlls/riched20/paint.c | 59 +++++++++++++++++++++++--------------------------- dlls/riched20/table.c | 22 +++++++++++++++++++ 3 files changed, 52 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 97d4c3bc5ab..68c54c2b328 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -280,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; +ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; @@ -289,6 +291,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5a0432a9eed..30c0d7f57fd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -23,12 +23,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) { - ME_DisplayItem *item; + ME_Paragraph *para; ME_Context c; + ME_Cell *cell; int ys, ye; HRGN oldRgn; @@ -44,36 +45,29 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - item = editor->pBuffer->pFirst->next; + para = editor_first_para( editor ); /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ c.pt.x = c.rcView.left - editor->horz_si.nPos; c.pt.y = c.rcView.top - editor->vert_si.nPos; - while(item != editor->pBuffer->pLast) + while (para_next( para )) { - assert(item->type == diParagraph); - - ys = c.pt.y + item->member.para.pt.y; - if (item->member.para.pCell - != item->member.para.next_para->member.para.pCell) - { - ME_Cell *cell = NULL; - cell = &ME_FindItemBack(item->member.para.next_para, diCell)->member.cell; + ys = c.pt.y + para->pt.y; + cell = para_cell( para ); + if (cell && para == cell_end_para( cell )) ye = c.pt.y + cell->pt.y + cell->nHeight; - } else { - ye = ys + item->member.para.nHeight; - } - if (item->member.para.pCell && !(item->member.para.nFlags & MEPF_ROWEND) && - item->member.para.pCell != item->member.para.prev_para->member.para.pCell) + else ye = ys + para->nHeight; + + if (cell && !(para->nFlags & MEPF_ROWEND) && para == cell_first_para( cell )) { /* the border shifts the text down */ - ys -= item->member.para.pCell->member.cell.yTextOffset; + ys -= para_cell( para )->yTextOffset; } /* Draw the paragraph if any of the paragraph is in the update region. */ if (ys < rcUpdate->bottom && ye > rcUpdate->top) - ME_DrawParagraph(&c, item); - item = item->member.para.next_para; + draw_paragraph( &c, para ); + para = para_next( para ); } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) { @@ -909,12 +903,12 @@ static void draw_para_number( ME_Context *c, ME_Paragraph *para ) } } -static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) +static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; + ME_Cell *cell; ME_Run *run; - ME_Paragraph *para = NULL; RECT rc, bounds; int y; int height = 0, baseline = 0, no=0; @@ -923,32 +917,33 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.left = c->pt.x; rc.right = c->rcView.right; - assert(paragraph); - para = &paragraph->member.para; y = c->pt.y + para->pt.y; - if (para->pCell) + if ((cell = para_cell( para ))) { - ME_Cell *cell = &para->pCell->member.cell; rc.left = c->pt.x + cell->pt.x; rc.right = rc.left + cell->nWidth; } - if (para->nFlags & MEPF_ROWSTART) { - ME_Cell *cell = &para->next_para->member.para.pCell->member.cell; + if (para->nFlags & MEPF_ROWSTART) + { + cell = table_row_first_cell( para ); rc.right = c->pt.x + cell->pt.x; - } else if (para->nFlags & MEPF_ROWEND) { - ME_Cell *cell = &para->prev_para->member.para.pCell->member.cell; + } + else if (para->nFlags & MEPF_ROWEND) + { + cell = table_row_end_cell( para ); rc.left = c->pt.x + cell->pt.x + cell->nWidth; } ME_DrawParaDecoration(c, para, y, &bounds); y += bounds.top; - if (bounds.left || bounds.right) { + if (bounds.left || bounds.right) + { rc.left = max(rc.left, c->pt.x + bounds.left); rc.right = min(rc.right, c->pt.x - bounds.right + max(c->editor->sizeWindow.cx, c->editor->nTotalWidth)); } - for (p = paragraph->next; p != para->next_para; p = p->next) + for (p = para_get_di( para )->next; p != para_get_di( para_next( para ) ); p = p->next) { switch(p->type) { case diParagraph: diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 63b5d0fd05b..daae18d5968 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -180,6 +180,14 @@ ME_Cell *table_row_first_cell( ME_Paragraph *para ) return para_cell( para ); } +ME_Cell *table_row_end_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_prev( table_row_end( para )); + return cell_next( para_cell( para ) ); +} + ME_Cell *cell_next( ME_Cell *cell ) { if (!cell->next_cell) return NULL; @@ -192,6 +200,20 @@ ME_Cell *cell_prev( ME_Cell *cell ) return &cell->prev_cell->member.cell; } +ME_Paragraph *cell_first_para( ME_Cell *cell ) +{ + return &ME_FindItemFwd( cell_get_di( cell ), diParagraph )->member.para; +} + +ME_Paragraph *cell_end_para( ME_Cell *cell ) +{ + ME_Cell *next = cell_next( cell ); + + if (!next) return cell_first_para( cell ); /* End of row */ + + return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Use cell ptrs in the rtf parsing code.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 431ee50875a0356ece4c27f5c8699494f044b550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431ee50875a0356ece4c27f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:48 2020 +0100 riched20: Use cell ptrs in the rtf parsing code. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 39 ++++++++++++++++++++------------------- dlls/riched20/editor.h | 9 +++++++++ dlls/riched20/para.c | 6 ++++++ dlls/riched20/table.c | 20 ++++++++++++++++++++ 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 15dd75b9575..0cc33ad5d9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,8 +987,9 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *cell, *run; + ME_DisplayItem *run; ME_Paragraph *para; + ME_Cell *cell; int i; if (!tableDef) @@ -1004,44 +1005,44 @@ void ME_RTFSpecialCharHook(RTF_Info *info) info->nestingLevel++; } para = tableDef->row_start; - cell = ME_FindItemFwd( para_get_di( para ), diCell ); - assert(cell && !cell->member.cell.prev_cell); + cell = table_row_first_cell( para ); + assert( cell && !cell_prev( cell ) ); if (tableDef->numCellsDefined < 1) { /* 2000 twips appears to be the cell size that native richedit uses * when no cell sizes are specified. */ - const int defaultCellSize = 2000; - int nRightBoundary = defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; - while (cell->member.cell.next_cell) { - cell = cell->member.cell.next_cell; - nRightBoundary += defaultCellSize; - cell->member.cell.nRightBoundary = nRightBoundary; + const int default_size = 2000; + int right_boundary = default_size; + cell->nRightBoundary = right_boundary; + while (cell_next( cell )) + { + cell = cell_next( cell ); + right_boundary += default_size; + cell->nRightBoundary = right_boundary; } para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; - cell->member.cell.nRightBoundary = nRightBoundary; + cell = para_cell( para ); + cell->nRightBoundary = right_boundary; } else { for (i = 0; i < tableDef->numCellsDefined; i++) { RTFCell *cellDef = &tableDef->cells[i]; - cell->member.cell.nRightBoundary = cellDef->rightBoundary; - ME_ApplyBorderProperties(info, &cell->member.cell.border, - cellDef->border); - cell = cell->member.cell.next_cell; + cell->nRightBoundary = cellDef->rightBoundary; + ME_ApplyBorderProperties( info, &cell->border, cellDef->border ); + cell = cell_next( cell ); if (!cell) { para = table_insert_cell( info->editor, info->editor->pCursors ); - cell = para->pCell; + cell = para_cell( para ); } } /* Cell for table row delimiter is empty */ - cell->member.cell.nRightBoundary = tableDef->cells[i-1].rightBoundary; + cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd(cell, diRun); + run = ME_FindItemFwd( cell_get_di( cell) , diRun ); if (info->editor->pCursors[0].pRun != run || info->editor->pCursors[0].nOffset) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 168a8e58cc2..97d4c3bc5ab 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -204,6 +204,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPE void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_Cell *para_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_destroy( ME_TextEditor *editor, ME_Paragraph *item ) DECLSPEC_HIDDEN; ME_Run *para_end_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; @@ -279,6 +280,8 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; +ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; +ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; @@ -286,6 +289,7 @@ ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; +ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; @@ -293,6 +297,11 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HID void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; +static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) +{ + return (ME_DisplayItem *)((ptrdiff_t)cell - offsetof(ME_DisplayItem, member)); +} + /* txthost.c */ ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1db553a3478..db258947916 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -124,6 +124,12 @@ BOOL para_in_table( ME_Paragraph *para ) return para->fmt.wEffects & PFE_TABLE; } +ME_Cell *para_cell( ME_Paragraph *para ) +{ + if (!para->pCell) return NULL; + return &para->pCell->member.cell; +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { static const WCHAR cr_lf[] = {'\r','\n',0}; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index aff4f0dc13f..63b5d0fd05b 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -172,6 +172,26 @@ ME_Paragraph* table_outer_para( ME_Paragraph *para ) return para; } +ME_Cell *table_row_first_cell( ME_Paragraph *para ) +{ + if (!para_in_table( para )) return NULL; + + para = para_next( table_row_start( para ) ); + return para_cell( para ); +} + +ME_Cell *cell_next( ME_Cell *cell ) +{ + if (!cell->next_cell) return NULL; + return &cell->next_cell->member.cell; +} + +ME_Cell *cell_prev( ME_Cell *cell ) +{ + if (!cell->prev_cell) return NULL; + return &cell->prev_cell->member.cell; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text

1 0

Huw Davies : riched20: Return paragraph ptrs from the remaining table insert functions.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 670dadf719798c7ae95a0922d610d2c011df4a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=670dadf719798c7ae95a0922… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:47 2020 +0100 riched20: Return paragraph ptrs from the remaining table insert functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 4 ++-- dlls/riched20/table.c | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 36c2e108b2d..15dd75b9575 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -966,7 +966,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) tableDef->row_start = table_insert_row_start_at_para( info->editor, para ); info->nestingLevel = 1; } - ME_InsertTableCellFromCursor(info->editor); + table_insert_cell( info->editor, info->editor->pCursors ); } } else /* v1.0 - v3.0 */ @@ -1018,7 +1018,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nRightBoundary += defaultCellSize; cell->member.cell.nRightBoundary = nRightBoundary; } - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; cell->member.cell.nRightBoundary = nRightBoundary; } @@ -1033,7 +1033,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell = cell->member.cell.next_cell; if (!cell) { - para = &ME_InsertTableCellFromCursor(info->editor)->member.para; + para = table_insert_cell( info->editor, info->editor->pCursors ); cell = para->pCell; } } @@ -1056,7 +1056,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) nChars, TRUE); } - para = &ME_InsertTableRowEndFromCursor(info->editor)->member.para; + para = table_insert_row_end( info->editor, info->editor->pCursors ); para->fmt.dxOffset = abs(info->tableDef->gapH); para->fmt.dxStartIndent = info->tableDef->leftEdge; ME_ApplyBorderProperties( info, &para->border, tableDef->border ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e9a7a77e234..168a8e58cc2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -279,9 +279,9 @@ ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; +ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 1b735638606..aff4f0dc13f 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -113,21 +113,19 @@ ME_Paragraph* table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragrap /* Inserts a diCell and starts a new paragraph for the next cell. * * Returns the first paragraph of the new cell. */ -ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_Paragraph *para; WCHAR tab = '\t'; - para = table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); - return para_get_di( para ); + return table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); } -ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) +ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWEND ); - return para_get_di( para_prev( para ) ); + para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + return para_prev( para ); } ME_Paragraph* table_row_end( ME_Paragraph *para ) @@ -424,13 +422,13 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) while (cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; - para = &ME_InsertTableCellFromCursor( editor )->member.para; + para = table_insert_cell( editor, editor->pCursors ); insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - para = &ME_InsertTableRowEndFromCursor(editor)->member.para; + para = table_insert_row_end( editor, editor->pCursors ); para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para );

1 0

Nikolay Sivov : mf/evr: Create sample allocators on demand.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: b8d10aa46c123f0c35729e8982e8976c77dc5536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d10aa46c123f0c35729e89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:29:03 2020 +0300 mf/evr: Create sample allocators on demand. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 957d0e0f797..cc3f828e540 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -528,13 +528,26 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct video_stream *stream = impl_from_stream_IMFGetService(iface); + HRESULT hr = S_OK; TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE)) { if (IsEqualIID(riid, &IID_IMFVideoSampleAllocator)) - return IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); + { + EnterCriticalSection(&stream->cs); + + if (!stream->allocator) + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator); + if (SUCCEEDED(hr)) + hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); + + LeaveCriticalSection(&stream->cs); + + return hr; + } + return E_NOINTERFACE; } @@ -569,9 +582,6 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns if (FAILED(hr = MFCreateEventQueue(&stream->event_queue))) goto failed; - if (FAILED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator))) - goto failed; - stream->parent = renderer; IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id;

1 0

Nikolay Sivov : evr/sample: Implement SetDirectXManager().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: a6512b32efcf4a4306a8b13b4c46cc387562fc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6512b32efcf4a4306a8b13b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:29:02 2020 +0300 evr/sample: Implement SetDirectXManager(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index cd6cef001aa..f5189443307 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -21,6 +21,8 @@ #include "evr.h" #include "mfapi.h" #include "mferror.h" +#include "d3d9.h" +#include "dxva2api.h" #include "wine/debug.h" #include "wine/heap.h" @@ -108,6 +110,7 @@ struct sample_allocator IMFVideoSampleAllocatorNotify *callback; unsigned int free_samples; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; }; @@ -168,6 +171,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) { if (allocator->callback) IMFVideoSampleAllocatorNotify_Release(allocator->callback); + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); DeleteCriticalSection(&allocator->cs); heap_free(allocator); } @@ -178,9 +183,27 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) static HRESULT WINAPI sample_allocator_SetDirectXManager(IMFVideoSampleAllocator *iface, IUnknown *manager) { - FIXME("%p, %p.\n", iface, manager); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocator(iface); + IDirect3DDeviceManager9 *device_manager = NULL; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, manager); + + if (manager && FAILED(hr = IUnknown_QueryInterface(manager, &IID_IDirect3DDeviceManager9, + (void **)&device_manager))) + { + return hr; + } + + EnterCriticalSection(&allocator->cs); + + if (allocator->device_manager) + IDirect3DDeviceManager9_Release(allocator->device_manager); + allocator->device_manager = device_manager; + + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static HRESULT WINAPI sample_allocator_UninitializeSampleAllocator(IMFVideoSampleAllocator *iface)

1 0

Nikolay Sivov : evr/presenter: Add IMFVideoPositionMapper stub.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 529eb28488c4ef7300a22423228aaa0aaede561b URL: https://source.winehq.org/git/wine.git/?a=commit;h=529eb28488c4ef7300a22423… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:48 2020 +0300 evr/presenter: Add IMFVideoPositionMapper stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 8 ++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8fcd6d58b3c..96eaa4426fc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -48,6 +48,7 @@ struct video_presenter IMFVideoDisplayControl IMFVideoDisplayControl_iface; IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; + IMFVideoPositionMapper IMFVideoPositionMapper_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -104,6 +105,11 @@ static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); } +static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapper *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); +} + static unsigned int get_gcd(unsigned int a, unsigned int b) { unsigned int m; @@ -191,6 +197,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFGetService_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { + *obj = &presenter->IMFVideoPositionMapper_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -900,8 +910,11 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service)) { - if (IsEqualIID(riid, &IID_IMFVideoDisplayControl)) + if (IsEqualIID(riid, &IID_IMFVideoDisplayControl) || + IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + { return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); + } else { FIXME("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -922,6 +935,40 @@ static const IMFGetServiceVtbl video_presenter_getservice_vtbl = video_presenter_getservice_GetService, }; +static HRESULT WINAPI video_presenter_position_mapper_QueryInterface(IMFVideoPositionMapper *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_position_mapper_AddRef(IMFVideoPositionMapper *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_position_mapper_Release(IMFVideoPositionMapper *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoPositionMapper(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_position_mapper_MapOutputCoordinateToInputStream(IMFVideoPositionMapper *iface, + float x_out, float y_out, DWORD output_stream, DWORD input_stream, float *x_in, float *y_in) +{ + FIXME("%p, %f, %f, %u, %u, %p, %p.\n", iface, x_out, y_out, output_stream, input_stream, x_in, y_in); + + return E_NOTIMPL; +} + +static const IMFVideoPositionMapperVtbl video_presenter_position_mapper_vtbl = +{ + video_presenter_position_mapper_QueryInterface, + video_presenter_position_mapper_AddRef, + video_presenter_position_mapper_Release, + video_presenter_position_mapper_MapOutputCoordinateToInputStream, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -984,6 +1031,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; + object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7447f388ed7..0158a0320a7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1099,6 +1099,14 @@ static void test_default_presenter(void) if (FAILED(hr)) return; + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Only accept single output buffer in ProcessOutput().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 8c4723c5bdb077725b9da3659fedd8d09a264fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4723c5bdb077725b9da365… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:47 2020 +0300 evr/mixer: Only accept single output buffer in ProcessOutput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 6 +++--- dlls/evr/tests/evr.c | 29 ++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b4bf1ed0967..48875a200fd 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1136,11 +1136,11 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); - if (!buffers || !count || !buffers->pSample) + if (!buffers || !count || count > 1 || !buffers->pSample) return E_INVALIDARG; - if (count > 1) - FIXME("Multiple buffers are not handled.\n"); + if (buffers->dwStreamID) + return MF_E_INVALIDSTREAMNUMBER; *status = 0; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fc74a11496b..7447f388ed7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2061,7 +2061,7 @@ static DWORD get_surface_color(IDirect3DSurface9 *surface, unsigned int x, unsig static void test_mixer_samples(void) { IDirect3DDeviceManager9 *manager; - MFT_OUTPUT_DATA_BUFFER buffer; + MFT_OUTPUT_DATA_BUFFER buffers[2]; IMFVideoProcessor *processor; IDirect3DSurface9 *surface; IMFDesiredSample *desired; @@ -2149,16 +2149,16 @@ static void test_mixer_samples(void) IMFMediaType_Release(video_type); - memset(&buffer, 0, sizeof(buffer)); - hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + memset(buffers, 0, sizeof(buffers)); + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* It needs a sample with a backing surface. */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - buffer.pSample = sample; - hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + buffers[0].pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample); @@ -2171,8 +2171,8 @@ static void test_mixer_samples(void) hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&desired); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - buffer.pSample = sample; - hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + buffers[0].pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "Unexpected hr %#x.\n", hr); @@ -2183,7 +2183,7 @@ todo_wine /* Streaming is not started yet. Output is colored black, but only if desired timestamps were set. */ IMFDesiredSample_SetDesiredSampleTimeAndDuration(desired, 100, 0); - hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); @@ -2192,12 +2192,23 @@ todo_wine hr = IMFVideoProcessor_SetBackgroundColor(processor, RGB(0, 0, 255)); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFTransform_ProcessOutput(mixer, 0, 1, &buffer, &status); + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); color = get_surface_color(surface, 0, 0); ok(!color, "Unexpected color %#x.\n", color); + hr = IMFTransform_ProcessOutput(mixer, 0, 2, buffers, &status); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + buffers[1].pSample = sample; + hr = IMFTransform_ProcessOutput(mixer, 0, 2, buffers, &status); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + buffers[0].dwStreamID = 1; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + IMFDesiredSample_Clear(desired); hr = IMFTransform_ProcessInput(mixer, 0, NULL, 0);

1 0

Nikolay Sivov : evr/mixer: Implement GetInputStatus().
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 5496b889176960e6af7094a01afdd429b0c28c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5496b889176960e6af7094a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:02:44 2020 +0300 evr/mixer: Implement GetInputStatus(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 24 +++++++++++++++++++++--- dlls/evr/tests/evr.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 55acf179bdc..b87b621835e 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -909,11 +909,29 @@ static HRESULT WINAPI video_mixer_transform_GetOutputCurrentType(IMFTransform *i return hr; } -static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) +static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *status) { - FIXME("%p, %u, %p.\n", iface, id, flags); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + struct input_stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, status); + + if (!status) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + + if (!mixer->output.media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (SUCCEEDED(hr = video_mixer_get_input(mixer, id, &stream))) + { + *status = stream->sample ? 0 : MFT_INPUT_STATUS_ACCEPT_DATA; + } + + LeaveCriticalSection(&mixer->cs); + + return hr; } static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *flags) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d71a63ff602..776f61bbbe7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2086,6 +2086,18 @@ static void test_mixer_samples(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 1, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStatus(mixer, 1, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + /* Configure device and media types. */ hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2106,9 +2118,20 @@ static void test_mixer_samples(void) hr = IMFTransform_SetInputType(mixer, 0, video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_SetOutputType(mixer, 0, video_type, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + status = 0; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + + hr = IMFTransform_GetInputStatus(mixer, 1, &status); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(video_type); memset(&buffer, 0, sizeof(buffer)); @@ -2162,9 +2185,19 @@ todo_wine hr = IMFTransform_ProcessInput(mixer, 5, NULL, 0); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + status = 0; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + status = ~0u; + hr = IMFTransform_GetInputStatus(mixer, 0, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!status, "Unexpected status %#x.\n", status); + hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/evr: Set the device manager for sample allocators.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: fe70e7beb509508cd70a2aa7d612b66c46f7c411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe70e7beb509508cd70a2aa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 14:29:04 2020 +0300 mf/evr: Set the device manager for sample allocators. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index cc3f828e540..537d859d229 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -83,6 +83,7 @@ struct video_renderer IMFTransform *mixer; IMFVideoPresenter *presenter; + IUnknown *device_manager; unsigned int flags; unsigned int state; @@ -539,7 +540,11 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, EnterCriticalSection(&stream->cs); if (!stream->allocator) + { hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator); + if (SUCCEEDED(hr)) + hr = IMFVideoSampleAllocator_SetDirectXManager(stream->allocator, stream->parent->device_manager); + } if (SUCCEEDED(hr)) hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); @@ -667,6 +672,8 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) IMFTransform_Release(renderer->mixer); if (renderer->presenter) IMFVideoPresenter_Release(renderer->presenter); + if (renderer->device_manager) + IUnknown_Release(renderer->device_manager); if (renderer->clock) IMFPresentationClock_Release(renderer->clock); if (renderer->attributes) @@ -1183,6 +1190,12 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere IMFTopologyServiceLookupClient_Release(lookup_client); } + if (FAILED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IUnknown, (void **)&renderer->device_manager))) + { + WARN("Failed to get device manager from the presenter.\n"); + } + return hr; } @@ -1203,6 +1216,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra renderer->presenter = NULL; } + if (renderer->device_manager) + { + IUnknown_Release(renderer->device_manager); + renderer->device_manager = NULL; + } + renderer->mixer = mixer; IMFTransform_AddRef(renderer->mixer);

1 0

Michael Stefaniuc : cryptnet/tests: Change the scope of a variable from global to local.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: c7c49ab57dd8d1df1cfdf93c97fa9e4c352700f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c49ab57dd8d1df1cfdf93c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 22 12:45:59 2020 +0200 cryptnet/tests: Change the scope of a variable from global to local. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/tests/cryptnet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 0b017604c04..3eca9e43f2e 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -99,11 +99,10 @@ static void compareUrlArray(const CRYPT_URL_ARRAY *expected, } } -static WCHAR url[] = - { 'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0 }; static void test_getObjectUrl(void) { + static WCHAR url[] = L"http://winehq.org"; BOOL ret; DWORD urlArraySize = 0, infoSize = 0; PCCERT_CONTEXT cert;

1 0

Huw Davies : riched20: Return a para ptr from the insert start table row functions.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: caa1d4a4802a234cd852b31166ba31ab0470a8a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa1d4a4802a234cd852b311… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 22 12:46:46 2020 +0100 riched20: Return a para ptr from the insert start table row functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 191 +++++++++++++++++++++++++------------------------ dlls/riched20/editor.h | 5 +- dlls/riched20/rtf.h | 4 +- dlls/riched20/table.c | 63 ++++++++-------- 4 files changed, 131 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=caa1d4a4802a234cd852…

1 0

Alexandre Julliard : gdi32: Move the glyph metrics cache out of freetype.c.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: b3d55e2ce509bf2e75246da54e080adde2c76b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d55e2ce509bf2e75246da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:51:07 2020 +0200 gdi32: Move the glyph metrics cache out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 60 +++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 69 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 8 ++++++ 3 files changed, 70 insertions(+), 67 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 31c9d1561a5..0882b5ef1ba 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -430,8 +430,12 @@ struct gdi_font *alloc_gdi_font(void) void free_gdi_font( struct gdi_font *font ) { + DWORD i; + if (font->private) font_funcs->destroy_font( font ); free_font_handle( font->handle ); + for (i = 0; i < font->gm_size; i++) HeapFree( GetProcessHeap(), 0, font->gm[i] ); + HeapFree( GetProcessHeap(), 0, font->gm ); HeapFree( GetProcessHeap(), 0, font->name ); HeapFree( GetProcessHeap(), 0, font->fileinfo ); HeapFree( GetProcessHeap(), 0, font ); @@ -469,6 +473,62 @@ void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T da else font->fileinfo->size.QuadPart = data_size; } +struct glyph_metrics +{ + GLYPHMETRICS gm; + ABC abc; /* metrics of the unrotated char */ + BOOL init; +}; + +#define GM_BLOCK_SIZE 128 + +/* TODO: GGO format support */ +BOOL get_gdi_font_glyph_metrics( struct gdi_font *font, UINT index, GLYPHMETRICS *gm, ABC *abc ) +{ + UINT block = index / GM_BLOCK_SIZE; + UINT entry = index % GM_BLOCK_SIZE; + + if (block < font->gm_size && font->gm[block] && font->gm[block][entry].init) + { + *gm = font->gm[block][entry].gm; + *abc = font->gm[block][entry].abc; + + TRACE( "cached gm: %u, %u, %s, %d, %d abc: %d, %u, %d\n", + gm->gmBlackBoxX, gm->gmBlackBoxY, wine_dbgstr_point( &gm->gmptGlyphOrigin ), + gm->gmCellIncX, gm->gmCellIncY, abc->abcA, abc->abcB, abc->abcC ); + return TRUE; + } + + return FALSE; +} + +void set_gdi_font_glyph_metrics( struct gdi_font *font, UINT index, const GLYPHMETRICS *gm, const ABC *abc ) +{ + UINT block = index / GM_BLOCK_SIZE; + UINT entry = index % GM_BLOCK_SIZE; + + if (block >= font->gm_size) + { + struct glyph_metrics **ptr; + + if (font->gm) + ptr = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, (block + 1) * sizeof(*ptr) ); + else + ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, (block + 1) * sizeof(*ptr) ); + if (!ptr) return; + font->gm_size = block + 1; + font->gm = ptr; + } + if (!font->gm[block]) + { + font->gm[block] = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**font->gm) * GM_BLOCK_SIZE ); + if (!font->gm[block]) return; + } + font->gm[block][entry].gm = *gm; + font->gm[block][entry].abc = *abc; + font->gm[block][entry].init = TRUE; +} + /* font cache */ static struct list gdi_font_list = LIST_INIT( gdi_font_list ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 58e85a4515e..8251b257a3d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -304,12 +304,6 @@ typedef struct tagFamily { struct list *replacement; } Family; -typedef struct { - GLYPHMETRICS gm; - ABC abc; /* metrics of the unrotated char */ - BOOL init; -} GM; - typedef struct tagGdiFont GdiFont; typedef struct { @@ -320,8 +314,6 @@ typedef struct { struct tagGdiFont { struct gdi_font *gdi_font; - GM **gm; - DWORD gmsize; OUTLINETEXTMETRICW *potm; DWORD total_kern_pairs; KERNINGPAIR *kern_pairs; @@ -356,9 +348,6 @@ struct enum_charset_list { struct enum_charset_element element[32]; }; -#define GM_BLOCK_SIZE 128 -#define FONT_GM(font,idx) (&(font)->gm[(idx) / GM_BLOCK_SIZE][(idx) % GM_BLOCK_SIZE]) - static struct list system_links = LIST_INIT(system_links); static struct list font_subst_list = LIST_INIT(font_subst_list); @@ -4068,9 +4057,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) { GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - ret->gmsize = 1; - ret->gm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GM*)); - ret->gm[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); ret->potm = NULL; ret->total_kern_pairs = (DWORD)-1; ret->kern_pairs = NULL; @@ -4087,7 +4073,6 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) { GdiFont *font = get_font_ptr( gdi_font ); CHILD_FONT *child, *child_next; - DWORD i; LIST_FOR_EACH_ENTRY_SAFE( child, child_next, &font->child_fonts, CHILD_FONT, entry ) { @@ -4102,60 +4087,10 @@ static void CDECL freetype_destroy_font( struct gdi_font *gdi_font ) if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs); HeapFree(GetProcessHeap(), 0, font->potm); - for (i = 0; i < font->gmsize; i++) - HeapFree(GetProcessHeap(),0,font->gm[i]); - HeapFree(GetProcessHeap(), 0, font->gm); HeapFree(GetProcessHeap(), 0, font->GSUB_Table); HeapFree(GetProcessHeap(), 0, font); } -/* TODO: GGO format support */ -static BOOL get_cached_metrics( GdiFont *font, UINT index, GLYPHMETRICS *gm, ABC *abc ) -{ - UINT block = index / GM_BLOCK_SIZE; - UINT entry = index % GM_BLOCK_SIZE; - - if (block < font->gmsize && font->gm[block] && font->gm[block][entry].init) - { - *gm = font->gm[block][entry].gm; - *abc = font->gm[block][entry].abc; - - TRACE( "cached gm: %u, %u, %s, %d, %d abc: %d, %u, %d\n", - gm->gmBlackBoxX, gm->gmBlackBoxY, wine_dbgstr_point( &gm->gmptGlyphOrigin ), - gm->gmCellIncX, gm->gmCellIncY, abc->abcA, abc->abcB, abc->abcC ); - return TRUE; - } - - return FALSE; -} - -static void set_cached_metrics( GdiFont *font, UINT index, const GLYPHMETRICS *gm, const ABC *abc ) -{ - UINT block = index / GM_BLOCK_SIZE; - UINT entry = index % GM_BLOCK_SIZE; - - if (block >= font->gmsize) - { - GM **ptr = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - font->gm, (block + 1) * sizeof(GM *) ); - if (!ptr) return; - - font->gmsize = block + 1; - font->gm = ptr; - } - - if (!font->gm[block]) - { - font->gm[block] = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(GM) * GM_BLOCK_SIZE ); - if (!font->gm[block]) return; - } - - font->gm[block][entry].gm = *gm; - font->gm[block][entry].abc = *abc; - font->gm[block][entry].init = TRUE; -} - static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) { FT_Face ft_face = font->ft_face; @@ -6805,7 +6740,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, format &= ~GGO_UNHINTED; if (format == GGO_METRICS && is_identity_MAT2(lpmat) && - get_cached_metrics( font, glyph_index, lpgm, abc )) + get_gdi_font_glyph_metrics( gdi_font, glyph_index, lpgm, abc )) return 1; /* FIXME */ needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); @@ -6860,7 +6795,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && is_identity_MAT2(lpmat)) /* don't cache custom transforms */ - set_cached_metrics( font, glyph_index, &gm, abc ); + set_gdi_font_glyph_metrics( gdi_font, glyph_index, &gm, abc ); if(format == GGO_METRICS) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3968b62d8db..29ec84f9e97 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -303,11 +303,15 @@ struct char_width_info typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; +struct glyph_metrics; + struct gdi_font { struct list entry; struct list unused_entry; DWORD refcount; + DWORD gm_size; + struct glyph_metrics **gm; /* the following members can be accessed without locking, they are never modified after creation */ void *private; /* font backend private data */ DWORD handle; @@ -375,6 +379,10 @@ extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m BOOL can_use_bitmap ) DECLSPEC_HIDDEN; extern void set_gdi_font_name( struct gdi_font *font, const WCHAR *name ) DECLSPEC_HIDDEN; extern void set_gdi_font_file_info( struct gdi_font *font, const WCHAR *file, SIZE_T data_size ) DECLSPEC_HIDDEN; +extern BOOL get_gdi_font_glyph_metrics( struct gdi_font *font, UINT index, + GLYPHMETRICS *gm, ABC *abc ) DECLSPEC_HIDDEN; +extern void set_gdi_font_glyph_metrics( struct gdi_font *font, UINT index, + const GLYPHMETRICS *gm, const ABC *abc ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alistair Leslie-Hughes : server: Fix compile error when irda.h is available.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 3c0dae37a64d0c2960b7a39c602e4661cf942b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c0dae37a64d0c2960b7a39c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 22 20:06:23 2020 +1100 server: Fix compile error when irda.h is available. Include "af_irda.h" so SOCKADDR_IRDA is defined. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index 866a9351152..8f500adc68b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -86,6 +86,7 @@ #include "winsock2.h" #include "ws2tcpip.h" #include "wsipx.h" +#include "af_irda.h" #include "wine/afd.h" #include "process.h"

1 0

Michael Stefaniuc : msi: Use 0 terminated WCHAR strings in the SQL tokenizer.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 6705b959d0cf7635bf2ab16ab89fefb409a0a9c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6705b959d0cf7635bf2ab16a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 22 01:24:07 2020 +0200 msi: Use 0 terminated WCHAR strings in the SQL tokenizer. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tokenize.c | 114 ++++++++++++++++++---------------------------------- 1 file changed, 39 insertions(+), 75 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 4ebc9b81fb4..3b9f98c6f17 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -38,87 +38,51 @@ struct Keyword { #define MAX_TOKEN_LEN 11 -static const WCHAR addW[] = {'A','D','D'}; -static const WCHAR alterW[] = {'A','L','T','E','R'}; -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR charW[] = {'C','H','A','R'}; -static const WCHAR characterW[] = {'C','H','A','R','A','C','T','E','R'}; -static const WCHAR createW[] = {'C','R','E','A','T','E'}; -static const WCHAR deleteW[] = {'D','E','L','E','T','E'}; -static const WCHAR distinctW[] = {'D','I','S','T','I','N','C','T'}; -static const WCHAR dropW[] = {'D','R','O','P'}; -static const WCHAR freeW[] = {'F','R','E','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR holdW[] = {'H','O','L','D'}; -static const WCHAR insertW[] = {'I','N','S','E','R','T'}; -static const WCHAR intW[] = {'I','N','T'}; -static const WCHAR integerW[] = {'I','N','T','E','G','E','R'}; -static const WCHAR intoW[] = {'I','N','T','O'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR keyW[] = {'K','E','Y'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR localizableW[] = {'L','O','C','A','L','I','Z','A','B','L','E'}; -static const WCHAR longW[] = {'L','O','N','G'}; -static const WCHAR longcharW[] = {'L','O','N','G','C','H','A','R'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR objectW[] = {'O','B','J','E','C','T'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR orderW[] = {'O','R','D','E','R'}; -static const WCHAR primaryW[] = {'P','R','I','M','A','R','Y'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR setW[] = {'S','E','T'}; -static const WCHAR shortW[] = {'S','H','O','R','T'}; -static const WCHAR tableW[] = {'T','A','B','L','E'}; -static const WCHAR temporaryW[] = {'T','E','M','P','O','R','A','R','Y'}; -static const WCHAR updateW[] = {'U','P','D','A','T','E'}; -static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - /* ** These are the keywords ** They MUST be in alphabetical order */ +#define X(str) str, ARRAY_SIZE(str) - 1 static const Keyword aKeywordTable[] = { - { addW, ARRAY_SIZE(addW), TK_ADD }, - { alterW, ARRAY_SIZE(alterW), TK_ALTER }, - { andW, ARRAY_SIZE(andW), TK_AND }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { charW, ARRAY_SIZE(charW), TK_CHAR }, - { characterW, ARRAY_SIZE(characterW), TK_CHAR }, - { createW, ARRAY_SIZE(createW), TK_CREATE }, - { deleteW, ARRAY_SIZE(deleteW), TK_DELETE }, - { distinctW, ARRAY_SIZE(distinctW), TK_DISTINCT }, - { dropW, ARRAY_SIZE(dropW), TK_DROP }, - { freeW, ARRAY_SIZE(freeW), TK_FREE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { holdW, ARRAY_SIZE(holdW), TK_HOLD }, - { insertW, ARRAY_SIZE(insertW), TK_INSERT }, - { intW, ARRAY_SIZE(intW), TK_INT }, - { integerW, ARRAY_SIZE(integerW), TK_INT }, - { intoW, ARRAY_SIZE(intoW), TK_INTO }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { keyW, ARRAY_SIZE(keyW), TK_KEY }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { localizableW, ARRAY_SIZE(localizableW), TK_LOCALIZABLE }, - { longW, ARRAY_SIZE(longW), TK_LONG }, - { longcharW, ARRAY_SIZE(longcharW), TK_LONGCHAR }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { objectW, ARRAY_SIZE(objectW), TK_OBJECT }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { orderW, ARRAY_SIZE(orderW), TK_ORDER }, - { primaryW, ARRAY_SIZE(primaryW), TK_PRIMARY }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { setW, ARRAY_SIZE(setW), TK_SET }, - { shortW, ARRAY_SIZE(shortW), TK_SHORT }, - { tableW, ARRAY_SIZE(tableW), TK_TABLE }, - { temporaryW, ARRAY_SIZE(temporaryW), TK_TEMPORARY }, - { updateW, ARRAY_SIZE(updateW), TK_UPDATE }, - { valuesW, ARRAY_SIZE(valuesW), TK_VALUES }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE }, + { X(L"ADD"), TK_ADD }, + { X(L"ALTER"), TK_ALTER }, + { X(L"AND"), TK_AND }, + { X(L"BY"), TK_BY }, + { X(L"CHAR"), TK_CHAR }, + { X(L"CHARACTER"), TK_CHAR }, + { X(L"CREATE"), TK_CREATE }, + { X(L"DELETE"), TK_DELETE }, + { X(L"DISTINCT"), TK_DISTINCT }, + { X(L"DROP"), TK_DROP }, + { X(L"FREE"), TK_FREE }, + { X(L"FROM"), TK_FROM }, + { X(L"HOLD"), TK_HOLD }, + { X(L"INSERT"), TK_INSERT }, + { X(L"INT"), TK_INT }, + { X(L"INTEGER"), TK_INT }, + { X(L"INTO"), TK_INTO }, + { X(L"IS"), TK_IS }, + { X(L"KEY"), TK_KEY }, + { X(L"LIKE"), TK_LIKE }, + { X(L"LOCALIZABLE"), TK_LOCALIZABLE }, + { X(L"LONG"), TK_LONG }, + { X(L"LONGCHAR"), TK_LONGCHAR }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OBJECT"), TK_OBJECT }, + { X(L"OR"), TK_OR }, + { X(L"ORDER"), TK_ORDER }, + { X(L"PRIMARY"), TK_PRIMARY }, + { X(L"SELECT"), TK_SELECT }, + { X(L"SET"), TK_SET }, + { X(L"SHORT"), TK_SHORT }, + { X(L"TABLE"), TK_TABLE }, + { X(L"TEMPORARY"), TK_TEMPORARY }, + { X(L"UPDATE"), TK_UPDATE }, + { X(L"VALUES"), TK_VALUES }, + { X(L"WHERE"), TK_WHERE }, }; +#undef X /* ** Comparison function for binary search.

1 0

Haoyang Chen : wbemprox: Implement Win32_SoundDevice.Status.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: 16b8f2b3e75241394ff552b9aeadd7823fad6391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16b8f2b3e75241394ff552b9… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu Oct 22 11:25:36 2020 +0200 wbemprox: Implement Win32_SoundDevice.Status. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 590714b826b..e35aa069e1d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -379,6 +379,7 @@ static const struct column col_sounddevice[] = { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, { L"ProductName", CIM_STRING }, + { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 }, }; static const struct column col_stdregprov[] = @@ -768,6 +769,7 @@ struct record_sounddevice const WCHAR *manufacturer; const WCHAR *name; const WCHAR *productname; + const WCHAR *status; UINT16 statusinfo; }; struct record_stdregprov @@ -886,7 +888,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = }; static const struct record_sounddevice data_sounddevice[] = { - { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ } + { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", L"OK", 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = {

1 0

Alexandre Julliard : gdi32: Move more font metrics information to the generic font structure.
by Alexandre Julliard Oct. 22, 2020

Oct. 22, 2020

Module: wine Branch: master Commit: c44c347dd5712e29ed88f3cec69061abf1067eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c44c347dd5712e29ed88f3ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 11:49:33 2020 +0200 gdi32: Move more font metrics information to the generic font structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 1 + dlls/gdi32/freetype.c | 167 +++++++++++++++++++++-------------------------- dlls/gdi32/gdi_private.h | 9 +++ 3 files changed, 86 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c44c347dd5712e29ed88…

1 0