August 2019 - Wine-devel - list.winehq.org

[PATCH 1/6] riched20: Clearly separate the selection setting functions.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 13 ++++++++----- dlls/riched20/editor.c | 22 +++++++++++----------- dlls/riched20/editor.h | 3 ++- dlls/riched20/richole.c | 8 ++++---- dlls/riched20/txtsrv.c | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0951bb9617..212c9e9f99 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -122,8 +122,14 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) return length; } - -int ME_SetSelection(ME_TextEditor *editor, int from, int to) +/****************************************************************** + * set_selection_cursors + * + * Updates the selection cursors. + * + * Note that this does not invalidate either the old or the new selections. + */ +int set_selection_cursors(ME_TextEditor *editor, int from, int to) { int selectionEnd = 0; const int len = ME_GetTextLength(editor); @@ -139,7 +145,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); - ME_InvalidateSelection(editor); return len + 1; } @@ -165,7 +170,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) end --; } editor->pCursors[1] = editor->pCursors[0]; - ME_Repaint(editor); } return end; } @@ -194,7 +198,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; - ME_InvalidateSelection(editor); return len; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 61f7a0e66b..118c64652e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1622,7 +1622,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre } else { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_InternalDeleteText(editor, &editor->pCursors[1], ME_GetTextLength(editor), FALSE); from = to = 0; @@ -1756,9 +1756,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre cf.dwMask = CFM_ALL2; ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); - ME_SetSelection(editor, newto, -1); + set_selection_cursors(editor, newto, -1); ME_SetSelectionCharFormat(editor, &cf); - ME_SetSelection(editor, newto, newto); + set_selection_cursors(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); @@ -1781,7 +1781,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); ME_CursorFromCharOfs(editor, from, &start); ME_UpdateLinkAttribute(editor, &start, to - from); } @@ -2147,14 +2147,14 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, } } -static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) +int set_selection( ME_TextEditor *editor, int to, int from ) { int end; TRACE("%d - %d\n", to, from ); ME_InvalidateSelection( editor ); - end = ME_SetSelection( editor, to, from ); + end = set_selection_cursors( editor, to, from ); ME_InvalidateSelection( editor ); update_caret( editor ); ME_SendSelChange( editor ); @@ -2682,7 +2682,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'A': if (ctrl_is_down) { - handle_EM_EXSETSEL( editor, 0, -1 ); + set_selection( editor, 0, -1 ); return TRUE; } break; @@ -3796,7 +3796,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - return handle_EM_EXSETSEL( editor, wParam, lParam ); + return set_selection( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { @@ -3821,7 +3821,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { CHARRANGE range = *(CHARRANGE *)lParam; - return handle_EM_EXSETSEL( editor, range.cpMin, range.cpMax ); + return set_selection( editor, range.cpMin, range.cpMax ); } case EM_SHOWSCROLLBAR: { @@ -4122,7 +4122,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, TRACE("WM_SETTEXT - NULL\n"); ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); - ME_SetSelection(editor, 0, 0); + set_selection_cursors(editor, 0, 0); editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); @@ -4813,7 +4813,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, HeapFree(GetProcessHeap(), 0, lpCompStr); if (dwIndex == GCS_COMPSTR) - ME_SetSelection(editor,editor->imeStartIndex, + set_selection_cursors(editor,editor->imeStartIndex, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f56d2a25de..800f5882a7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -149,7 +149,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; -int ME_SetSelection(ME_TextEditor *editor, int from, int to) 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; void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; @@ -255,6 +255,7 @@ void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; extern BOOL me_debug DECLSPEC_HIDDEN; void ME_ReplaceSel(ME_TextEditor *editor, BOOL can_undo, const WCHAR *str, int len) DECLSPEC_HIDDEN; +int set_selection( ME_TextEditor *editor, int to, int from ) DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5a102a7607..4e8d450add 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2149,7 +2149,7 @@ static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me) if (!This->child.reole) return CO_E_RELEASED; - ME_SetSelection(This->child.reole->editor, This->start, This->end); + set_selection(This->child.reole->editor, This->start, This->end); return S_OK; } @@ -4649,7 +4649,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setstart(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4684,7 +4684,7 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hr = textrange_setend(This->reOle, value, &start, &end); if (hr == S_OK) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hr; } @@ -4803,7 +4803,7 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) ME_GetSelectionOfs(This->reOle->editor, &start, &end); hres = range_Collapse(bStart, &start, &end); if (SUCCEEDED(hres)) - ME_SetSelection(This->reOle->editor, start, end); + set_selection(This->reOle->editor, start, end); return hres; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 9ce1d47601..12761621c4 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -290,7 +290,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText(ITextServices *iface, LPC ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); if(pszText) ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); - ME_SetSelection(This->editor, 0, 0); + set_selection_cursors(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard(); ME_EmptyUndoStack(This->editor); -- 2.18.0

1 0

[PATCH] include: Add more ListView macros
by Alistair Leslie-Hughes 18 Aug '19

18 Aug '19

Remove duplicate ListView_GetGroupInfoByIndex at the sam time. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 906f2c30e9..700b335fbb 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4190,8 +4190,14 @@ typedef struct tagLVITEMINDEX ((rc) ? (((RECT*)(rc))->top = type), (LPARAM)(RECT*)(rc) : (LPARAM)(RECT*)NULL)) #define ListView_GetGroupCount(hwnd) \ SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) -#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ - SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) +#define ListView_GetItemIndexRect(hwnd, index, subitem, code, prc) \ + (BOOL)SNDMSG((hwnd), LVM_GETITEMINDEXRECT, (WPARAM)(LVITEMINDEX*)(index), \ + (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL) +#define ListView_SetItemIndexState(hwndLV, index, data, mask) \ +{ LV_ITEM macro; macro.stateMask = (mask); macro.state = data; \ + SNDMSG((hwndLV), LVM_SETITEMINDEXSTATE, (WPARAM)(LVITEMINDEX*)(index), (LPARAM)(LV_ITEM *)&macro); } +#define ListView_GetNextItemIndex(hwnd, index, flags) \ + (BOOL)SNDMSG((hwnd), LVM_GETNEXTITEMINDEX, (WPARAM)(LVITEMINDEX*)(index), MAKELPARAM((flags),0)) /* Tab Control */ -- 2.17.1

