March 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : include: Added shimgdata.idl.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 233545efcb8ecc41c4bdf160db647eb402f005b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233545efcb8ecc41c4bdf160d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 11:56:21 2016 +0300 include: Added shimgdata.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/shimgdata.idl | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 596c0c9..8283616 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -137,6 +137,7 @@ IDL_SRCS = \ servprov.idl \ sesprp.idl \ shdeprecated.idl \ + shimgdata.idl \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ diff --git a/include/shimgdata.idl b/include/shimgdata.idl new file mode 100644 index 0000000..2e84298 --- /dev/null +++ b/include/shimgdata.idl @@ -0,0 +1,93 @@ +/* + * Copyright 2016 Nikolay Sivov For CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propidl.idl"; + +cpp_quote("#ifndef _GDIPLUSPIXELFORMATS_H") +typedef DWORD PixelFormat; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSENUMS_H") +typedef DWORD InterpolationMode; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSHEADERS_H") +typedef BYTE EncoderParameters; +typedef BYTE Image; +cpp_quote("#endif") + +[ + object, + uuid(53fb8e58-50c0-4003-b4aa-0c8df28e7f3a) +] +interface IShellImageDataAbort : IUnknown +{ + HRESULT QueryAbort(); +} + +[ + object, + local, + uuid(bfdeec12-8040-4403-a5ea-9e07dafcf530) +] +interface IShellImageData : IUnknown +{ + HRESULT Decode([in] DWORD flags, [in] ULONG cx_desired, [in] ULONG cy_desired); + HRESULT Draw([in] HDC hdc, [in] RECT *dest, [in] RECT *src); + HRESULT NextFrame(); + HRESULT NextPage(); + HRESULT PrevPage(); + HRESULT IsTransparent(); + HRESULT IsAnimated(); + HRESULT IsVector(); + HRESULT IsMultipage(); + HRESULT IsEditable(); + HRESULT IsPrintable(); + HRESULT IsDecoded(); + HRESULT GetCurrentPage([out] ULONG *page); + HRESULT GetPageCount([out] ULONG *count); + HRESULT SelectPage([in] ULONG page); + HRESULT GetSize([out] SIZE *size); + HRESULT GetRawDataFormat([out] GUID *format); + HRESULT GetPixelFormat([out] PixelFormat *format); + HRESULT GetDelay([out] DWORD *delay); + HRESULT GetProperties([in] DWORD mode, [out] IPropertySetStorage **props); + HRESULT Rotate([in] DWORD angle); + HRESULT Scale([in] ULONG cx, [in] ULONG cy, [in] InterpolationMode mode); + HRESULT DiscardEdit(); + HRESULT SetEncoderParams([in] IPropertyBag *params); + HRESULT DisplayName([size_is(count), in, out] LPWSTR name, UINT count); + HRESULT GetResolution([out] ULONG *res_x, [out] ULONG *res_y); + HRESULT GetEncoderParams([in] GUID *format, [out] EncoderParameters **params); + HRESULT RegisterAbort([in] IShellImageDataAbort *abort, [out] IShellImageDataAbort **prev); + HRESULT CloneFrame([out] Image **frame); + HRESULT ReplaceFrame([in] Image *frame); +} + +[ + object, + uuid(9be8ed5c-edab-4d75-90f3-bd5bdbb21c82) +] +interface IShellImageDataFactory : IUnknown +{ + HRESULT CreateIShellImageData([out] IShellImageData **data); + HRESULT CreateImageFromFile([in] LPCWSTR path, [out] IShellImageData **data); + HRESULT CreateImageFromStream([in] IStream *stream, [out] IShellImageData **data); + HRESULT GetDataFormatFromPath([in] LPCWSTR path, [out] GUID *format); +}

1 0

Hugh McMaster : reg: Allow values to be added, deleted or modified in root keys.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: ead76c7e47e17ab92277700ea7a2844252e74525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead76c7e47e17ab92277700ea… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 21 16:00:33 2016 +1100 reg: Allow values to be added, deleted or modified in root keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9dbce32..b2066e0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -355,12 +355,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; p = strchrW(key_name,'\\'); - if (!p) - { - output_message(STRING_INVALID_KEY); - return 1; - } - p++; + if (p) p++; root = path_get_rootkey(key_name); if (!root) @@ -440,12 +435,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, return 1; p = strchrW(key_name,'\\'); - if (!p) - { - output_message(STRING_INVALID_KEY); - return 1; - } - p++; + if (p) p++; root = path_get_rootkey(key_name); if (!root)

1 0

Alexandre Julliard : kernel32/tests: Use Interlocked functions to avoid fault counters being optimized out.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 2dd01087f26c79adf785f9fd302d713ea387acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd01087f26c79adf785f9fd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 12:14:28 2016 +0900 kernel32/tests: Use Interlocked functions to avoid fault counters being optimized out. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a3ae5e6..1a8fd6f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1808,7 +1808,7 @@ static void test_write_watch(void) #ifdef __i386__ -static DWORD num_guard_page_calls; +static LONG num_guard_page_calls; static DWORD guard_page_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) @@ -1820,7 +1820,7 @@ static DWORD guard_page_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R ok( rec->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION, "ExceptionCode is %08x instead of %08x\n", rec->ExceptionCode, STATUS_GUARD_PAGE_VIOLATION ); - num_guard_page_calls++; + InterlockedIncrement( &num_guard_page_calls ); *(int *)rec->ExceptionInformation[1] += 0x100; return ExceptionContinueExecution; @@ -1909,8 +1909,8 @@ static void test_guard_page(void) frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = 0; - old_value = *value; /* exception handler increments value by 0x100 */ + InterlockedExchange( &num_guard_page_calls, 0 ); + InterlockedExchange( &old_value, *value ); /* exception handler increments value by 0x100 */ *value = 2; ok( old_value == 0x101, "memory block contains wrong value, expected 0x101, got 0x%x\n", old_value ); ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); @@ -1931,7 +1931,7 @@ static void test_guard_page(void) frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = 0; + InterlockedExchange( &num_guard_page_calls, 0 ); old_value = *(value + 1); ok( old_value == 0x102, "memory block contains wrong value, expected 0x102, got 0x%x\n", old_value ); ok( *value == 2, "memory block contains wrong value, expected 2, got 0x%x\n", *value ); @@ -1985,7 +1985,7 @@ static void test_guard_page(void) frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = 0; + InterlockedExchange( &num_guard_page_calls, 0 ); *value = 1; *(value + 1) = 2; ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); @@ -2006,7 +2006,7 @@ static void test_guard_page(void) frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = 0; + InterlockedExchange( &num_guard_page_calls, 0 ); old_value = *(value + 1); /* doesn't trigger write watch */ ok( old_value == 0x102, "memory block contains wrong value, expected 0x102, got 0x%x\n", old_value ); ok( *value == 1, "memory block contains wrong value, expected 1, got 0x%x\n", *value ); @@ -2132,7 +2132,7 @@ static void test_stack_commit(void) VirtualFree( call_on_stack, 0, MEM_RELEASE ); } -DWORD num_execute_fault_calls; +static LONG num_execute_fault_calls; static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) @@ -2157,7 +2157,7 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok( rec->ExceptionInformation[0] == err, "ExceptionInformation[0] is %d instead of %d\n", (DWORD)rec->ExceptionInformation[0], err ); - num_guard_page_calls++; + InterlockedIncrement( &num_guard_page_calls ); } else if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION) { @@ -2172,7 +2172,7 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok( success, "VirtualProtect failed %u\n", GetLastError() ); ok( old_prot == PAGE_READWRITE, "wrong old prot %x\n", old_prot ); - num_execute_fault_calls++; + InterlockedIncrement( &num_execute_fault_calls ); } return ExceptionContinueExecution; @@ -2193,7 +2193,7 @@ static LONG CALLBACK execute_fault_vec_handler( EXCEPTION_POINTERS *ExceptionInf "ExceptionCode is %08x instead of STATUS_ACCESS_VIOLATION\n", rec->ExceptionCode ); if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION) - num_execute_fault_calls++; + InterlockedIncrement( &num_execute_fault_calls ); if (rec->ExceptionInformation[0] == EXCEPTION_READ_FAULT) return EXCEPTION_CONTINUE_SEARCH; @@ -2214,7 +2214,8 @@ static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPA frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = num_execute_fault_calls = 0; + InterlockedExchange( &num_guard_page_calls, 0 ); + InterlockedExchange( &num_execute_fault_calls, 0 ); ret = SendMessageA( hWnd, uMsg, wParam, lParam ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; @@ -2231,7 +2232,8 @@ static inline DWORD call_proc_excpt( DWORD (CALLBACK *code)(void *), void *arg ) frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; pNtCurrentTeb()->Tib.ExceptionList = &frame; - num_guard_page_calls = num_execute_fault_calls = 0; + InterlockedExchange( &num_guard_page_calls, 0 ); + InterlockedExchange( &num_execute_fault_calls, 0 ); ret = code( arg ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev;

1 0

Francois Gouget : shell32/tests: Delete the shlproto test class when done.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 11d77e51d54ff1446a8a0e9d3ad8ae73ad18c3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d77e51d54ff1446a8a0e9d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:13:13 2016 +0100 shell32/tests: Delete the shlproto test class when done. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9268bf3..9b1ec11 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2831,6 +2831,7 @@ static void cleanup_test(void) /* Delete the test association */ delete_test_association(".shlexec"); + delete_test_class("shlproto"); CloseHandle(hEvent);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in fb_copy_to_texture_hwstretch().
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 77a396a0862dc933742b2b5f1cbb7e1f9658d7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a396a0862dc933742b2b5f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:50 2016 +0100 wined3d: Get resource info from the texture in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71b34e7..c259c13 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2321,7 +2321,9 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) { - struct wined3d_device *device = dst_surface->resource.device; + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ UINT fbwidth = src_surface->resource.width; @@ -2341,16 +2343,16 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st context = context_acquire(device, src_surface); gl_info = context->gl_info; context_apply_blit_state(context, device); - wined3d_texture_load(dst_surface->container, context, FALSE); + wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); - src_offscreen = wined3d_resource_is_offscreen(&src_surface->container->resource); + src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; - if (!noBackBufferBackup && !src_surface->container->texture_rgb.name) + if (!noBackBufferBackup && !src_texture->texture_rgb.name) { /* Get it a description */ - wined3d_texture_load(src_surface->container, context, FALSE); + wined3d_texture_load(src_texture, context, FALSE); } /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. @@ -2380,7 +2382,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * we are reading from the back buffer, the backup can be used as source texture */ texture_target = src_surface->texture_target; - context_bind_texture(context, texture_target, src_surface->container->texture_rgb.name); + context_bind_texture(context, texture_target, src_texture->texture_rgb.name); gl_info->gl_ops.gl.p_glEnable(texture_target); checkGLcall("glEnable(texture_target)"); @@ -2421,10 +2423,9 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); checkGLcall("glTexParameteri"); - if (!src_surface->container->swapchain - || src_surface->container == src_surface->container->swapchain->back_buffers[0]) + if (!src_texture->swapchain || src_texture == src_texture->swapchain->back_buffers[0]) { - src = backup ? backup : src_surface->container->texture_rgb.name; + src = backup ? backup : src_texture->texture_rgb.name; } else { @@ -2474,7 +2475,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st bottom = src_surface->resource.height - src_rect->top; } - if (src_surface->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) + if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { left /= src_surface->pow2Width; right /= src_surface->pow2Width; @@ -2516,7 +2517,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* Now read the stretched and upside down image into the destination texture */ - context_bind_texture(context, texture_target, dst_surface->container->texture_rgb.name); + context_bind_texture(context, texture_target, dst_texture->texture_rgb.name); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, dst_rect.left, dst_rect.top, /* xoffset, yoffset */ @@ -2545,7 +2546,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glEnable(src_surface->texture_target); texture_target = src_surface->texture_target; } - context_bind_texture(context, src_surface->texture_target, src_surface->container->texture_rgb.name); + context_bind_texture(context, src_surface->texture_target, src_texture->texture_rgb.name); } gl_info->gl_ops.gl.p_glBegin(GL_QUADS); @@ -2571,7 +2572,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glDisable(texture_target)"); /* Cleanup */ - if (src != src_surface->container->texture_rgb.name && src != backup) + if (src != src_texture->texture_rgb.name && src != backup) { gl_info->gl_ops.gl.p_glDeleteTextures(1, &src); checkGLcall("glDeleteTextures(1, &src)");

