wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Piotr Caban : msvcp100: Add _Runtime_object class implementation.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 661791cb7ea3757655aeff4fb061ada27a88cecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=661791cb7ea3757655aeff4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 14:20:55 2018 -0600 msvcp100: Add _Runtime_object class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 10 +++++---- dlls/msvcp100/tests/misc.c | 36 ++++++++++++++++++++++++++++- dlls/msvcp110/msvcp110.spec | 12 +++++----- dlls/msvcp120/msvcp120.spec | 12 +++++----- dlls/msvcp120_app/msvcp120_app.spec | 12 +++++----- dlls/msvcp90/misc.c | 45 +++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=661791cb7ea3757655ae…

1 0

Andrew Wesie : ntdll: Implement NtCreateThreadEx.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 4fda0463237d395fbee5d955e72a7c13ed125416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fda0463237d395fbee5d955… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 6 03:10:30 2018 +0000 ntdll: Implement NtCreateThreadEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6e996a5..b63e335 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9ec94d6..35e23d2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -525,6 +525,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 6733977..98bf201 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2200,6 +2200,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */

1 0

Johann Frei : dinput: Implement X/Y axis granularity and add test.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 4bc1e172ecba43dd8a5eb341cdd8e705a314b44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bc1e172ecba43dd8a5eb341… Author: Johann Frei <johann_frei(a)yahoo.de> Date: Tue Mar 6 20:03:41 2018 +0100 dinput: Implement X/Y axis granularity and add test. Signed-off-by: Johann Frei <johann_frei(a)yahoo.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 17 +++++++++++++++-- dlls/dinput/tests/mouse.c | 23 ++++++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index eaec6b1..6d3eff5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -616,8 +616,21 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph; - /* We'll just assume that the app asks about the Z axis */ - pr->dwData = WHEEL_DELTA; + if ( + ((pdiph->dwHow == DIPH_BYOFFSET) && + ((pdiph->dwObj == DIMOFS_X) || + (pdiph->dwObj == DIMOFS_Y))) + || + ((pdiph->dwHow == DIPH_BYID) && + ((pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS)) || + (pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS)))) + ){ + /* Set granularity of X/Y Axis to 1. See MSDN on DIPROP_GRANULARITY */ + pr->dwData = 1; + } else { + /* We'll just assume that the app asks about the Z axis */ + pr->dwData = WHEEL_DELTA; + } break; } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dac7d8d..c2d0226 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -161,7 +161,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); @@ -172,6 +172,27 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + /* Check for granularity property using BYOFFSET */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYOFFSET; + di_op.diph.dwObj = DIMOFS_Y; + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + + /* Check for granularity property using BYID */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYID; + /* WINE_MOUSE_Y_AXIS_INSTANCE := 1 */ + di_op.diph.dwObj = (DIDFT_MAKEINSTANCE(1) | DIDFT_RELAXIS); + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Anton Romanov : wmp: Add IWMPNetwork stub.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 0c58f0ed39fa3bfb4c246e603d9b1a4999625704 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c58f0ed39fa3bfb4c246e60… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Mar 8 08:42:08 2018 -0800 wmp: Add IWMPNetwork stub. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 308 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 14 +++ dlls/wmp/wmp_private.h | 1 + 3 files changed, 321 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c58f0ed39fa3bfb4c24…

1 0

Anton Romanov : wmp: Add IWMPMedia stub.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 9a89db9897eec5b3e0e7e6e5e33f7261f503f765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a89db9897eec5b3e0e7e6e5… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Thu Mar 8 08:42:07 2018 -0800 wmp: Add IWMPMedia stub. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/player.c | 293 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/Makefile.in | 3 + dlls/wmp/tests/av.mp4 | Bin 0 -> 1493 bytes dlls/wmp/tests/oleobj.c | 86 +++++++++++++ dlls/wmp/tests/rsrc.rc | 22 ++++ dlls/wmp/wmp_private.h | 29 +++++ 7 files changed, 426 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a89db9897eec5b3e0e7…

1 0