1 0

[PATCH v2 1/5] ntoskrnl.exe: Fix a typo in a debug trace.
by Zebediah Figura 18 Aug '19

18 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 438ed4c69b..7eba3a0c80 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -371,7 +371,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce return STATUS_NOT_IMPLEMENTED; } - if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "access %x not supported\n", access ); + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#x not supported\n", attr ); if (access_state) FIXME( "access_state not implemented\n" ); if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH; -- 2.22.0

2 9

[PATCH 1/4] d3drm/tests: Add some comments to test_Viewport().
by Jeff Smith 18 Aug '19

18 Aug '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3beeaee007..9811224f46 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1733,6 +1733,7 @@ static void test_Viewport(void) DWORD data, ref1, ref2, ref3, ref4; DWORD initial_ref1, initial_ref2, initial_ref3, device_ref, frame_ref, frame_ref2, viewport_ref; + /* Set up */ window = create_window(); GetClientRect(window, &rc); @@ -1769,6 +1770,7 @@ static void test_Viewport(void) device_ref = get_refcount((IUnknown *)device1); frame_ref = get_refcount((IUnknown *)frame); + /* IDirect3DRM::CreateViewport tests */ hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, 0, 0, 0, 0, &viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr); ref4 = get_refcount((IUnknown *)d3drm1); @@ -1799,6 +1801,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame); ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); + /* IDirect3DRM2::CreateViewport tests */ hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, 0, 0, 0, 0, &viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr); ref4 = get_refcount((IUnknown *)d3drm1); @@ -1832,6 +1835,7 @@ static void test_Viewport(void) device_ref = get_refcount((IUnknown *)device3); frame_ref2 = get_refcount((IUnknown *)frame3); + /* IDirect3DRM3::CreateViewport tests */ hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, 0, 0, 0, 0, &viewport2); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr); ref4 = get_refcount((IUnknown *)d3drm1); @@ -1862,7 +1866,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame3); ok(ref4 == frame_ref2, "Expected ref4 == frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); - /* Test all failures together */ + /* IDirect3DRM::CreateViewport failure tests */ viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM_CreateViewport(d3drm1, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -1886,6 +1890,7 @@ static void test_Viewport(void) hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + /* IDirect3DRM2::CreateViewport failure tests */ viewport = (IDirect3DRMViewport *)0xdeadbeef; hr = IDirect3DRM2_CreateViewport(d3drm2, NULL, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -1909,6 +1914,7 @@ static void test_Viewport(void) hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + /* IDirect3DRM3::CreateViewport failure tests */ viewport2 = (IDirect3DRMViewport2 *)0xdeadbeef; hr = IDirect3DRM3_CreateViewport(d3drm3, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); @@ -1932,6 +1938,7 @@ static void test_Viewport(void) hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + /* [IDirect3DRM2] IDirect3DRMViewport::GetDirect3DViewport tests */ hr = IDirect3DRM2_CreateViewport(d3drm2, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %#x)\n", hr); hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); @@ -1965,6 +1972,7 @@ static void test_Viewport(void) IDirect3DViewport_Release(d3d_viewport); IDirect3DRMViewport_Release(viewport); + /* [IDirect3DRM3] IDirect3DRMViewport2::GetDirect3DViewport tests */ hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, &viewport2); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport2 interface (hr = %#x)\n", hr); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); @@ -1998,6 +2006,7 @@ static void test_Viewport(void) IDirect3DViewport_Release(d3d_viewport); IDirect3DRMViewport2_Release(viewport2); + /* [IDirect3DRM] IDirect3DRMViewport::GetDirect3DViewport tests */ hr = IDirect3DRM_CreateViewport(d3drm1, device1, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); @@ -2030,6 +2039,7 @@ static void test_Viewport(void) ok(vp.dvMaxY == expected_val, "Expected dvMaxY = %f, got %f.\n", expected_val, vp.dvMaxY); IDirect3DViewport_Release(d3d_viewport); + /* IDirect3DRMViewport*::QueryInterface tests */ hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&obj); ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); ok((IDirect3DRMObject*)viewport == obj, "got object pointer %p, expected %p\n", obj, viewport); @@ -2070,7 +2080,7 @@ static void test_Viewport(void) IDirect3DRMViewport2_Release(viewport2); IDirect3DRMViewport_Release(viewport); - /* IDirect3DRMViewport*::Init tests */ + /* IDirect3DRMViewport::Init tests ... */ ref1 = get_refcount((IUnknown *)d3drm1); ref2 = get_refcount((IUnknown *)d3drm2); ref3 = get_refcount((IUnknown *)d3drm3); @@ -2084,12 +2094,13 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); + /* ... test pre-Init return values */ hr = IDirect3DRMViewport_GetDirect3DViewport(viewport, &d3d_viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); - /* Test all failures together */ + /* ... test Init failure */ hr = IDirect3DRMViewport_Init(viewport, NULL, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_Init(viewport, device1, NULL, rc.left, rc.top, rc.right, rc.bottom); @@ -2101,6 +2112,7 @@ static void test_Viewport(void) hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom + 1); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + /* ... test Init success */ device_ref = get_refcount((IUnknown *)device1); frame_ref = get_refcount((IUnknown *)frame); hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); @@ -2116,6 +2128,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame); ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); + /* ... test initialized values */ hr = IDirect3DRMViewport_GetDevice(viewport, &d3drm_device1); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); ok(device1 == d3drm_device1, "Expected device returned = %p, got %p.\n", device3, d3drm_device3); @@ -2151,6 +2164,7 @@ static void test_Viewport(void) ok(vp.dvMaxY == expected_val, "Expected dvMaxY = %f, got %f.\n", expected_val, vp.dvMaxY); IDirect3DViewport_Release(d3d_viewport); + /* ... test post-Init failures */ hr = IDirect3DRMViewport_Init(viewport, device1, frame, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport_GetDevice(viewport, NULL); @@ -2174,6 +2188,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame); todo_wine ok(ref4 > frame_ref, "Expected ref4 > frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); + /* IDirect3DRMViewport2::Init tests ... */ ref1 = get_refcount((IUnknown *)d3drm1); ref2 = get_refcount((IUnknown *)d3drm2); ref3 = get_refcount((IUnknown *)d3drm3); @@ -2187,11 +2202,13 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref3, "Expected ref4 == ref3, got ref3 = %u, ref4 = %u.\n", ref3, ref4); + /* ... test pre-Init return values */ hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + /* ... test Init failure */ hr = IDirect3DRMViewport2_Init(viewport2, NULL, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_Init(viewport2, device3, NULL, rc.left, rc.top, rc.right, rc.bottom); @@ -2203,6 +2220,7 @@ static void test_Viewport(void) hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + /* ... test Init success */ device_ref = get_refcount((IUnknown *)device3); frame_ref2 = get_refcount((IUnknown *)frame3); hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); @@ -2212,6 +2230,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame3); ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); + /* ... test initialized values */ hr = IDirect3DRMViewport2_GetDevice(viewport2, &d3drm_device3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); ok(device3 == d3drm_device3, "Expected device returned = %p, got %p.\n", device3, d3drm_device3); @@ -2247,6 +2266,7 @@ static void test_Viewport(void) ok(vp.dvMaxY == expected_val, "Expected dvMaxY = %f, got %f.\n", expected_val, vp.dvMaxY); IDirect3DViewport_Release(d3d_viewport); + /* ... test post-Init failures */ hr = IDirect3DRMViewport2_Init(viewport2, device3, frame3, rc.left, rc.top, rc.right, rc.bottom); ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); hr = IDirect3DRMViewport2_GetDevice(viewport2, NULL); @@ -2270,6 +2290,7 @@ static void test_Viewport(void) ref4 = get_refcount((IUnknown *)frame3); todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); + /* Clean up */ IDirect3DRMDevice3_Release(device3); IDirect3DRMDevice_Release(device1); ref4 = get_refcount((IUnknown *)d3drm1); -- 2.21.0

