January 2018 - Wine-Commits

Alex Henrie : kernel32/tests: Drop module test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: 84a5c59604ba88d7768a4fd2f7e08eccbdd10259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a5c59604ba88d7768a4fd2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 10 10:19:03 2018 -0700 kernel32/tests: Drop module test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 162 +++++++++++++++---------------------------- 1 file changed, 54 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84a5c59604ba88d7768a…

1 0

Piotr Caban : concrt140: Fix Concurrency:: is_current_task_group_canceling spec entry.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: 5890c3d0506fba366935a8a1d19c6a7d0c0e64fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5890c3d0506fba366935a8a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 10 18:09:00 2018 +0100 concrt140: Fix Concurrency::is_current_task_group_canceling spec entry. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 0f96d7e..3777533 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -477,7 +477,7 @@ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ thiscall -arch=i386 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ(ptr) msvcr120.?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ cdecl -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ(ptr) msvcr120.?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ thiscall -arch=i386 ?lock(a)critical_section@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?lock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)reader_writer_lock@Concurrency@@QAEXXZ

1 0

Nikolay Sivov : comctl32/tests: Enable more ListView tests on Comctl32 v6.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: 07ea3acbda5173d243ffc59233a2febcaed4d731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ea3acbda5173d243ffc592… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 10 10:17:20 2018 +0300 comctl32/tests: Enable more ListView tests on Comctl32 v6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f291698..1df8648 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6225,6 +6225,25 @@ START_TEST(listview) test_multiselect(); test_insertitem(); test_header_proc(); + test_images(); + test_checkboxes(); + test_items(); + test_color(); + test_columns(); + test_sorting(); + test_ownerdata(); + test_norecompute(); + test_nosortheader(); + test_columnscreation(); + test_indentation(); + test_finditem(); + test_hover(); + test_destroynotify(); + test_createdragimage(); + test_dispinfo(); + test_LVM_SETITEMTEXT(); + test_LVM_REDRAWITEMS(); + test_oneclickactivate(); unload_v6_module(ctx_cookie, hCtx);

1 0

Zebediah Figura : hlink: Implement IHlinkBrowseContext_GetObject().
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: c2953ba45775cdaf4c2653cc6337ea93031e04b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2953ba45775cdaf4c2653cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 9 20:59:39 2018 -0600 hlink: Implement IHlinkBrowseContext_GetObject(). Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 27 ++++++++++++++--- dlls/hlink/tests/browse_ctx.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index ee8509d..2038768 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -98,10 +98,11 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return ref; } +static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; + static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { - static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); IMoniker *mon; IMoniker *composite; @@ -125,11 +126,29 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, return S_OK; } -static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, +static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* iface, IMoniker *pimk, BOOL fBindifRootRegistered, IUnknown **ppiunk) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + IMoniker *mon; + IMoniker *composite; + IRunningObjectTable *ROT; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pimk, fBindifRootRegistered, ppiunk); + + hr = CreateItemMoniker(NULL, szIdent, &mon); + if (FAILED(hr)) return hr; + CreateGenericComposite(mon, pimk, &composite); + + GetRunningObjectTable(0, &ROT); + hr = IRunningObjectTable_GetObject(ROT, composite, ppiunk); + + IRunningObjectTable_Release(ROT); + IMoniker_Release(composite); + IMoniker_Release(mon); + + return hr; } static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 40d132b..3193525 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -131,12 +131,82 @@ static void test_BrowseWindowInfo(void) IHlinkBrowseContext_Release(bc); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; + +static IUnknown Unknown = { &UnknownVtbl }; + +static void test_GetObject(void) +{ + IHlinkBrowseContext *bc; + IMoniker *dummy; + IBindCtx *bindctx; + IUnknown *unk; + WCHAR one[] = {'1',0}; + WCHAR five[] = {'5',0}; + DWORD cookie; + HRESULT hres; + + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx() failed: 0x%08x\n", hres); + + hres = CreateItemMoniker(one, five, &dummy); + ok(hres == S_OK, "CreateItemMoniker() failed: 0x%08x\n", hres); + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void **)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_Register(bc, 0, &Unknown, dummy, &cookie); + ok(hres == S_OK, "Register() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == S_OK, "GetObject() failed: 0x%08x\n", hres); + ok(unk == &Unknown, "wrong object returned\n"); + + hres = IHlinkBrowseContext_Revoke(bc, cookie); + ok(hres == S_OK, "Revoke() failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetObject(bc, dummy, FALSE, &unk); + ok(hres == MK_E_UNAVAILABLE, "expected MK_E_UNAVAILABLE, got 0x%08x\n", hres); + + IHlinkBrowseContext_Release(bc); +} + START_TEST(browse_ctx) { CoInitialize(NULL); test_SetInitialHlink(); test_BrowseWindowInfo(); + test_GetObject(); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Add some state image tests for ListView.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: 24fa2e8954cd98eabda05c93e29da0d10ecfcaf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fa2e8954cd98eabda05c93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 10 10:17:21 2018 +0300 comctl32/tests: Add some state image tests for ListView. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1df8648..1dd0fe1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6135,6 +6135,95 @@ todo_wine DestroyWindow(hwnd); } +static void test_state_image(void) +{ + static const DWORD styles[] = + { + LVS_ICON, + LVS_REPORT, + LVS_SMALLICON, + LVS_LIST, + }; + int i; + + for (i = 0; i < sizeof(styles)/sizeof(styles[0]); i++) + { + static char text[] = "Item"; + static char subtext[] = "Subitem"; + char buff[16]; + LVITEMA item; + HWND hwnd; + int r; + + hwnd = create_listview_control(styles[i]); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.pszText = text; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(r == 0, "Failed to insert an item.\n"); + + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to set item state.\n"); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = subtext; + r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to set subitem text.\n"); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get item state.\n"); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + todo_wine + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 2; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + todo_wine + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem text %d.\n", r); + ok(!strcmp(buff, subtext), "Unexpected subitem text %s.\n", buff); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { HMODULE hComctl32; @@ -6207,6 +6296,7 @@ START_TEST(listview) test_header_proc(); test_oneclickactivate(); test_callback_mask(); + test_state_image(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6244,6 +6334,7 @@ START_TEST(listview) test_LVM_SETITEMTEXT(); test_LVM_REDRAWITEMS(); test_oneclickactivate(); + test_state_image(); unload_v6_module(ctx_cookie, hCtx);