Jacek Caban : mshtml/tests: Added more IDOMEvent::preventDefault tests.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: e36b765be44e1f76508648da6f9673057aeaf335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36b765be44e1f76508648da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 08:56:38 2018 -0600 mshtml/tests: Added more IDOMEvent::preventDefault tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 3836e13..dc9ce5a 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -358,6 +358,7 @@ function test_prevent_default() { elem.onclick = function(event) { event.preventDefault(); + ok(event.defaultPrevented === false, "defaultPrevented"); } e = document.createEvent("Event"); e.initEvent("click", true, false); @@ -372,6 +373,19 @@ function test_prevent_default() { r = elem.dispatchEvent(e); ok(r === true, "dispatchEvent returned " + r); + e = document.createEvent("Event"); + e.initEvent("click", false, true); + e.preventDefault(); + ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); + + e = document.createEvent("Event"); + e.initEvent("click", false, true); + elem.onclick = null; + r = elem.dispatchEvent(e); + ok(r === true, "dispatchEvent returned " + r); + e.preventDefault(); + ok(e.defaultPrevented === false, "defaultPrevented = " + e.defaultPrevented); + next_test(); }

1 0

Jacek Caban : mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 39766bcded650cec23c0c288dde12fe1e46e43cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=39766bcded650cec23c0c288… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 08:56:28 2018 -0600 mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3e0dfa5..dd63b39 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2593,8 +2593,8 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) { - for(i = 0; !event->prevent_default && i < chain_cnt; i++) { - BOOL prevent_default = FALSE; + BOOL prevent_default = event->prevent_default; + for(i = 0; !prevent_default && i < chain_cnt; i++) { vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -2603,7 +2603,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) - IDOMEvent_preventDefault(&event->IDOMEvent_iface); + nsIDOMEvent_PreventDefault(event->nsevent); } }

1 0

Józef Kucia : d3d9/tests: Add test for readback from multisample front buffer.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 57c2c9136fb07ecb8ab364eeab3e668bb5e5ba88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c2c9136fb07ecb8ab364ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 8 16:55:26 2018 +0330 d3d9/tests: Add test for readback from multisample front buffer. 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/d3d9/tests/visual.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 557631c..3686fc6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16249,6 +16249,78 @@ done: DestroyWindow(window); } +static void test_multisample_get_front_buffer_data(void) +{ + IDirect3DSwapChain9 *swapchain; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DSurface9 *readback; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + DWORD color; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, FALSE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Failed to get the implicit swapchain, hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); + ok(hr == D3D_OK, "Failed to get present parameters, hr %#x.\n", hr); + IDirect3DSwapChain9_Release(swapchain); + d3dpp.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + d3dpp.MultiSampleQuality = 0; + hr = IDirect3DDevice9_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00f0ff0f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, + 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &readback); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void multisampled_depth_buffer_test(void) { IDirect3DDevice9 *device = 0; @@ -23839,6 +23911,7 @@ START_TEST(visual) srgbwrite_format_test(); update_surface_test(); multisample_get_rtdata_test(); + test_multisample_get_front_buffer_data(); zenable_test(); fog_special_test(); volume_srgb_test();

1 0

Józef Kucia : wined3d: Allow blits from drawable location when loading renderbuffer locations.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: c114746f6f5601ec6c6a84b8a353868976509f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c114746f6f5601ec6c6a84b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 8 16:55:25 2018 +0330 wined3d: Allow blits from drawable location when loading renderbuffer locations. Fixes a regression introduced by fb6b3cc872077e641cf68165e04012a95c94699d. 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/surface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35aee73..201a563 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2358,6 +2358,10 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s src_location = WINED3D_LOCATION_RB_RESOLVED; else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; else /* texture2d_blt_fbo() will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB;

1 0

Matteo Bruni : wined3d: Pass a wined3d_context structure to texture2d_download_data().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: d2e89d0b99956b6314f1e1b9c06cd781bbbefa3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e89d0b99956b6314f1e1b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 10:53:04 2018 +0330 wined3d: Pass a wined3d_context structure to texture2d_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12023e2..35aee73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win * correct texture. */ /* Context activation is done by the caller. */ static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, DWORD dst_location) + const struct wined3d_context *context, DWORD dst_location) { const struct wined3d_format *format = texture->resource.format; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; @@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; @@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location); + texture2d_download_data(texture, sub_resource_idx, context, dst_location); ++texture->download_count; return TRUE;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018