wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

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

21 Mar '16

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 21 Mar '16

21 Mar '16

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: Test default verb detection for files as well as for URLs.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 822e78ee04c60c3d0fbf52cb0d9338f41292dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822e78ee04c60c3d0fbf52cb0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 20 07:32:42 2016 +0100 shell32/tests: Test default verb detection for files as well as for URLs. When Internet Explorer 6 is installer, Windows XP detects non-standard verbs just fine for files but not for URLs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 1255eec..07c3b48 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1016,6 +1016,7 @@ static const char* testfiles[]= "%s\\test_shortcut_exe.lnk", "%s\\test file.shl", "%s\\test file.shlfoo", + "%s\\test file.sha", "%s\\test file.sfe", "%s\\test file.shlproto", "%s\\masked file.shlexec", @@ -1066,6 +1067,8 @@ static filename_tests_t filename_tests[]= {"notaverb", "%s\\test file.shlexec", 0x10, SE_ERR_NOASSOC}, + {"averb", "%s\\test file.sha", 0x10, 33}, + /* Test file masked due to space */ {NULL, "%s\\masked file.shlexec", 0x0, 33}, /* Test if quoting prevents the masking */ @@ -1774,6 +1777,14 @@ static void test_filename(void) sprintf(filename, "%s\\test file.shlexec", tmpdir); okChildPath("argvA4", filename); } + + sprintf(filename, "\"%s\\test file.sha\"", tmpdir); + rc=shell_execute(NULL, filename, NULL, NULL); + todo_wine okShell(rc > 32, "failed: rc=%ld err=%u\n", rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "averb"); + sprintf(filename, "%s\\test file.sha", tmpdir); + todo_wine okChildPath("argvA4", filename); } typedef struct @@ -1940,10 +1951,15 @@ static void test_urls(void) /* Check default verb detection */ rc = shell_execute(NULL, "shlpaverb://foo/bar", NULL, NULL); - todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); - okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "PAVerb"); - todo_wine okChildString("argvA4", "shlpaverb://foo/bar"); + todo_wine ok(rc > 32 || /* XP+IE7 - Win10 */ + broken(rc == SE_ERR_NOASSOC), /* XP+IE6 */ + "%s failed: rc=%lu\n", shell_call, rc); + if (rc > 32) + { + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "PAVerb"); + todo_wine okChildString("argvA4", "shlpaverb://foo/bar"); + } /* But alternative verbs are a recent feature! */ rc = shell_execute("averb", "shlproto://foo/bar", NULL, NULL); @@ -2802,6 +2818,9 @@ static void init_test(void) create_test_verb("shlexec.shlexec", "UpperL", 0, "UpperL %L"); create_test_verb("shlexec.shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + create_test_association(".sha"); + create_test_verb("shlexec.sha", "averb", 0, "AVerb \"%1\""); + create_test_class("shlproto", TRUE); create_test_verb("shlproto", "open", 0, "URL \"%1\""); create_test_verb("shlproto", "averb", 0, "AVerb \"%1\""); @@ -2830,6 +2849,7 @@ static void cleanup_test(void) /* Delete the test association */ delete_test_association(".shlexec"); + delete_test_association(".sha"); delete_test_class("shlproto"); CloseHandle(hEvent);

1 0

Francois Gouget : shell32/tests: Move a file URL test to test_fileurl().
by Alexandre Julliard 21 Mar '16

21 Mar '16

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

Francois Gouget : shell32/tests: Delete the shlproto test class when done.
by Alexandre Julliard 21 Mar '16

21 Mar '16

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

Stefan Dösinger : wined3d: Avoid storing a clip plane pointer in struct wined3d_cs_set_clip_plane.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 11fe733fdc3b13e82c68bcc51042194f64a5d926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fe733fdc3b13e82c68bcc51… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 19 10:35:51 2016 +0100 wined3d: Avoid storing a clip plane pointer in struct wined3d_cs_set_clip_plane. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 965bcff..6809aa2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -236,7 +236,7 @@ struct wined3d_cs_set_clip_plane { enum wined3d_cs_op opcode; UINT plane_idx; - const struct wined3d_vec4 *plane; + struct wined3d_vec4 plane; }; struct wined3d_cs_set_material @@ -876,7 +876,7 @@ static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *da { const struct wined3d_cs_set_clip_plane *op = data; - cs->state.clip_planes[op->plane_idx] = *op->plane; + cs->state.clip_planes[op->plane_idx] = op->plane; device_invalidate_state(cs->device, STATE_CLIPPLANE(op->plane_idx)); } @@ -887,7 +887,7 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; op->plane_idx = plane_idx; - op->plane = plane; + op->plane = *plane; cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in fb_copy_to_texture_hwstretch().
by Alexandre Julliard 21 Mar '16

21 Mar '16

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 fb_copy_to_texture_direct().
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 69f8b3182e35d1aba7fd789383b4ff73f0348714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f8b3182e35d1aba7fd78938… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:49 2016 +0100 wined3d: Get resource info from the texture in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd0b424..71b34e7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2210,7 +2210,9 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win static void fb_copy_to_texture_direct(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; const struct wined3d_gl_info *gl_info; float xrel, yrel; struct wined3d_context *context; @@ -2230,11 +2232,11 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc 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); /* Bind the target texture */ - context_bind_texture(context, dst_surface->container->target, dst_surface->container->texture_rgb.name); - if (wined3d_resource_is_offscreen(&src_surface->container->resource)) + context_bind_texture(context, dst_texture->target, dst_texture->texture_rgb.name); + if (wined3d_resource_is_offscreen(&src_texture->resource)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_prepare_rb().
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 119c17e1735d7d608cdb1a817614aad77fe7ca31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119c17e1735d7d608cdb1a817… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Mar 19 10:35:48 2016 +0100 wined3d: Get resource info from the texture in surface_prepare_rb(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5b9b84b..cd0b424 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2146,6 +2146,9 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct static void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample) { + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; + if (multisample) { DWORD samples; @@ -2162,16 +2165,15 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality levels * as the count of advertised multisample types for the surface format. */ - if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) { - const struct wined3d_format *format = surface->resource.format; unsigned int i, count = 0; for (i = 0; i < sizeof(format->multisample_types) * 8; ++i) { if (format->multisample_types & 1u << i) { - if (surface->resource.multisample_quality == count++) + if (texture->resource.multisample_quality == count++) break; } } @@ -2179,13 +2181,13 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win } else { - samples = surface->resource.multisample_type; + samples = texture->resource.multisample_type; } gl_info->fbo_ops.glGenRenderbuffers(1, &surface->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_multisample); gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, - surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); + format->glInternal, surface->pow2Width, surface->pow2Height); checkGLcall("glRenderbufferStorageMultisample()"); TRACE("Created multisample rb %u.\n", surface->rb_multisample); } @@ -2196,7 +2198,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win gl_info->fbo_ops.glGenRenderbuffers(1, &surface->rb_resolved); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_resolved); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, surface->resource.format->glInternal, + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, format->glInternal, surface->pow2Width, surface->pow2Height); checkGLcall("glRenderbufferStorage()"); TRACE("Created resolved rb %u.\n", surface->rb_resolved);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_fb_texture().
by Alexandre Julliard 21 Mar '16

21 Mar '16

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

← Newer
1
...
28
29
30
31
32
33
34
...
73
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 2016