October 2015 - Wine-Commits

Riccardo Bortolato : d3d9: Make use of wined3d_texture_unmap in d3d9_surface_UnlockRect.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 736ca38d11b82b1a25333e4a48b5d37717fa7914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736ca38d11b82b1a25333e4a4… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:11 2015 +0200 d3d9: Make use of wined3d_texture_unmap in d3d9_surface_UnlockRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ec5b420..83c90ab 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -272,7 +272,7 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_surface_unmap(surface->wined3d_surface); + hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx); wined3d_mutex_unlock(); switch(hr)

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_map in d3d9_surface_LockRect.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: df1101ff6820059c3a4298d6e7f901733b7c9636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1101ff6820059c3a4298d6e… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:10 2015 +0200 d3d9: Make use of wined3d_texture_map in d3d9_surface_LockRect. Also store wined3d_texture and sub_resource_idx in d3d9_surface. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 2 +- dlls/d3d9/surface.c | 11 +++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index ea0d3e6..dc9ae1c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -214,6 +214,8 @@ struct d3d9_surface { IDirect3DSurface9 IDirect3DSurface9_iface; struct d3d9_resource resource; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; struct wined3d_surface *wined3d_surface; struct list rtv_entry; struct wined3d_rendertarget_view *wined3d_rtv; @@ -224,7 +226,7 @@ struct d3d9_surface }; struct wined3d_rendertarget_view *d3d9_surface_get_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; -void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5df36f3..f49664e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3545,7 +3545,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, wined3d_texture_get_parent(wined3d_texture), surface, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, surface, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 7dc6e70..ec5b420 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -251,7 +251,8 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, } wined3d_mutex_lock(); - hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect ? &box : NULL, flags); + hr = wined3d_texture_map(surface->wined3d_texture, surface->sub_resource_idx, + &map_desc, rect ? &box : NULL, flags); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -356,7 +357,7 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { struct wined3d_resource_desc desc; @@ -367,9 +368,11 @@ void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, surface->resource.refcount = 0; surface->wined3d_surface = wined3d_surface; list_init(&surface->rtv_entry); - surface->container = container_parent; + surface->container = wined3d_texture_get_parent(wined3d_texture); + surface->wined3d_texture = wined3d_texture; + surface->sub_resource_idx = sub_resource_idx; - if (container_parent && SUCCEEDED(IUnknown_QueryInterface(container_parent, + if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container, &IID_IDirect3DBaseTexture9, (void **)&texture))) { surface->texture = unsafe_impl_from_IDirect3DBaseTexture9(texture);

1 0

Matteo Bruni : maintainers: Update Direct3D-related sections.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 2f375f31630550a32779a0f98ccf88c1c982028a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f375f31630550a32779a0f98… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:44 2015 +0200 maintainers: Update Direct3D-related sections. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 20e6e1f..d7e678f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,9 +60,25 @@ M: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> P: Józef Kucia <jkucia(a)codeweavers.com> P: Matteo Bruni <mbruni(a)codeweavers.com> -F: dlls/d3d*/ +F: dlls/d3d10*/ +F: dlls/d3d11/ +F: dlls/d3d8/ +F: dlls/d3d9/ +F: dlls/d3drm/ +F: dlls/ddraw*/ +F: dlls/dxgi/ F: dlls/wined3d/ +Direct3D helper libraries +M: Matteo Bruni <mbruni(a)codeweavers.com> +P: Henri Verbeet <hverbeet(a)codeweavers.com> +P: Stefan Dösinger <stefan(a)codeweavers.com> +P: Józef Kucia <jkucia(a)codeweavers.com> +F: dlls/d3dcompiler*/ +F: dlls/d3dx10*/ +F: dlls/d3dx11*/ +F: dlls/d3dx9*/ + DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/

1 0

Matteo Bruni : d3d9/tests: Use the new readback helpers in test_pointsize( ).
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 742d4df55bbd9db555a41fdbfe7a71a556856f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742d4df55bbd9db555a41fdbf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 9 15:55:42 2015 +0200 d3d9/tests: Use the new readback helpers in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(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 | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 50149e0..57d110a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10195,7 +10195,7 @@ static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) return TRUE; } -static void pointsize_test(void) +static void test_pointsize(void) { static const float a = 1.0f, b = 1.0f, c = 1.0f; float ptsize, ptsizemax_orig, ptsizemin_orig; @@ -10718,35 +10718,40 @@ static void pointsize_test(void) } else { + struct surface_readback rb; + + get_rt_readback(backbuffer, &rb); /* On AMD apparently only the first texcoord is modified by the point coordinates * when using SM2/3 pixel shaders. */ - color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x00ffff00, 0) || (allow_broken && broken(color_match(color, 0x00ff0000, 0))), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x00000000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1); ok(color_match(color, test_setups[i].gives_0_0_texcoord ? 0x00ff0000 : 0x0000ff00, 0) || (allow_broken && broken(color_match(color, 0x00000000, 0))), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); + + release_surface_readback(&rb); } } IDirect3DDevice9_SetVertexShader(device, NULL); @@ -20008,7 +20013,7 @@ START_TEST(visual) fixed_function_decl_test(); conditional_np2_repeat_test(); fixed_function_bumpmap_test(); - pointsize_test(); + test_pointsize(); tssargtemp_test(); np2_stretch_rect_test(); yuv_color_test();

1 0

