October 2016 - Wine-commits

Huw Davies : riched20: Add an option to move the cursor to after the final end-of-paragraph.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: c005b98d9119138f8cfea1b6b5be4f5c78ca8d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c005b98d9119138f8cfea1b6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:32 2016 +0100 riched20: Add an option to move the cursor to after the final end-of-paragraph. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e5c60a0..279bdcd 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -31,11 +31,11 @@ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) cursor->nOffset = 0; } -static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) +static void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor, BOOL final_eop) { cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - cursor->nOffset = 0; + cursor->nOffset = final_eop ? cursor->pRun->member.run.len : 0; } @@ -83,7 +83,7 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) int ME_GetTextLength(ME_TextEditor *editor) { ME_Cursor cursor; - ME_SetCursorToEnd(editor, &cursor); + ME_SetCursorToEnd(editor, &cursor, FALSE); return ME_GetCursorOfs(&cursor); } @@ -138,8 +138,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (from == 0 && to == -1) { ME_SetCursorToStart(editor, &editor->pCursors[1]); - ME_SetCursorToEnd(editor, &editor->pCursors[0]); - editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + ME_SetCursorToEnd(editor, &editor->pCursors[0], TRUE); ME_InvalidateSelection(editor); return len + 1; } @@ -193,7 +192,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (selectionEnd) { - ME_SetCursorToEnd(editor, &editor->pCursors[0]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); editor->pCursors[1] = editor->pCursors[0]; ME_InvalidateSelection(editor); return len; @@ -686,7 +685,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) if (new_offset >= ME_GetTextLength(editor)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor); + ME_SetCursorToEnd(editor, cursor, FALSE); nRelOfs -= new_offset - ME_GetTextLength(editor); return nRelOfs; } @@ -859,7 +858,7 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) /* 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]); + ME_SetCursorToEnd(editor, &editor->pCursors[0], FALSE); break; default: assert(0); } @@ -1383,7 +1382,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; } else { ME_DisplayItem *pRun = pCursor->pRun; @@ -1480,7 +1479,7 @@ static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_SetCursorToEnd(editor, pCursor); + ME_SetCursorToEnd(editor, pCursor, FALSE); editor->bCaretAtEnd = FALSE; }

1 0

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the right arrow key.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 58a48aa79b0f763e44ce29523f26d1ad82a60584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a48aa79b0f763e44ce29523… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:33 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the right arrow key. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 15 ++++++++------- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/table.c | 2 +- dlls/riched20/undo.c | 2 +- dlls/riched20/writer.c | 5 +---- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 279bdcd..b137c5f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -200,7 +200,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_CursorFromCharOfs(editor, from, &editor->pCursors[1]); editor->pCursors[0] = editor->pCursors[1]; - ME_MoveCursorChars(editor, &editor->pCursors[0], to - from); + ME_MoveCursorChars(editor, &editor->pCursors[0], to - from, FALSE); /* Selection is not allowed in the middle of an end paragraph run. */ if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; @@ -627,10 +627,11 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } /* Move the cursor nRelOfs characters (either forwards or backwards) + * If final_eop is TRUE, allow moving the cursor to the end of the final eop. * * returns the actual number of characters moved. **/ -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) { cursor->nOffset += nRelOfs; if (cursor->nOffset < 0) @@ -682,11 +683,11 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) return nRelOfs; } - if (new_offset >= ME_GetTextLength(editor)) + if (new_offset >= ME_GetTextLength(editor) + (final_eop ? 1 : 0)) { /* new offset at the end of the text */ - ME_SetCursorToEnd(editor, cursor, FALSE); - nRelOfs -= new_offset - ME_GetTextLength(editor); + ME_SetCursorToEnd(editor, cursor, final_eop); + nRelOfs -= new_offset - (ME_GetTextLength(editor) + (final_eop ? 1 : 0)); return nRelOfs; } @@ -1547,14 +1548,14 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, -1); else - success = ME_MoveCursorChars(editor, &tmp_curs, -1); + success = ME_MoveCursorChars(editor, &tmp_curs, -1, extend); break; case VK_RIGHT: editor->bCaretAtEnd = FALSE; if (ctrl) success = ME_MoveCursorWords(editor, &tmp_curs, +1); else - success = ME_MoveCursorChars(editor, &tmp_curs, +1); + success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: ME_MoveCursorLines(editor, &tmp_curs, -1); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 97c2d59..4adc74f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1650,7 +1650,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; ME_Cursor linebreakCursor = *selEnd; - ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize); + ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); if (lastchar[0] == '\r' && (lastchar[1] == '\n' || lastchar[1] == '\0')) { ME_InternalDeleteText(editor, &linebreakCursor, linebreakSize, FALSE); @@ -1805,7 +1805,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMin - 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, 1); + ME_MoveCursorChars(editor, &cursor, 1, FALSE); } else { ME_CursorFromCharOfs(editor, nMin, &cursor); } @@ -1881,7 +1881,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { ME_CursorFromCharOfs(editor, nMax + 1, &cursor); wLastChar = *get_text( &cursor.pRun->member.run, cursor.nOffset ); - ME_MoveCursorChars(editor, &cursor, -1); + ME_MoveCursorChars(editor, &cursor, -1, FALSE); } else { ME_CursorFromCharOfs(editor, nMax, &cursor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cc1654a..c62b3a4 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -178,7 +178,7 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) DECLS void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style) DECLSPEC_HIDDEN; void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; -int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; +int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs, BOOL final_eop) DECLSPEC_HIDDEN; BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl) DECLSPEC_HIDDEN; int ME_GetCursorOfs(const ME_Cursor *cursor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 77e7b57..c5f0441 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -451,7 +451,7 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, ME_CursorFromCharOfs(reole->editor, pos, &from); to = from; - ME_MoveCursorChars(reole->editor, &to, 1); + ME_MoveCursorChars(reole->editor, &to, 1, FALSE); ME_GetCharFormat(reole->editor, &from, &to, &fmt); switch (propid) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c22f92a..b834bc7 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -291,7 +291,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC ME_DisplayItem *this_para = c->pPara; ME_DisplayItem *end_para; - ME_MoveCursorChars(editor, &c2, *nChars); + ME_MoveCursorChars(editor, &c2, *nChars, FALSE); end_para = c2.pPara; if (c2.pRun->member.run.nFlags & MERF_ENDPARA) { /* End offset might be in the middle of the end paragraph run. diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 7a8c333..582f888 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -349,7 +349,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) ME_Cursor start, end; ME_CursorFromCharOfs(editor, undo->u.set_char_fmt.pos, &start); end = start; - ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len); + ME_MoveCursorChars(editor, &end, undo->u.set_char_fmt.len, FALSE); ME_SetCharFormat(editor, &start, &end, &undo->u.set_char_fmt.fmt); break; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a3eaffe..0204215 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -881,11 +881,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; - int actual_chars; - actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); - /* Include the final \r which MoveCursorChars will ignore. */ - if (actual_chars != nChars) endCur.nOffset++; + ME_MoveCursorChars(editor, &endCur, nChars, TRUE); if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Huw Davies : riched20: Allow selecting to the start / end when using the up / down arrow keys.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 7eb683772931f749cf27fa54d54003214923970d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb683772931f749cf27fa54d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:34 2016 +0100 riched20: Allow selecting to the start / end when using the up / down arrow keys. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b137c5f..74239af 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1237,7 +1237,7 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) static void -ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) +ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *pOldPara = pCursor->pPara; @@ -1255,8 +1255,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) assert(pItem); /* start of the previous row */ pItem = ME_FindItemBack(pItem, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToStart(editor, pCursor); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWEND || (pOldPara->member.para.pCell && @@ -1282,8 +1286,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) { /* start of the next row */ pItem = ME_FindItemFwd(pRun, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToEnd(editor, pCursor, TRUE); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWSTART || (pOldPara->member.para.pCell && @@ -1558,10 +1566,10 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: - ME_MoveCursorLines(editor, &tmp_curs, -1); + ME_MoveCursorLines(editor, &tmp_curs, -1, extend); break; case VK_DOWN: - ME_MoveCursorLines(editor, &tmp_curs, +1); + ME_MoveCursorLines(editor, &tmp_curs, +1, extend); break; case VK_PRIOR: ME_ArrowPageUp(editor, &tmp_curs);

1 0

Józef Kucia : wined3d: Bind dummy textures to all texture image units.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 7cb16e4dbe8dc7b6cc7949df8fe00f8876c4e5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb16e4dbe8dc7b6cc7949df8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:38 2016 +0200 wined3d: Bind dummy textures to all texture image units. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a362247..e09c6fd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1514,9 +1514,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i, count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); + unsigned int i; - for (i = 0; i < count; ++i) + for (i = 0; i < gl_info->limits.combined_samplers; ++i) { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); checkGLcall("glActiveTexture");

1 0

Józef Kucia : wined3d: Pass context to create_default_samplers().
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 6372cd8e49a662942a80d2decd1f7eae3541c45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6372cd8e49a662942a80d2dec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 3 00:38:40 2016 +0200 wined3d: Pass context to create_default_samplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b8ac88a..f2dfac7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -794,9 +794,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w } /* Context activation is done by the caller. */ -static void create_default_samplers(struct wined3d_device *device) +static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { @@ -1058,7 +1058,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context = context_acquire(device, NULL); create_dummy_textures(device, context); - create_default_samplers(device); + create_default_samplers(device, context); device->contexts[0]->last_was_rhw = 0; @@ -4620,7 +4620,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru swapchain->context[0] = context; swapchain->num_contexts = 1; create_dummy_textures(device, context); - create_default_samplers(device); + create_default_samplers(device, context); context_release(context); return WINED3D_OK;

1 0

André Hentschel : advapi32/tests: Don' t crash the service test on wow64 Wine.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 49f2d424aca936a7ae69ea62b2e941ca715ec714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f2d424aca936a7ae69ea62b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 3 14:12:39 2016 +0200 advapi32/tests: Don't crash the service test on wow64 Wine. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 81d2f74..c7e3154 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1401,7 +1401,7 @@ static void test_enum_svc(void) /* lpServiceName and lpDisplayName should always be filled */ ok(services[i].lpServiceName[0], "Expected a service name\n"); - ok(services[i].lpDisplayName[0], "Expected a display name\n"); + ok(services[i].lpDisplayName && services[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. @@ -1704,7 +1704,7 @@ static void test_enum_svc(void) /* lpServiceName and lpDisplayName should always be filled */ ok(exservices[i].lpServiceName[0], "Expected a service name\n"); - ok(exservices[i].lpDisplayName[0], "Expected a display name\n"); + ok(exservices[i].lpDisplayName && exservices[i].lpDisplayName[0], "Expected a display name\n"); /* Decrement the counters to see if the functions calls return the * same numbers as the contents of these structures.

1 0

Stefan Dösinger : ddraw/tests: Add position tests for D3DPROCESSVERTICES_TRANSFORM.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: f660a56322a008b5eb8aaa7b153075c1e73b80cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f660a56322a008b5eb8aaa7b1… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:27 2016 +0100 ddraw/tests: Add position tests for D3DPROCESSVERTICES_TRANSFORM. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1271022..207ee59 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9125,12 +9125,15 @@ struct transform_output static void test_transform_vertices(void) { IDirect3DDevice *device; + IDirectDrawSurface *rt; IDirectDraw *ddraw; ULONG refcount; HWND window; HRESULT hr; + D3DCOLOR color; IDirect3DViewport *viewport; IDirect3DExecuteBuffer *execute_buffer; + IDirect3DMaterial *background; D3DEXECUTEBUFFERDESC exec_desc; UINT inst_length; void *ptr; @@ -9189,6 +9192,14 @@ static void test_transform_vertices(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, }; + static const D3DLVERTEX quad[] = + { + {{-0.75f},{-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{-0.75f},{ 0.25f}, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, {-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, { 0.25f}, {0.0f}, 0, {0xffff0000}}, + }; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; for (i = 0; i < ARRAY_SIZE(out); ++i) @@ -9209,6 +9220,9 @@ static void test_transform_vertices(void) return; } + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + viewport = create_viewport(device, 0, 0, 256, 256); hr = IDirect3DViewport_SetViewport(viewport, &vp_data); ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); @@ -9600,12 +9614,68 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + /* Test how vertices are transformed by execute buffers. */ + vp_data.dwX = 20; + vp_data.dwY = 20; + vp_data.dwWidth = 200; + vp_data.dwHeight = 400; + vp_data.dvScaleX = 20.0f; + vp_data.dvScaleY = 50.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 0.0f); + viewport_set_background(device, viewport, background); + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, quad, sizeof(quad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(quad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_TRANSFORM, 0, 4); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + set_execute_data(execute_buffer, 4, sizeof(quad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 128, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 128, 147); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 147); + todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + color = get_surface_color(rt, 177, 217); + todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 217); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 177, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + IDirect3DDevice_DeleteMatrix(device, world_handle); IDirect3DDevice_DeleteMatrix(device, view_handle); IDirect3DDevice_DeleteMatrix(device, proj_handle); IDirect3DExecuteBuffer_Release(execute_buffer); + IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); + IDirect3DMaterial_Release(background); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw_Release(ddraw);

1 0

Stefan Dösinger : ddraw: Store d3d1 projection matrices in device->legacy_projection.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: ce7fa156a5c9e13bc400a99d53543a7c4bc74eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7fa156a5c9e13bc400a99d5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:28 2016 +0100 ddraw: Store d3d1 projection matrices in device->legacy_projection. The math in transform_vertex is now the same as in wined3d's process_vertices_strided. Calling wined3d_device_process_vertices is easier now, but that will require moving the vertex and index data into buffers. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 13 +++++++------ dlls/ddraw/tests/ddraw1.c | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index fb52ffd..3becf58 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -56,10 +56,11 @@ static void transform_vertex(D3DTLVERTEX *dst, const D3DMATRIX *mat, dst->u3.sz = (x * mat->_13) + (y * mat->_23) + (z * mat->_33) + mat->_43; dst->u4.rhw = (x * mat->_14) + (y * mat->_24) + (z * mat->_34) + mat->_44; - dst->u1.sx = dst->u1.sx / dst->u4.rhw * vp->dvScaleX + vp->dwX + vp->dwWidth / 2; - dst->u2.sy = -dst->u2.sy / dst->u4.rhw * vp->dvScaleY + vp->dwY + vp->dwHeight / 2; - dst->u3.sz /= dst->u4.rhw; dst->u4.rhw = 1.0f / dst->u4.rhw; + + dst->u1.sx = (dst->u1.sx * dst->u4.rhw + 1.0f) * vp->dwWidth * 0.5 + vp->dwX; + dst->u2.sy = (-dst->u2.sy * dst->u4.rhw + 1.0f) * vp->dwHeight * 0.5 + vp->dwY; + dst->u3.sz *= dst->u4.rhw; } HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, @@ -203,7 +204,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, device->view = ci->u2.dwArg[0]; if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION) device->proj = ci->u2.dwArg[0]; - IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, + IDirect3DDevice3_SetTransform(&device->IDirect3DDevice3_iface, ci->u1.dtstTransformStateType, m); } @@ -247,8 +248,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, TRACE("PROCESSVERTICES (%d)\n", count); - /* Get the transform and world matrix */ - /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ + /* Note that the projection set in wined3d has the legacy clip space + * adjustment built in. */ wined3d_device_get_transform(device->wined3d_device, D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat); wined3d_device_get_transform(device->wined3d_device, diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 207ee59..7824a92 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9552,7 +9552,7 @@ static void test_transform_vertices(void) {143.0f, 118.0f, 1.0f, 1.0f}, {133.0f, 128.0f, -1.0f, 1.0f}, {133.0f, 128.0f, 0.0f, 1.0f} }; - todo_wine ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), + ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), "Vertex %u differs. Got %f %f %f %f.\n", i, out[i].x, out[i].y, out[i].z, out[i].w); } @@ -9657,10 +9657,10 @@ static void test_transform_vertices(void) color = get_surface_color(rt, 128, 147); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 132, 147); - todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 217); - todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 181, 217); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 221);

1 0

Stefan Dösinger : ddraw/tests: Test d3d2 and 3 drawing with non-standard viewports.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: 969368341e6a346a7ced058e79cc858c370e20a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969368341e6a346a7ced058e7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:29 2016 +0100 ddraw/tests: Test d3d2 and 3 drawing with non-standard viewports. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bf012e4..65376b3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10507,11 +10507,14 @@ struct transform_output static void test_transform_vertices(void) { IDirect3DDevice2 *device; + IDirectDrawSurface *rt; IDirectDraw2 *ddraw; ULONG refcount; HWND window; HRESULT hr; + D3DCOLOR color; IDirect3DViewport2 *viewport; + IDirect3DMaterial2 *background; static struct transform_input position_tests[] = { { 0.0f, 0.0f, 0.0f, 0.0f, 1, 2, 3, 4, 5}, @@ -10566,6 +10569,14 @@ static void test_transform_vertices(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, }; + static D3DLVERTEX quad[] = + { + {{-0.75f},{-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{-0.75f},{ 0.25f}, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, {-0.5f }, {0.0f}, 0, {0xffff0000}}, + {{ 0.5f}, { 0.25f}, {0.0f}, 0, {0xffff0000}}, + }; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; for (i = 0; i < ARRAY_SIZE(out); ++i) @@ -10585,6 +10596,8 @@ static void test_transform_vertices(void) DestroyWindow(window); return; } + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 256, 256); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); @@ -10942,7 +10955,54 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + /* Test how vertices are transformed during draws. */ + vp_data.dwX = 20; + vp_data.dwY = 20; + vp_data.dwWidth = 200; + vp_data.dwHeight = 400; + vp_data.dvScaleX = 20.0f; + vp_data.dvScaleY = 50.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + ok(SUCCEEDED(hr), "Failed to clear the render target, hr %#x.\n", hr); + background = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 0.0f); + viewport_set_background(device, viewport, background); + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 128, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 128, 147); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 147); + todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + color = get_surface_color(rt, 177, 217); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 217); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 177, 221); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); + IDirect3DMaterial2_Release(background); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9ac7a63..66301b5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11809,9 +11809,11 @@ struct transform_output static void test_transform_vertices(void) { IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; ULONG refcount; HWND window; HRESULT hr; + D3DCOLOR color; IDirect3DViewport3 *viewport; static struct transform_input position_tests[] = { @@ -11867,7 +11869,19 @@ static void test_transform_vertices(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, }; - + static struct + { + struct vec3 position; + DWORD color; + } + quad[] = + { + {{-0.75f, -0.5f , 0.0f}, 0xffff0000}, + {{-0.75f, 0.25f, 0.0f}, 0xffff0000}, + {{ 0.5f, -0.5f , 0.0f}, 0xffff0000}, + {{ 0.5f, 0.25f, 0.0f}, 0xffff0000}, + }; + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; for (i = 0; i < ARRAY_SIZE(out); ++i) { @@ -11883,6 +11897,8 @@ static void test_transform_vertices(void) DestroyWindow(window); return; } + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); viewport = create_viewport(device, 0, 0, 256, 256); hr = IDirect3DViewport2_SetViewport(viewport, &vp_data); @@ -12240,7 +12256,51 @@ static void test_transform_vertices(void) ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + /* Test how vertices are transformed during draws. */ + vp_data.dwX = 20; + vp_data.dwY = 20; + vp_data.dwWidth = 200; + vp_data.dwHeight = 400; + vp_data.dvScaleX = 20.0f; + vp_data.dvScaleY = 50.0f; + vp_data.dvMinZ = 0.0f; + vp_data.dvMaxZ = 1.0f; + hr = IDirect3DViewport3_SetViewport(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0x000000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 128, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 143); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 128, 147); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 132, 147); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + color = get_surface_color(rt, 177, 217); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 217); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 177, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + color = get_surface_color(rt, 181, 221); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + destroy_viewport(device, viewport); + IDirectDrawSurface4_Release(rt); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window);

