November 2019 - Wine-commits

Alexandre Julliard : kernel32: Get rid of LOCALE_IDEFAULTUNIXCODEPAGE.
by Alexandre Julliard 13 Nov '19

13 Nov '19

1 0

Damjan Jovanovic : comctl32: Implement treeview edit control EM_SETLIMITTEXT.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 5e2e794ad6ee346f0f8cfc1f85556105d680f5a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e2e794ad6ee346f0f8cfc1f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:04 2019 +0200 comctl32: Implement treeview edit control EM_SETLIMITTEXT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 753c6b4327..2380c5796e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1674,7 +1674,7 @@ static void test_itemedit(void) edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); - todo_wine expect(MAX_PATH - 1, r); + expect(MAX_PATH - 1, r); r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3c73964304..47623e2be2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3967,6 +3967,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); + SendMessageW(hwndEdit, EM_SETLIMITTEXT, MAX_PATH - 1, 0); if (hItem->pszText) SetWindowTextW(hwndEdit, hItem->pszText);

1 0

Damjan Jovanovic : comctl32: Test treeview text trimming after label editing is complete.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 8fd0ecc6cd0bf99803d8e8ac1a520d93b53b52f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd0ecc6cd0bf99803d8e8ac… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:07 2019 +0200 comctl32: Test treeview text trimming after label editing is complete. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2380c5796e..34b016a236 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1576,7 +1576,7 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buffA[20]; + CHAR buffA[500]; HWND hTree; hTree = create_treeview_control(0); @@ -1675,8 +1675,41 @@ static void test_itemedit(void) ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); expect(MAX_PATH - 1, r); + /* WM_SETTEXT can set more... */ + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); + expect(ARRAY_SIZE(buffA) - 1, r); + /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + + /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + SendMessageA(edit, EM_SETLIMITTEXT, ARRAY_SIZE(buffA)-1, 0); + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 565b0f5d5079eeb17dbf3aaa22088d022428cb07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=565b0f5d5079eeb17dbf3aaa… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:09 2019 +0200 comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 34b016a236..ac5fd4d804 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1320,7 +1320,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } - case TVN_ENDLABELEDITA: return TRUE; + case TVN_ENDLABELEDITA: + { + NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; + if (disp->item.mask & TVIF_TEXT) + todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + return TRUE; + } case TVN_ITEMEXPANDINGA: { UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN;

1 0

Damjan Jovanovic : comctl32: Test the treeview edit control EM_LIMITTEXT.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 6fb210d7b4fed68aed31fda16a9b395c58794720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fb210d7b4fed68aed31fda1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:02 2019 +0200 comctl32: Test the treeview edit control EM_LIMITTEXT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 56b6c6adbe..753c6b4327 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1667,6 +1667,17 @@ static void test_itemedit(void) GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "<edittextaltered>"), "got string %s\n", buffA); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + + /* How much text can be typed? */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); + todo_wine expect(MAX_PATH - 1, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 1fa32f9a5396934c6788ac02402cccc020237bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fa32f9a5396934c6788ac02… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:11 2019 +0200 comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ac5fd4d804..19ba40c64a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; +static const char *g_endedit_overwrite_contents; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1324,7 +1325,11 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) + { todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + if (g_endedit_overwrite_contents) + strcpy(disp->item.pszText, g_endedit_overwrite_contents); + } return TRUE; } case TVN_ITEMEXPANDINGA: @@ -1717,6 +1722,23 @@ static void test_itemedit(void) expect(TRUE, r); todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_contents = "<new_contents>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_contents = NULL; + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + expect(0, strcmp(item.pszText, "<new_contents>")); + DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText pointer in TVN_ENDLABELEDIT.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 59bb622088b967aef7d1cdebe0ac6a2fbd5a84f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59bb622088b967aef7d1cdeb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:13 2019 +0200 comctl32: Test overwriting of pszText pointer in TVN_ENDLABELEDIT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 19ba40c64a..82db67d5d0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -43,6 +43,7 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; static const char *g_endedit_overwrite_contents; +static char *g_endedit_overwrite_ptr; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1329,6 +1330,8 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); if (g_endedit_overwrite_contents) strcpy(disp->item.pszText, g_endedit_overwrite_contents); + if (g_endedit_overwrite_ptr) + disp->item.pszText = g_endedit_overwrite_ptr; } return TRUE; } @@ -1739,6 +1742,23 @@ static void test_itemedit(void) expect(TRUE, r); expect(0, strcmp(item.pszText, "<new_contents>")); + /* Overwriting of pszText pointer in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_ptr = (char*) "<new_ptr>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_ptr = NULL; + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(0, strcmp(item.pszText, "<new_ptr>")); + DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Implement treeview edit control text trimming and overwriting.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 80bd7fdd5629a89dec7ee5e14a05c2ff512301c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80bd7fdd5629a89dec7ee5e1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:15 2019 +0200 comctl32: Implement treeview edit control text trimming and overwriting. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 8 ++++---- dlls/comctl32/treeview.c | 21 +++++++++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 82db67d5d0..eb63439f0b 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1327,7 +1327,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) { - todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); if (g_endedit_overwrite_contents) strcpy(disp->item.pszText, g_endedit_overwrite_contents); if (g_endedit_overwrite_ptr) @@ -1705,7 +1705,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, strlen(item.pszText)); /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1723,7 +1723,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, strlen(item.pszText)); /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1757,7 +1757,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(0, strcmp(item.pszText, "<new_ptr>")); + expect(0, strcmp(item.pszText, "<new_ptr>")); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 47623e2be2..0d2c825714 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3993,8 +3993,8 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; - WCHAR tmpText[1024] = { '\0' }; - WCHAR *newText = tmpText; + WCHAR tmpText[MAX_PATH] = { '\0' }; + WCHAR *newText; int iLength = 0; if (!IsWindow(infoPtr->hwndEdit)) return FALSE; @@ -4007,18 +4007,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!bCancel) { if (!infoPtr->bNtfUnicode) - iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, 1023); + iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, ARRAY_SIZE(tmpText)); else - iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, 1023); - - if (iLength >= 1023) - { - ERR("Insufficient space to retrieve new item label\n"); - } + iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, ARRAY_SIZE(tmpText)); tvdi.item.mask = TVIF_TEXT; tvdi.item.pszText = tmpText; - tvdi.item.cchTextMax = iLength + 1; + tvdi.item.cchTextMax = ARRAY_SIZE(tmpText); } else { @@ -4032,11 +4027,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { if (!infoPtr->bNtfUnicode) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, NULL, 0 ); newText = heap_alloc(len * sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len ); + MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, newText, len ); iLength = len - 1; } + else + newText = tvdi.item.pszText; if (lstrcmpW(newText, editedItem->pszText) != 0) {

1 0

Michael Stefaniuc : d3d9/tests: Actually test a return value.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: e5708c23bbef4d4a0f5fd0944ede5fc1813cee1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5708c23bbef4d4a0f5fd094… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 11 21:17:27 2019 +0100 d3d9/tests: Actually test a return value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ebec6dc27d..dfb9ea3cce 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26393,7 +26393,7 @@ static void test_sample_attached_rendertarget(void) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - IDirect3DQuery9_Issue(event_query, D3DISSUE_END); + hr = IDirect3DQuery9_Issue(event_query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_stream_source().
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: fa4b0690a7cc6598ccc61e23a5bb1d7b343cb31b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa4b0690a7cc6598ccc61e23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 11 19:55:58 2019 -0600 wined3d: Introduce wined3d_stateblock_set_stream_source(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f8724da967..dd3a38cf0f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1584,6 +1584,33 @@ void CDECL wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *s stateblock->stateblock_state.base_vertex_index = base_index; } +HRESULT CDECL wined3d_stateblock_set_stream_source(struct wined3d_stateblock *stateblock, + UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) +{ + struct wined3d_stream_state *stream; + + TRACE("stateblock %p, stream_idx %u, buffer %p, stride %u.\n", + stateblock, stream_idx, buffer, stride); + + if (stream_idx >= WINED3D_MAX_STREAMS) + { + WARN("Stream index %u out of range.\n", stream_idx); + return WINED3DERR_INVALIDCALL; + } + + stream = &stateblock->stateblock_state.streams[stream_idx]; + + if (buffer) + wined3d_buffer_incref(buffer); + if (stream->buffer) + wined3d_buffer_decref(stream->buffer); + stream->buffer = buffer; + stream->stride = stride; + stream->offset = offset; + stateblock->changed.streamSource |= 1u << stream_idx; + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8a9c9858e9..5ff7ab1d0c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -275,6 +275,7 @@ @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) @ cdecl wined3d_stateblock_set_scissor_rect(ptr ptr) +@ cdecl wined3d_stateblock_set_stream_source(ptr long ptr long long) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_transform(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 10e2ae70eb..b31e9573aa 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2688,6 +2688,8 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_stateblock_set_scissor_rect(struct wined3d_stateblock *stateblock, const RECT *rect); +HRESULT __cdecl wined3d_stateblock_set_stream_source(struct wined3d_stateblock *stateblock, + UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value);

1 0