1 0

Alex Henrie : msxml3/tests: Make put_data_types const.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: 53a55fbdb1784e8f3514d15a8545e2e80f9f06ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a55fbdb1784e8f3514d15a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 21:19:48 2018 -0700 msxml3/tests: Make put_data_types const. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 26555d2..1306590 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11993,7 +11993,7 @@ static void test_get_namespaces(void) free_bstrs(); } -static DOMNodeType put_data_types[] = { +static const DOMNodeType put_data_types[] = { NODE_TEXT, NODE_CDATA_SECTION, NODE_PROCESSING_INSTRUCTION, @@ -12006,7 +12006,7 @@ static void test_put_data(void) static const WCHAR test_data[] = {'t','e','s','t',' ','n','o','d','e',' ','d','a','t','a',0}; WCHAR buff[100], *data; IXMLDOMDocument *doc; - DOMNodeType *type; + const DOMNodeType *type; IXMLDOMText *text; IXMLDOMNode *node; VARIANT v;

1 0

Alex Henrie : msvcrt: Fix mistakes in comments.
by Alexandre Julliard Jan. 10, 2018

Jan. 10, 2018

Module: wine Branch: master Commit: f0e74961e1da1cb601064555f3218675ee06dc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e74961e1da1cb601064555… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 9 23:21:46 2018 -0700 msvcrt: Fix mistakes in comments. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/math.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c37989d..088e1b7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -451,7 +451,7 @@ char* CDECL _Getdays(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getdays (MSVCR100.@) + * _W_Getdays (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getdays(void) { @@ -519,7 +519,7 @@ char* CDECL _Getmonths(void) #if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getmonths (MSVCR100.@) + * _W_Getmonths (MSVCR110.@) */ MSVCRT_wchar_t* CDECL _W_Getmonths(void) { diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 89400f8..9b48011 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1040,7 +1040,7 @@ double CDECL MSVCRT__chgsign(double num) } /********************************************************************* - * __control87_2 (MSVCRT.@) + * __control87_2 (MSVCR80.@) * * Not exported by native msvcrt, added in msvcr80. */

1 0

Julian Rüger : German translation for release 3.0-rc5
by Jeremy Newman Jan. 10, 2018

Jan. 10, 2018

Module: website Branch: master Commit: 28f727ff3e9e22923d33e37eb8ee33e4f8a303d4 URL: https://source.winehq.org/git/website.git/?a=commit;h=28f727ff3e9e22923d33e… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 10 10:28:48 2018 +0100 German translation for release 3.0-rc5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018010501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018010501.xml b/news/de/2018010501.xml new file mode 100644 index 0000000..9877bce --- /dev/null +++ b/news/de/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>5. Januar 2018</date> +<title>Wine 3.0-rc5 freigegeben</title> +<body> + Die Entwicklungsversion 3.0-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : winhlp32: Remove redundant comparison.
by Alexandre Julliard Jan. 9, 2018

Jan. 9, 2018

Module: wine Branch: master Commit: 9519216fa07d159e5f474a396dc6b86eee80a24a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9519216fa07d159e5f474a39… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 9 13:25:30 2018 +0200 winhlp32: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/winhelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 0708034..2ac3d2f 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1666,7 +1666,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) option = *cmdline; if (option) cmdline++; - while (*cmdline && *cmdline == ' ') cmdline++; + while (*cmdline == ' ') cmdline++; switch (option) { case 'i':

1 0

Józef Kucia : wined3d: Load buffer before applying state for indirect draws.
by Alexandre Julliard Jan. 9, 2018

Jan. 9, 2018

Module: wine Branch: master Commit: 6280926e3b7e7a270498b2181823162e79caf9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=6280926e3b7e7a270498b218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:10:06 2018 +0100 wined3d: Load buffer before applying state for indirect draws. wined3d_load_buffer() might invalidate the current state. 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/drawprim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 95e79f7..17ce16a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -407,7 +407,6 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ return; } - wined3d_buffer_load(buffer, context, state); GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); if (idx_size) @@ -572,6 +571,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_rendertarget_view_prepare_location(dsv, context, location); } + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + if (!context_apply_draw_state(context, device, state)) { context_release(context);

1 0