1 0

Stefan Dösinger : ddraw: Apply legacy clipspace to d3d2.
by Alexandre Julliard 03 Oct '16

03 Oct '16

Module: wine Branch: master Commit: cb078e10ed2efe1a32a92ae357494d4f3148552a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb078e10ed2efe1a32a92ae35… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Oct 1 18:39:30 2016 +0100 ddraw: Apply legacy clipspace to d3d2. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c7a516e..ab94bed 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3230,7 +3230,7 @@ static HRESULT WINAPI d3d_device2_SetTransform(IDirect3DDevice2 *iface, TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - return IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, state, matrix); + return IDirect3DDevice3_SetTransform(&device->IDirect3DDevice3_iface, state, matrix); } /***************************************************************************** @@ -3334,7 +3334,7 @@ static HRESULT WINAPI d3d_device2_GetTransform(IDirect3DDevice2 *iface, TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - return IDirect3DDevice7_GetTransform(&device->IDirect3DDevice7_iface, state, matrix); + return IDirect3DDevice3_GetTransform(&device->IDirect3DDevice3_iface, state, matrix); } /***************************************************************************** @@ -3441,7 +3441,7 @@ static HRESULT WINAPI d3d_device2_MultiplyTransform(IDirect3DDevice2 *iface, TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); - return IDirect3DDevice7_MultiplyTransform(&device->IDirect3DDevice7_iface, state, matrix); + return IDirect3DDevice3_MultiplyTransform(&device->IDirect3DDevice3_iface, state, matrix); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 65376b3..888dae3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10893,7 +10893,7 @@ static void test_transform_vertices(void) {143.0f, 118.0f, 1.0f, 1.0f}, {133.0f, 128.0f, -1.0f, 1.0f}, {133.0f, 128.0f, 0.0f, 1.0f} }; - todo_wine ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), + ok(compare_vec4(&cmp[i], out[i].x, out[i].y, out[i].z, out[i].w, 4096), "Vertex %u differs. Got %f %f %f %f.\n", i, out[i].x, out[i].y, out[i].z, out[i].w); } @@ -10989,14 +10989,14 @@ static void test_transform_vertices(void) color = get_surface_color(rt, 128, 147); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 132, 147); - todo_wine ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 217); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 181, 217); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 177, 221); - todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 181, 221); ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color);

1 0