January 2016 - Wine-Commits

Józef Kucia : wined3d: Recognize SM4 round_z opcode.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: dd4c1ccd9e7a046fe3e3f385d7d7fb5638190489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4c1ccd9e7a046fe3e3f385d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 27 23:43:42 2016 +0100 wined3d: Recognize SM4 round_z opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c65a088..3674cfa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL, + /* WINED3DSIH_ROUND_Z */ NULL, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d27f47b..697f5e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8075,6 +8075,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_PI */ NULL, + /* WINED3DSIH_ROUND_Z */ NULL, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_GRAD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 065bf4a..53f90af 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -129,6 +129,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_ROUND_PI */ "round_pi", + /* WINED3DSIH_ROUND_Z */ "round_z", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 63aca2b..bad6567 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -131,6 +131,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_ROUND_PI = 0x42, + WINED3D_SM4_OP_ROUND_Z = 0x43, WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, @@ -314,6 +315,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_ROUND_PI, WINED3DSIH_ROUND_PI, "F", "F"}, + {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf471b9..78a49dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -557,6 +557,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RET, WINED3DSIH_ROUND_NI, WINED3DSIH_ROUND_PI, + WINED3DSIH_ROUND_Z, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, WINED3DSIH_SAMPLE_GRAD,

1 0

Józef Kucia : wined3d: Implement SM4 ine instruction.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 3b13ba3323c7d78e2ae958d93393aa79ce9b6123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b13ba3323c7d78e2ae958d93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 27 23:43:40 2016 +0100 wined3d: Implement SM4 ine instruction. 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/glsl_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1eb7e6d..e0b150e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2983,6 +2983,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_LT: op = "lessThan"; break; case WINED3DSIH_ILT: op = "lessThan"; break; case WINED3DSIH_NE: op = "notEqual"; break; + case WINED3DSIH_INE: op = "notEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -3004,6 +3005,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_LT: op = "<"; break; case WINED3DSIH_ILT: op = "<"; break; case WINED3DSIH_NE: op = "!="; break; + case WINED3DSIH_INE: op = "!="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -8036,7 +8038,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, - /* WINED3DSIH_INE */ NULL, + /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float,

1 0

Alexandre Julliard : server: Fix initialization of mailslot objects that don't have a name.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: b47bd4555c0d1a37dbd48897e37c67ee0f2ad05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47bd4555c0d1a37dbd48897e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 22:33:12 2016 +0900 server: Fix initialization of mailslot objects that don't have a name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mailslot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/mailslot.c b/server/mailslot.c index 0d93f42..b135fb2 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -403,7 +403,11 @@ static struct mailslot *create_mailslot( struct directory *root, struct mailslot *mailslot; int fds[2]; - if (!name || !name->len) return alloc_object( &mailslot_ops ); + if (!name || !name->len) + { + mailslot = alloc_object( &mailslot_ops ); + goto init; + } if (!(obj = find_object_dir( root, name, attr, &new_name ))) { @@ -435,6 +439,7 @@ static struct mailslot *create_mailslot( struct directory *root, mailslot = create_object( dev->mailslots, &mailslot_ops, &new_name, NULL ); release_object( dev ); +init: if (!mailslot) return NULL; mailslot->fd = NULL;

1 0

Francois Gouget : advapi32/tests: Trace the SIDs if they are not as expected.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 7371c44336b46ecc7eeafbc8368790bb60a18bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371c44336b46ecc7eeafbc83… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jan 24 20:21:31 2016 +0100 advapi32/tests: Trace the SIDs if they are not as expected. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 77 ++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7371c44336b46ecc7eeaf…

1 0

Piotr Caban : oleaut32: Add ICreateTypeLib2::SetCustData implementation.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: aa56d735df2799a381ba236357c68d77b33a006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa56d735df2799a381ba23635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 27 13:04:29 2016 +0100 oleaut32: Add ICreateTypeLib2::SetCustData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index af477d5..517e515 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9984,7 +9984,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) else file.header.NameOffset = -1; - file.header.CustomDataOffset = -1; /* TODO SetCustData not impl yet */ + file.header.CustomDataOffset = WMSFT_compile_custdata(&This->custdata_list, &file); if(This->guid) file.header.posguid = This->guid->offset; @@ -10134,8 +10134,16 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface, REFGUID guid, VARIANT *varVal) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s %p - stub\n", This, debugstr_guid(guid), varVal); - return E_NOTIMPL; + TLBGuid *tlbguid; + + TRACE("%p %s %p\n", This, debugstr_guid(guid), varVal); + + if (!guid || !varVal) + return E_INVALIDARG; + + tlbguid = TLB_append_guid(&This->guid_list, guid, -1); + + return TLB_set_custdata(&This->custdata_list, tlbguid, varVal); } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface,

1 0

Francois Gouget : shell32/tests: Show that verbs and classes override ShellExecute()' s normal handling of executables.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 3079179753005b320b3124d417cb12d8b2d6bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3079179753005b320b3124d41… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 27 15:41:19 2016 +0100 shell32/tests: Show that verbs and classes override ShellExecute()'s normal handling of executables. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a063488..4b721ef 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2196,6 +2196,20 @@ static void test_exes(void) sprintf(filename, "\"%s\" shlexec \"%s\" Exec", argv0, child_file); rc = shell_execute(NULL, filename, NULL, NULL); okShell(rc == SE_ERR_FNF, "returned %lu\n", rc); + + /* A verb, even if invalid, overrides the normal handling of executables */ + todo_wait rc = shell_execute_ex(SEE_MASK_FLAG_NO_UI, + "notaverb", argv0, NULL, NULL, NULL); + todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %lu\n", rc); + + /* A class overrides the normal handling of executables too */ + /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ + rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, + NULL, argv0, NULL, NULL, ".shlexec"); + todo_wine okShell(rc > 32, "returned %lu\n", rc); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + todo_wine okChildPath("argvA4", argv0); } typedef struct

1 0

Nikolay Sivov : dwrite: Don' t use BOOL defined values for fields that are not BOOL.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: 7dd4b9b74b2bfc6cbb12ac5e878b6156b7ded688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4b9b74b2bfc6cbb12ac5e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 04:17:19 2016 +0300 dwrite: Don't use BOOL defined values for fields that are not BOOL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 82e6767..0c3846d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -617,9 +617,9 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->isSoftHyphen = bp.isSoftHyphen; } else { - metrics->isWhitespace = FALSE; - metrics->isNewline = FALSE; - metrics->isSoftHyphen = FALSE; + metrics->isWhitespace = 0; + metrics->isNewline = 0; + metrics->isSoftHyphen = 0; } metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0;

1 0

Nikolay Sivov : dwrite: Inline object origin is at top-left corner, not baseline.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: ef73b788e553ebc3646aa6376fd03d78f68d3051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef73b788e553ebc3646aa6376… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 04:17:18 2016 +0300 dwrite: Inline object origin is at top-left corner, not baseline. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c8ea84b..82e6767 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -196,15 +196,15 @@ struct layout_effective_run { struct layout_effective_inline { struct list entry; - IDWriteInlineObject *object; - IUnknown *effect; - FLOAT origin_x; - FLOAT origin_y; - FLOAT align_dx; - FLOAT width; - BOOL is_sideways; - BOOL is_rtl; - UINT32 line; + const struct layout_run *run; /* nominal run this one is based on */ + IUnknown *effect; /* original reference is kept only at range level */ + FLOAT origin_x; /* left X position */ + FLOAT origin_y; /* left top corner Y position */ + FLOAT align_dx; /* adjustment from text alignment */ + FLOAT width; /* object width as it's reported it */ + BOOL is_sideways; /* vertical flow direction flag passed to Draw */ + BOOL is_rtl; /* bidi flag passed to Draw */ + UINT32 line; /* 0-based line index in line metrics array */ }; struct layout_underline { @@ -1089,7 +1089,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const if (!inlineobject) return E_OUTOFMEMORY; - inlineobject->object = r->u.object.object; + inlineobject->run = r; inlineobject->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); inlineobject->origin_x = is_rtl ? origin_x - inlineobject->width : origin_x; inlineobject->origin_y = 0.0f; /* set after line is built */ @@ -1471,7 +1471,7 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) } while (inrun && inrun->line == line) { - inrun->origin_y = origin_y; + inrun->origin_y = origin_y - inrun->run->baseline; inrun = layout_get_next_inline_run(layout, inrun); } } @@ -1773,7 +1773,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* Same for inline runs */ while (inrun && inrun->line == line) { - inrun->origin_y = origin_y; + inrun->origin_y = origin_y - inrun->run->baseline; inrun = layout_get_next_inline_run(layout, inrun); } @@ -3178,7 +3178,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, context, inlineobject->origin_x + inlineobject->align_dx + origin_x, SNAP_COORD(inlineobject->origin_y + origin_y), - inlineobject->object, + inlineobject->run->u.object.object, inlineobject->is_sideways, inlineobject->is_rtl, inlineobject->effect);