Austin English : kernel32: Add a stub for GetCurrentProcessorNumberEx.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 132ff59b3ecb80d9e1c18616861ec4cc098bae53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132ff59b3ecb80d9e1c186168… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 11 11:50:53 2015 -0500 kernel32: Add a stub for GetCurrentProcessorNumberEx. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 11 +++++++++++ include/winternl.h | 1 + 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 9fb1941..84f43d8 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -12,7 +12,7 @@ @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber -@ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId @ stub GetCurrentThreadStackLimits diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 830578f..6430c63 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -12,7 +12,7 @@ @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber -@ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId @ stub GetCurrentThreadStackLimits diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bda7c9d..e0cb154 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -632,7 +632,7 @@ @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber -# @ stub GetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() # @ stub -arch=x86_64 GetCurrentUmsThread diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7f07b14..40d3df5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -627,6 +627,7 @@ @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() +@ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetElementGenericTable diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d20a098..8eb3e9f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1584,3 +1584,14 @@ BOOL WINAPI RtlSetCurrentTransaction(HANDLE new_transaction) FIXME("(%p) :stub\n", new_transaction); return FALSE; } + +/********************************************************************** + * RtlGetCurrentProcessorNumberEx [NTDLL.@] + */ +void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) +{ + FIXME("(%p) :semi-stub\n", processor); + processor->Group = 0; + processor->Number = NtGetCurrentProcessorNumber(); + processor->Reserved = 0; +} diff --git a/include/winternl.h b/include/winternl.h index e76114e..61b144a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2143,6 +2143,7 @@ NTSYSAPI NTSTATUS WINAPI NtFlushWriteBuffer(VOID); NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); +NTSYSAPI ULONG WINAPI NtGetCurrentProcessorNumber(void); NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); NTSYSAPI ULONG WINAPI NtGetTickCount(VOID); NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*);

1 0

Qian Hong : dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: fd9d4b6232b8ba39fb1f0a25a17fa841449caa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9d4b6232b8ba39fb1f0a25a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 9 19:59:58 2015 +0800 dbghelp: Parse DW_TAG_const_type inside dwarf2_parse_subprogram. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4c093a3..655c586 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1978,6 +1978,9 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_pointer_type: dwarf2_parse_pointer_type(subpgm.ctx, di); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm.ctx, di); + break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) * skip it for now

1 0

Riccardo Bortolato : d3d9: Don' t use a wined3d_surface in d3d9_surface_GetDesc.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 9b02e116bdc4a9a9e5a47faca75a4483952923eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02e116bdc4a9a9e5a47faca… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:12 2015 +0200 d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 83c90ab..ed00f7a 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -208,13 +208,13 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_ { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);

1 0

Riccardo Bortolato : d3d8: Don' t use a wined3d_surface in d3d8_surface_GetDesc.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: ea51e1f1073a5bee670a0eed0df70d2eff49e666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea51e1f1073a5bee670a0eed0… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:09 2015 +0200 d3d8: Don't use a wined3d_surface in d3d8_surface_GetDesc. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 75deac3..165e048 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -176,13 +176,13 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ { struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);

1 0

Riccardo Bortolato : d3d8: Use wined3d_texture_unmap instead of wined3d_surface_unmap in d3d8_surface_UnlockRect.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: 2f1b6114daed8346bd128bdceb34a738aa18e004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1b6114daed8346bd128bdce… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 12 12:44:08 2015 +0200 d3d8: Use wined3d_texture_unmap instead of wined3d_surface_unmap in d3d8_surface_UnlockRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 98132ae..75deac3 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -260,7 +260,7 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_surface_unmap(surface->wined3d_surface); + hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx); wined3d_mutex_unlock(); switch(hr)

1 0

Jactry Zeng : user32/tests: Add tests for FlashWindow.
by Alexandre Julliard Oct. 12, 2015

Oct. 12, 2015

Module: wine Branch: master Commit: d2d114190ce64fc68322a1bbb6d2124f8de45353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d114190ce64fc68322a1bbb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 7 11:51:10 2015 +0800 user32/tests: Add tests for FlashWindow. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 10aa545..96136c1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -57,6 +57,7 @@ static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); +static BOOL (WINAPI *pFlashWindow)( HWND hwnd, BOOL bInvert ); static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); @@ -7068,6 +7069,33 @@ static void test_rtl_layout(void) DestroyWindow( parent ); } +static void test_FlashWindow(void) +{ + HWND hwnd; + BOOL ret; + if (!pFlashWindow) + { + win_skip( "FlashWindow not supported\n" ); + return; + } + + hwnd = CreateWindowExA( 0, "MainWindowClass", "FlashWindow", WS_POPUP, + 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( NULL, TRUE ); + todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); + + DestroyWindow( hwnd ); + + SetLastError( 0xdeadbeef ); + ret = pFlashWindow( hwnd, TRUE ); + todo_wine ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + "FlashWindow returned with %d\n", GetLastError() ); +} + static void test_FlashWindowEx(void) { HWND hwnd; @@ -8177,6 +8205,7 @@ START_TEST(win) pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); pGetProcessDefaultLayout = (void *)GetProcAddress( user32, "GetProcessDefaultLayout" ); pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); + pFlashWindow = (void *)GetProcAddress( user32, "FlashWindow" ); pFlashWindowEx = (void *)GetProcAddress( user32, "FlashWindowEx" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); @@ -8240,6 +8269,7 @@ START_TEST(win) test_capture_3(hwndMain, hwndMain2); test_capture_4(); test_rtl_layout(); + test_FlashWindow(); test_FlashWindowEx(); test_CreateWindow();

1 0