February 2010 - Wine-commits

Eric Pouech : winedbg: For x86-64 CPU, fix $rip variable definition.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: e1b677dcd189e8e4cab8f53b8abc30cf00e272e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b677dcd189e8e4cab8f53b8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:14 2010 +0100 winedbg: For x86-64 CPU, fix $rip variable definition. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 1ef52b8..cc23c95 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -133,7 +133,7 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_GS, "GS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegGs), dbg_itype_unsigned_short_int}, {CV_AMD64_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, {CV_AMD64_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, - {CV_AMD64_RIP, "RIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_int}, + {CV_AMD64_RIP, "RIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_long_int}, {CV_AMD64_RAX, "RAX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_long_int}, {CV_AMD64_RBX, "RBX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_long_int}, {CV_AMD64_RCX, "RCX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_long_int}, @@ -150,7 +150,7 @@ static struct dbg_internal_var be_x86_64_ctx[] = {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, - {0, NULL, 0, dbg_itype_none} + {0, NULL, 0, dbg_itype_none} }; static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx)

1 0

Eric Pouech : winedbg: Add disassembly capacity to x86-64 backend.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 7f1105e6567f46440871ff09ee8b45f99db1b2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1105e6567f46440871ff09e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:19 2010 +0100 winedbg: Add disassembly capacity to x86-64 backend. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_x86_64.c | 5 +- programs/winedbg/db_disasm64.c | 1569 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1571 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f1105e6567f46440871f…

1 0

Eric Pouech : winedbg: Fix 32bit displacement sign extension.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 4b8b07834444d700146bfc74c02ae4f546a8da26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b8b07834444d700146bfc74c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:28 2010 +0100 winedbg: Fix 32bit displacement sign extension. --- programs/winedbg/db_disasm64.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index a11ad1f..cb1a174 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -1205,6 +1205,7 @@ db_disasm(db_addr_t loc, boolean_t altfmt) long imm64; int len; struct i_addr address; + db_addr_t addr; get_value_inc(inst, loc, 1, FALSE); short_addr = FALSE; @@ -1528,19 +1529,19 @@ db_disasm(db_addr_t loc, boolean_t altfmt) case Db: get_value_inc(displ, loc, 1, TRUE); - displ += loc; + addr = loc + (LONG64)displ; if (size == WORD) - displ &= 0xFFFF; - db_printsym((db_addr_t)displ, DB_STGY_XTRN); + addr &= 0xFFFF; + db_printsym(addr, DB_STGY_XTRN); break; case Dl: len = db_lengths[(size == LONG && (rex & REX_W)) ? QUAD : size]; get_value_inc(displ, loc, len, FALSE); - displ += loc; + addr = loc + (LONG64)displ; if (size == WORD) - displ &= 0xFFFF; - db_printsym((db_addr_t)displ, DB_STGY_XTRN); + addr &= 0xFFFF; + db_printsym(addr, DB_STGY_XTRN); break; case o1:

1 0