1 0

Henri Verbeet : wined3d: Get resource info from the texture in read_from_framebuffer().
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 1e8befdbf00ad7a013fdc0d5411a2c8814c682b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8befdbf00ad7a013fdc0d54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:46 2016 +0100 wined3d: Get resource info from the texture in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 297a34d..8efd85ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1992,7 +1992,8 @@ do { \ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *old_ctx, DWORD dst_location) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; @@ -2018,7 +2019,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (wined3d_resource_is_offscreen(&surface->container->resource)) + if (wined3d_resource_is_offscreen(&texture->resource)) { /* Mapping the primary render target which is not on a swapchain. * Read from the back buffer. */ @@ -2042,16 +2043,16 @@ static void read_from_framebuffer(struct wined3d_surface *surface, checkGLcall("glBindBuffer"); } - wined3d_texture_get_pitch(surface->container, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / surface->resource.format->byte_count); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - surface->resource.format->glFormat, - surface->resource.format->glType, data.addr); + texture->resource.format->glFormat, + texture->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */

1 0

Alexandre Julliard : winebuild: Use strarray objects instead of pointers where possible.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 8baaf5349f5cfb01ea78c5d7b0592d4ae674caf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8baaf5349f5cfb01ea78c5d7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 19 13:10:09 2016 +0900 winebuild: Use strarray objects instead of pointers where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 19 ++++----- tools/winebuild/import.c | 19 ++++----- tools/winebuild/main.c | 8 ++-- tools/winebuild/res32.c | 7 ++- tools/winebuild/utils.c | 108 +++++++++++++++++++++-------------------------- 5 files changed, 73 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8baaf5349f5cfb01ea78c…