1 0

Nikolay Sivov : dwrite/tests: Some tests for layout based on empty text.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: df68743187c30e76ecb96661964650b4b9b887eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df68743187c30e76ecb966619… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 04:17:16 2016 +0300 dwrite/tests: Some tests for layout based on empty text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 230 +++++++++++++++++++++++++++++++++------------ 1 file changed, 170 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df68743187c30e76ecb96…

1 0

Riccardo Bortolato : d3d9: Replace wined3d surface refcounting with texture refcounting.
by Alexandre Julliard Jan. 28, 2016

Jan. 28, 2016

Module: wine Branch: master Commit: edf003771b157c88cb8b66672b9757092c7ec9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf003771b157c88cb8b66672… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Jan 27 20:44:41 2016 +0100 d3d9: Replace wined3d surface refcounting with texture refcounting. 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 | 5 ++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/surface.c | 9 ++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6e84faf..a0703ab 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -219,7 +219,6 @@ struct d3d9_surface 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; IDirect3DDevice9Ex *parent_device; @@ -229,8 +228,8 @@ 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, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3b1c859..e51cdd5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3618,7 +3618,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, sub_resource_idx, surface, parent_ops); + surface_init(d3d_surface, wined3d_texture, sub_resource_idx, 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 833c1f4..c3032dc 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -71,7 +71,7 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); - wined3d_surface_incref(surface->wined3d_surface); + wined3d_texture_incref(surface->wined3d_texture); wined3d_mutex_unlock(); } @@ -101,7 +101,7 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); - wined3d_surface_decref(surface->wined3d_surface); + wined3d_texture_decref(surface->wined3d_texture); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -357,8 +357,8 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -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) +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; @@ -366,7 +366,6 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_ surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; d3d9_resource_init(&surface->resource); surface->resource.refcount = 0; - surface->wined3d_surface = wined3d_surface; list_init(&surface->rtv_entry); surface->container = wined3d_texture_get_parent(wined3d_texture); surface->wined3d_texture = wined3d_texture;

1 0