Eric Pouech : winedbg: Added some more instructions disassembly.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 7c9cd44965c55ea4df13584d32cde1376ad761af URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9cd44965c55ea4df13584d3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:34 2010 +0100 winedbg: Added some more instructions disassembly. --- programs/winedbg/db_disasm64.c | 83 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index cb1a174..7cb3475 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -155,6 +155,11 @@ static void db_printsym(db_addr_t addr, unsigned unused) #define Ril 36 /* long register in instruction */ #define Iba 37 /* byte immediate, don't print if 0xa */ #define EL 38 /* address, explicitly long size */ +/* Wine extensions */ +#define MX 39 /* special register (MMX reg %mm0-7) */ +#define EMX 40 /* special register (MMX reg %mm0-7) */ +#define XMM 41 /* special register (floating point reg %xmm0-7) */ +#define EXMM 42 /* special register (floating point reg %xmm0-7) */ struct inst { const char * i_name; /* name */ @@ -322,6 +327,66 @@ static const struct inst db_inst_0f4x[] = { /*4f*/ { "cmovnle",TRUE, NONE, op2(E, R), 0 }, }; +static const struct inst db_inst_0f5x[] = { +/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +}; + +static const struct inst db_inst_0f6x[] = { +/*60*/ { "punpcklbw", TRUE, NONE, op2(E, MX), 0 }, +/*61*/ { "punpcklwd", TRUE, NONE, op2(E, MX), 0 }, +/*62*/ { "punpckldq", TRUE, NONE, op2(E, MX), 0 }, +/*63*/ { "packsswb", TRUE, NONE, op2(E, MX), 0 }, +/*64*/ { "pcmpgtb", TRUE, NONE, op2(E, MX), 0 }, +/*65*/ { "pcmpgtw", TRUE, NONE, op2(E, MX), 0 }, +/*66*/ { "pcmpgtd", TRUE, NONE, op2(E, MX), 0 }, +/*67*/ { "packuswb", TRUE, NONE, op2(E, MX), 0 }, + +/*68*/ { "punpckhbw", TRUE, NONE, op2(E, MX), 0 }, +/*69*/ { "punpckhwd", TRUE, NONE, op2(E, MX), 0 }, +/*6a*/ { "punpckhdq", TRUE, NONE, op2(E, MX), 0 }, +/*6b*/ { "packssdw", TRUE, NONE, op2(E, MX), 0 }, +/*6c*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*6d*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*6e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, +/*6f*/ { "movq", TRUE, NONE, op2(E, MX), 0 }, +}; + +static const struct inst db_inst_0f7x[] = { +/*70*/ { "pshufw", TRUE, NONE, op2(MX, EMX), 0 }, +/*71*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 12 */ +/*72*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 13 */ +/*73*/ { "(bad)", TRUE, NONE, 0, 0 }, /* FIXME: grp 14 */ +/*74*/ { "pcmpeqb", TRUE, NONE, op2(E, MX), 0 }, +/*75*/ { "pcmpeqw", TRUE, NONE, op2(E, MX), 0 }, +/*76*/ { "pcmpeqd", TRUE, NONE, op2(E, MX), 0 }, +/*77*/ { "emms", FALSE,NONE, 0, 0 }, + +/*78*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*79*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7a*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7b*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7c*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7d*/ { "(bad)", TRUE, NONE, 0, 0 }, +/*7e*/ { "movd", TRUE, NONE, op2(E, MX), 0 }, +/*7f*/ { "movq", TRUE, NONE, op2(EMX, MX), 0 }, +}; + static const struct inst db_inst_0f8x[] = { /*80*/ { "jo", FALSE, NONE, op1(Dl), 0 }, /*81*/ { "jno", FALSE, NONE, op1(Dl), 0 }, @@ -427,9 +492,9 @@ static const struct inst * const db_inst_0f[] = { db_inst_0f2x, db_inst_0f3x, db_inst_0f4x, - 0, - 0, - 0, + db_inst_0f5x, + db_inst_0f6x, + db_inst_0f7x, db_inst_0f8x, db_inst_0f9x, db_inst_0fax, @@ -1558,6 +1623,18 @@ db_disasm(db_addr_t loc, boolean_t altfmt) get_value_inc(imm2, loc, 2, FALSE); /* segment */ db_printf("$%#x,%#x", imm2, imm); break; + case MX: + db_printf("%%mm%d", f_reg(rex, regmodrm)); + break; + case EMX: + db_printf("%%mm%d", f_rm(rex, regmodrm)); + break; + case XMM: + db_printf("%%xmm%d", f_reg(rex, regmodrm)); + break; + case EXMM: + db_printf("%%xmm%d", f_rm(rex, regmodrm)); + break; } } return (loc);

1 0

Eric Pouech : winedbg: Implement float fetching for x86-64 debugger.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 7d3a9c6ffd5d57e869741c2a14d2e7c762904bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3a9c6ffd5d57e869741c2a1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:40 2010 +0100 winedbg: Implement float fetching for x86-64 debugger. --- programs/winedbg/be_i386.c | 2 +- programs/winedbg/be_x86_64.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index e805a80..6ab5970 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -726,7 +726,7 @@ static int be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - char tmp[12]; + char tmp[sizeof(long double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 3a111af..42cdcab 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -364,11 +364,25 @@ static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned siz return TRUE; } -static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, +static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("not done fetch_float\n"); - return FALSE; + char tmp[sizeof(long double)]; + + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (!memory_read_value(lvalue, size, tmp)) return FALSE; + + /* float & double types have to be promoted to a long double */ + switch (size) + { + case sizeof(float): *ret = *(float*)tmp; break; + case sizeof(double): *ret = *(double*)tmp; break; + case sizeof(long double): *ret = *(long double*)tmp; break; + default: return FALSE; + } + return TRUE; } struct backend_cpu be_x86_64 =

1 0

Eric Pouech : winedbg: Implemented is_function_return method for x86-64 CPU .
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 6979ea7d5bb62921f1817388c1d203bce045dca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6979ea7d5bb62921f1817388c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:46 2010 +0100 winedbg: Implemented is_function_return method for x86-64 CPU. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 42cdcab..e2cdc12 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -170,8 +170,8 @@ static unsigned be_x86_64_is_step_over_insn(const void* insn) static unsigned be_x86_64_is_function_return(const void* insn) { - dbg_printf("not done is_function_return\n"); - return FALSE; + BYTE c; + return dbg_read_memory(insn, &c, sizeof(c)) && ((c == 0xC2) || (c == 0xC3)); } static unsigned be_x86_64_is_break_insn(const void* insn)

1 0