1 3

[PATCH v2 3/3] dnsapi: Increase size of tmp to 11.
by Isira Seneviratne 18 Aug '19

18 Aug '19

1 0

[PATCH v2 2/3] jscript: Replace '%pure-parser' with '%define api.pure'.
by Isira Seneviratne 18 Aug '19

18 Aug '19

1 0

[PATCH v2 1/3] cabinet/tests: Alter string declaration to include null terminator.
by Isira Seneviratne 18 Aug '19

18 Aug '19

1 0

[PATCH 1/3] cabinet/tests: Alter string declaration to include null terminator.
by Isira Seneviratne 18 Aug '19

18 Aug '19

4 5

[PATCH] advapi32: Add EventWriteString stub.
by Richard Yao 18 Aug '19

18 Aug '19

"Are You Ready for Valve Index?" needs this to work. Signed-off-by: Richard Yao <ryao(a)gentoo.org> --- dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/misc.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 231ab05df0..3db5612c61 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -297,7 +297,7 @@ # @ stub EventWriteEndScenario # @ stub EventWriteEx # @ stub EventWriteStartScenario -# @ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index b2dcc17cb3..579811b777 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -44,7 +44,7 @@ @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite -@ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) advapi32.EventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer @ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce @ stdcall FreeSid(ptr) advapi32.FreeSid diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index bd4e7a310c..92d495c924 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -6,5 +6,5 @@ @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteEx -@ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) advapi32.EventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) advapi32.EventWriteTransfer diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 4bb2b55cde..70214476db 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -335,7 +335,7 @@ @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) ntdll.EtwEventWrite # @ stub EventWriteEx -# @ stub EventWriteString +@ stdcall EventWriteString(int64 long int64 ptr) ntdll.EtwEventWriteString @ stdcall EventWriteTransfer(int64 ptr ptr ptr long ptr) ntdll.EtwEventWriteTransfer @ stdcall ExitProcess(long) ntdll.RtlExitUserProcess @ stdcall ExitThread(long) ntdll.RtlExitUserThread diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 152b2cfa3f..2a135518e7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -426,6 +426,16 @@ ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, v return ERROR_SUCCESS; } +/****************************************************************************** + * EtwEventWriteString (NTDLL.@) + */ +ULONG WINAPI EtwEventWriteString( REGHANDLE handle, UCHAR level, ULONGLONG keyword, PCWSTR string ) +{ + FIXME("%s, %u, %s, %s: stub\n", wine_dbgstr_longlong(handle), level, + wine_dbgstr_longlong(keyword), debugstr_w(string)); + return ERROR_SUCCESS; +} + /****************************************************************************** * EtwEventWriteTransfer (NTDLL.@) */ -- 2.21.0

1 0

[PATCH 1/5] ntoskrnl.exe: Fix a typo in a debug trace.
by Zebediah Figura 18 Aug '19

18 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5942556e12..c989b3a684 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -373,7 +373,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce return STATUS_NOT_IMPLEMENTED; } - if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "access %x not supported\n", access ); + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#x not supported\n", attr ); if (access_state) FIXME( "access_state not implemented\n" ); if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH; -- 2.22.0

2 9