1 0

Józef Kucia : wined3d: Implement copying of buffer resources.
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 94039385f93bcebfbe7686446000dcea5c9c7230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94039385f93bcebfbe7686446… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:26 2016 +0100 wined3d: Implement copying of buffer resources. 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/buffer.c | 86 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/device.c | 9 +++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1e66cae..70a7a20 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -42,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, UINT offset, UINT size) +static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offset, unsigned int size) { - if (!offset && !size) + if (!offset && (!size || size == buffer->resource.size)) goto invalidate_all; if (offset > buffer->resource.size || offset + size > buffer->resource.size) @@ -1113,6 +1113,88 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) +{ + BYTE *dst_buffer_mem, *src_buffer_mem, *dst_ptr, *src_ptr; + struct wined3d_bo_address dst_bo_address, src_bo_address; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_device *device; + HRESULT hr; + + device = dst_buffer->resource.device; + + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + buffer_get_memory(dst_buffer, context, &dst_bo_address); + buffer_get_memory(src_buffer, context, &src_bo_address); + + dst_buffer_mem = dst_buffer->resource.heap_memory; + src_buffer_mem = src_buffer->resource.heap_memory; + + if (!dst_buffer_mem && !src_buffer_mem) + { + if (gl_info->supported[ARB_COPY_BUFFER]) + { + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); + checkGLcall("direct buffer copy"); + } + else + { + if (FAILED(hr = wined3d_buffer_map(dst_buffer, dst_offset, size, &dst_ptr, 0))) + { + WARN("Failed to map dst_buffer, hr %#x.\n", hr); + context_release(context); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_buffer_map(src_buffer, src_offset, size, &src_ptr, WINED3D_MAP_READONLY))) + { + WARN("Failed to map src_buffer, hr %#x.\n", hr); + wined3d_buffer_unmap(dst_buffer); + context_release(context); + return WINED3DERR_INVALIDCALL; + } + + memcpy(dst_ptr, src_ptr, size); + + wined3d_buffer_unmap(src_buffer); + wined3d_buffer_unmap(dst_buffer); + } + } + else if (dst_buffer_mem && !src_buffer_mem) + { + if (src_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); + GL_EXTCALL(glBindBuffer(src_buffer->buffer_type_hint, src_bo_address.buffer_object)); + + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); + checkGLcall("buffer download"); + } + else if (!dst_buffer_mem && src_buffer_mem) + { + if (dst_buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); + GL_EXTCALL(glBindBuffer(dst_buffer->buffer_type_hint, dst_bo_address.buffer_object)); + + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); + checkGLcall("buffer upload"); + } + else + { + memcpy(dst_buffer_mem + dst_offset, src_buffer_mem + src_offset, size); + } + + if (dst_buffer_mem) + buffer_invalidate_bo_range(dst_buffer, dst_offset, size); + + context_release(context); + return WINED3D_OK; +} + HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e428a79..bfbef48 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3865,6 +3865,15 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) + { + if (FAILED(hr = wined3d_buffer_copy(buffer_from_resource(dst_resource), 0, + buffer_from_resource(src_resource), 0, + dst_resource->size))) + ERR("Failed to copy buffer, hr %#x.\n", hr); + return; + } + if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99f2e53..3dea1e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,8 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *con void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, + struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_fb_texture().
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: 576a74d166db989f9706b942464e68b2b0018478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576a74d166db989f9706b9424… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:47 2016 +0100 wined3d: Get resource info from the texture in surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8efd85ee..5b9b84b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2110,7 +2110,8 @@ error: * switch to a different context and restore the original one before return. */ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *old_ctx) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; @@ -2124,12 +2125,12 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); - wined3d_texture_prepare_texture(surface->container, context, srgb); - wined3d_texture_bind_and_dirtify(surface->container, context, srgb); + wined3d_texture_prepare_texture(texture, context, srgb); + wined3d_texture_bind_and_dirtify(texture, context, srgb); TRACE("Reading back offscreen render target %p.\n", surface); - if (wined3d_resource_is_offscreen(&surface->container->resource)) + if (wined3d_resource_is_offscreen(&texture->resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); else gl_info->gl_ops.gl.p_glReadBuffer(surface_get_gl_buffer(surface));

1 0

Francois Gouget : shell32/tests: Move a file URL test to test_fileurl().
by Alexandre Julliard March 21, 2016

March 21, 2016

Module: wine Branch: master Commit: e7065e0c5154d2d5a1b8d38ed7a56d66f2834b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7065e0c5154d2d5a1b8d38ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:14:49 2016 +0100 shell32/tests: Move a file URL test to test_fileurl(). This way it's integrated with the rest of the matching tests and skipped on plaforms where file URLs don't work right (old Windows XP versions). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9b1ec11..1255eec 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1818,6 +1818,9 @@ static fileurl_tests_t fileurl_tests[]= /* Test shortcuts vs. URLs */ {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + /* Confuse things by mixing protocols */ + {"file://", "shlproto://foo/bar", USE_COLON, 0}, + {NULL, NULL, 0, 0} }; @@ -1989,10 +1992,6 @@ static void test_urls(void) todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); SetEnvironmentVariableA("urlprefix", NULL); - /* Try to confuse ShellExecute() by mixing protocols */ - rc = shell_execute(NULL, "file://shlproto://foo/bar", NULL, NULL); - ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF, "%s returned %lu\n", shell_call, rc); - delete_test_class("fakeproto"); delete_test_class("shlpaverb"); }

1 0