Eric Pouech : winedbg: Implemented is_break_insn for x86-64 CPUs.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 9ed8d56ed2dc24b33c654a0db8489af8bac16787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed8d56ed2dc24b33c654a0db… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:51 2010 +0100 winedbg: Implemented is_break_insn for x86-64 CPUs. --- programs/winedbg/be_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index e2cdc12..4cc5162 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -176,8 +176,8 @@ static unsigned be_x86_64_is_function_return(const void* insn) static unsigned be_x86_64_is_break_insn(const void* insn) { - dbg_printf("not done is_break_insn\n"); - return FALSE; + BYTE c; + return dbg_read_memory(insn, &c, sizeof(c)) && c == 0xCC; } static unsigned be_x86_64_is_func_call(const void* insn, ADDRESS64* callee)

1 0

Eric Pouech : winedbg: Implemented is_step_over method for x86-64 CPU.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 4f4e38ce40b9590d828ba1a326b9cd59da000e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4e38ce40b9590d828ba1a32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 3 21:47:57 2010 +0100 winedbg: Implemented is_step_over method for x86-64 CPU. --- programs/winedbg/be_x86_64.c | 57 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 4cc5162..a0e5637 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -164,8 +164,61 @@ static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) static unsigned be_x86_64_is_step_over_insn(const void* insn) { - dbg_printf("not done step_over_insn\n"); - return FALSE; + BYTE ch; + + for (;;) + { + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + + switch (ch) + { + /* Skip all prefixes */ + case 0x2e: /* cs: */ + case 0x36: /* ss: */ + case 0x3e: /* ds: */ + case 0x26: /* es: */ + case 0x64: /* fs: */ + case 0x65: /* gs: */ + case 0x66: /* opcode size prefix */ + case 0x67: /* addr size prefix */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + insn = (const char*)insn + 1; + continue; + + /* Handle call instructions */ + case 0xcd: /* int <intno> */ + case 0xe8: /* call <offset> */ + case 0x9a: /* lcall <seg>:<off> */ + return TRUE; + + case 0xff: /* call <regmodrm> */ + if (!dbg_read_memory((const char*)insn + 1, &ch, sizeof(ch))) + return FALSE; + return (((ch & 0x38) == 0x10) || ((ch & 0x38) == 0x18)); + + /* Handle string instructions */ + case 0x6c: /* insb */ + case 0x6d: /* insw */ + case 0x6e: /* outsb */ + case 0x6f: /* outsw */ + case 0xa4: /* movsb */ + case 0xa5: /* movsw */ + case 0xa6: /* cmpsb */ + case 0xa7: /* cmpsw */ + case 0xaa: /* stosb */ + case 0xab: /* stosw */ + case 0xac: /* lodsb */ + case 0xad: /* lodsw */ + case 0xae: /* scasb */ + case 0xaf: /* scasw */ + return TRUE; + + default: + return FALSE; + } + } } static unsigned be_x86_64_is_function_return(const void* insn)

1 0

André Hentschel : msi: Copy InstallerImpl_LastErrorRecord to use it for DatabaseImpl.
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: 06e15ee9e60e424be86c8c36ad3b4cd4d408e732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e15ee9e60e424be86c8c36a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 3 18:09:20 2010 +0100 msi: Copy InstallerImpl_LastErrorRecord to use it for DatabaseImpl. --- dlls/msi/automation.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 5305f9c..f935a64 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1138,6 +1138,21 @@ static HRESULT WINAPI ViewImpl_Invoke( return S_OK; } +static HRESULT DatabaseImpl_LastErrorRecord(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + static HRESULT WINAPI DatabaseImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1208,6 +1223,11 @@ static HRESULT WINAPI DatabaseImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_LASTERRORRECORD: + return DatabaseImpl_LastErrorRecord(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); + default: return DISP_E_MEMBERNOTFOUND; }

1 0

Henri Verbeet : wined3d: Never acquire a context in IWineD3DSurfaceImpl_BindTexture().
by Alexandre Julliard 04 Feb '10

04 Feb '10

Module: wine Branch: master Commit: b0583a241007931f4d0dcd03cf33a04e044490d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0583a241007931f4d0dcd03c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 18:17:56 2010 +0100 wined3d: Never acquire a context in IWineD3DSurfaceImpl_BindTexture(). The caller is already responsible for doing this, so it's redundant at best. --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2bc08b8..612979a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2700,7 +2700,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) { /* TODO: check for locks */ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.device; IWineD3DBaseTexture *baseTexture = NULL; TRACE("(%p)Checking to see if the container is a base texture\n", This); @@ -2711,13 +2710,11 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL } else { - struct wined3d_context *context = NULL; GLuint *name; TRACE("(%p) : Binding surface\n", This); name = srgb ? &This->texture_name_srgb : &This->texture_name; - if (!device->isInDraw) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); @@ -2751,8 +2748,6 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL checkGLcall("glBindTexture"); LEAVE_GL(); - - if (context) context_release(context); } }

1 0