August 2010 - Wine-Commits - list.winehq.org

Francois Gouget : shell32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 87591917cef89aa21419877ea1f4c19122116ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87591917cef89aa21419877ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:24 2010 +0200 shell32/tests: Add a trailing '\n' to an ok() call. --- dlls/shell32/tests/ebrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index e98ced6..6f50b0a 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -962,7 +962,7 @@ static void test_Advise(void) ok(ebev.ref == 0, "Got %d\n", ebev.ref); ref = IExplorerBrowser_Release(peb); - ok(!ref, "Got %d", ref); + ok(!ref, "Got %d\n", ref); } /* Based on PathAddBackslashW from dlls/shlwapi/path.c */

1 0

Austin English : winedbg: Initial Sparc support.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 06c9afbb553630c147cc40c0d98c87ef93464c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c9afbb553630c147cc40c0d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 25 15:15:46 2010 -0500 winedbg: Initial Sparc support. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/be_sparc.c | 158 ++++++++++++++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 35 +++++++++ programs/winedbg/winedbg.c | 4 + 4 files changed, 198 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 6fad9d7..a4f40ae 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ be_alpha.c \ be_i386.c \ be_ppc.c \ + be_sparc.c \ be_x86_64.c \ break.c \ crashdlg.c \ diff --git a/programs/winedbg/be_sparc.c b/programs/winedbg/be_sparc.c new file mode 100644 index 0000000..45ba44e --- /dev/null +++ b/programs/winedbg/be_sparc.c @@ -0,0 +1,158 @@ +/* + * Debugger Sparc specific functions + * + * Copyright 2010 Austin English + * + * 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 + */ + +#include "debugger.h" + +#if defined(__sparc__) + +static unsigned be_sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum be_cpu_addr bca, ADDRESS64* addr) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static unsigned be_sparc_get_register_info(int regno, enum be_cpu_addr* kind) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static void be_sparc_single_step(CONTEXT* ctx, unsigned enable) +{ + dbg_printf("not done for Sparc\n"); +} + +static void be_sparc_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) +{ + dbg_printf("not done for Sparc\n"); +} + +static void be_sparc_print_segment_info(HANDLE hThread, const CONTEXT* ctx) +{ + dbg_printf("not done for Sparc\n"); +} + +static struct dbg_internal_var be_sparc_ctx[] = +{ + {0, NULL, 0, dbg_itype_none} +}; + +static unsigned be_sparc_is_step_over_insn(const void* insn) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static unsigned be_sparc_is_function_return(const void* insn) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static unsigned be_sparc_is_break_insn(const void* insn) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static unsigned be_sparc_is_func_call(const void* insn, ADDRESS64* callee) +{ + return FALSE; +} + +static void be_sparc_disasm_one_insn(ADDRESS64* addr, int display) +{ + dbg_printf("not done for Sparc\n"); +} + +static unsigned be_sparc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long* val, unsigned size) +{ + dbg_printf("not done for Sparc\n"); + return 0; +} + +static unsigned be_sparc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long val, unsigned size) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static unsigned be_sparc_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static void be_sparc_clear_watchpoint(CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done for Sparc\n"); +} + +static int be_sparc_adjust_pc_for_break(CONTEXT* ctx, BOOL way) +{ + dbg_printf("not done for Sparc\n"); + return 0; +} + +static int be_sparc_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, + unsigned ext_sign, LONGLONG* ret) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +static int be_sparc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, + long double* ret) +{ + dbg_printf("not done for Sparc\n"); + return FALSE; +} + +struct backend_cpu be_sparc = +{ + IMAGE_FILE_MACHINE_SPARC, + 4, + be_cpu_linearize, + be_cpu_build_addr, + be_sparc_get_addr, + be_sparc_get_register_info, + be_sparc_single_step, + be_sparc_print_context, + be_sparc_print_segment_info, + be_sparc_ctx, + be_sparc_is_step_over_insn, + be_sparc_is_function_return, + be_sparc_is_break_insn, + be_sparc_is_func_call, + be_sparc_disasm_one_insn, + be_sparc_insert_Xpoint, + be_sparc_remove_Xpoint, + be_sparc_is_watchpoint_set, + be_sparc_clear_watchpoint, + be_sparc_adjust_pc_for_break, + be_sparc_fetch_integer, + be_sparc_fetch_float, +}; +#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3d8ccd5..885ff86 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -391,6 +391,41 @@ static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, SegFs), FIELD_OFFSET(CONTEXT, SegGs), }; +#elif defined(__sparc__) +static size_t cpu_register_map[] = { + FIELD_OFFSET(CONTEXT, g0), + FIELD_OFFSET(CONTEXT, g1), + FIELD_OFFSET(CONTEXT, g2), + FIELD_OFFSET(CONTEXT, g3), + FIELD_OFFSET(CONTEXT, g4), + FIELD_OFFSET(CONTEXT, g5), + FIELD_OFFSET(CONTEXT, g6), + FIELD_OFFSET(CONTEXT, g7), + FIELD_OFFSET(CONTEXT, o0), + FIELD_OFFSET(CONTEXT, o1), + FIELD_OFFSET(CONTEXT, o2), + FIELD_OFFSET(CONTEXT, o3), + FIELD_OFFSET(CONTEXT, o4), + FIELD_OFFSET(CONTEXT, o5), + FIELD_OFFSET(CONTEXT, o6), + FIELD_OFFSET(CONTEXT, o7), + FIELD_OFFSET(CONTEXT, l0), + FIELD_OFFSET(CONTEXT, l1), + FIELD_OFFSET(CONTEXT, l2), + FIELD_OFFSET(CONTEXT, l3), + FIELD_OFFSET(CONTEXT, l4), + FIELD_OFFSET(CONTEXT, l5), + FIELD_OFFSET(CONTEXT, l6), + FIELD_OFFSET(CONTEXT, l7), + FIELD_OFFSET(CONTEXT, i0), + FIELD_OFFSET(CONTEXT, i1), + FIELD_OFFSET(CONTEXT, i2), + FIELD_OFFSET(CONTEXT, i3), + FIELD_OFFSET(CONTEXT, i4), + FIELD_OFFSET(CONTEXT, i5), + FIELD_OFFSET(CONTEXT, i6), + FIELD_OFFSET(CONTEXT, i7), +}; #else # error Define the registers map for your CPU #endif diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 3e64506..aeef795 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -612,6 +612,8 @@ extern struct backend_cpu be_ppc; extern struct backend_cpu be_alpha; #elif defined(__x86_64__) extern struct backend_cpu be_x86_64; +#elif defined(__sparc__) +extern struct backend_cpu be_sparc; #else # error CPU unknown #endif @@ -630,6 +632,8 @@ int main(int argc, char** argv) be_cpu = &be_alpha; #elif defined(__x86_64__) be_cpu = &be_x86_64; +#elif defined(__sparc__) + be_cpu = &be_sparc; #else # error CPU unknown #endif

1 0

Eric Pouech : winedbg: Don't access inside a bp structure if it' s not initialized.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: aebb9dd316a9c899a70136ae5deb68b244cd9936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebb9dd316a9c899a70136ae5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Aug 25 21:43:52 2010 +0200 winedbg: Don't access inside a bp structure if it's not initialized. Spotted by Peter Urbanec. --- programs/winedbg/break.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index b1cef6a..2f502ce 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -510,11 +510,13 @@ void break_delete_xpoints_from_module(DWORD64 base) for (i = 0; i < dbg_curr_process->next_bp; i++) { - linear = (DWORD_PTR)memory_to_linear_addr(&bp[i].addr); - if (bp[i].refcount && bp[i].enabled && - im.BaseOfImage <= linear && linear < im.BaseOfImage + im.ImageSize) + if (bp[i].refcount && bp[i].enabled) { - break_delete_xpoint(i); + linear = (DWORD_PTR)memory_to_linear_addr(&bp[i].addr); + if (im.BaseOfImage <= linear && linear < im.BaseOfImage + im.ImageSize) + { + break_delete_xpoint(i); + } } } }

1 0

Francois Gouget : d3dx9_36: Make {is,make}_pow2() static.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 2f8f70bca77a5b03d662392c1816362484031a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8f70bca77a5b03d662392c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:01:09 2010 +0200 d3dx9_36: Make {is,make}_pow2() static. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8992399..8895a8f 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /* Returns TRUE if num is a power of 2, FALSE if not, or if 0 */ -BOOL is_pow2(UINT num) +static BOOL is_pow2(UINT num) { return !(num & (num - 1)); } /* Returns the smallest power of 2 which is greater than or equal to num */ -UINT make_pow2(UINT num) +static UINT make_pow2(UINT num) { UINT result = 1;

1 0

Henri Verbeet : d3dx9_36/tests: Avoid a redundant vertex declaration copy in test_decl_to_fvf().
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 1bfd89986ce2398208ee0d19423bd15dc8547bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfd89986ce2398208ee0d194… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:53 2010 +0200 d3dx9_36/tests: Avoid a redundant vertex declaration copy in test_decl_to_fvf(). --- dlls/d3dx9_36/tests/mesh.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4cdd56b..bf756dd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -429,20 +429,6 @@ static inline void print_elements(const D3DVERTEXELEMENT9 *elements) } } -static inline void copy_elements(D3DVERTEXELEMENT9 *decl, const D3DVERTEXELEMENT9 *elements) -{ - unsigned int i; - D3DVERTEXELEMENT9 last = D3DDECL_END(); - int end1; - - for (i = 0; i < MAX_FVF_DECL_SIZE; i++) - { - memcpy(&decl[i], &elements[i], sizeof(D3DVERTEXELEMENT9)); - end1 = memcmp(&elements[i], &last, sizeof(D3DVERTEXELEMENT9)); - if (!end1) break; - } -} - static void compare_elements(const D3DVERTEXELEMENT9 *elements, const D3DVERTEXELEMENT9 *expected_elements, unsigned int line) { @@ -482,14 +468,11 @@ static void test_fvf_to_decl(DWORD test_fvf, const D3DVERTEXELEMENT9 expected_el if (SUCCEEDED(hr)) { compare_elements(decl, expected_elements, line); } } -static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected_fvf, HRESULT expected_hr, +static void test_decl_to_fvf(const D3DVERTEXELEMENT9 *decl, DWORD expected_fvf, HRESULT expected_hr, BOOL todo, unsigned int line) { HRESULT hr; DWORD result_fvf = 0xdeadbeef; - D3DVERTEXELEMENT9 decl[MAX_FVF_DECL_SIZE]; - - copy_elements(decl, test_decl); hr = D3DXFVFFromDeclarator(decl, &result_fvf); if (todo) todo_wine ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n",

1 0

Henri Verbeet : d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 5ed9403c74abd403b992a4a605f06b719a1a50ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed9403c74abd403b992a4a60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:52 2010 +0200 d3dx9_36: Fix the D3DXFVFFromDeclarator() prototype. The current version matches MSDN, but not the actual SDK header. --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- include/d3dx9mesh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 788c449..cc22107 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -203,7 +203,7 @@ HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD fvf, D3DVERTEXELEMENT9 Declaration[MA /************************************************************************* * D3DXFVFFromDeclarator */ -HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *declaration, DWORD *fvf) +HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *declaration, DWORD *fvf) { FIXME("(%p, %p): stub\n", declaration, fvf); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 8d0f227..4cdd56b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -491,7 +491,7 @@ static void test_decl_to_fvf(const D3DVERTEXELEMENT9 test_decl[], DWORD expected copy_elements(decl, test_decl); - hr = D3DXFVFFromDeclarator((D3DVERTEXELEMENT9 **)&decl, &result_fvf); + hr = D3DXFVFFromDeclarator(decl, &result_fvf); if (todo) todo_wine ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n", hr, expected_hr, line); else ok(hr == expected_hr, "D3DXFVFFromDeclarator returned %#x, expected %#x, line #%u\n", diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index ff215b7..bc3dd81 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -159,7 +159,7 @@ BOOL WINAPI D3DXSphereBoundProbe(CONST D3DXVECTOR3 *,FLOAT,CONST D3DXVECTOR3 HRESULT WINAPI D3DXComputeBoundingBox(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, D3DXVECTOR3 *); HRESULT WINAPI D3DXComputeBoundingSphere(CONST D3DXVECTOR3 *, DWORD, DWORD, D3DXVECTOR3 *, FLOAT *); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); -HRESULT WINAPI D3DXFVFFromDeclarator(const LPD3DVERTEXELEMENT9 *, DWORD *); +HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); #ifdef __cplusplus

1 0

Henri Verbeet : wined3d: Rename the "format" field in wined3d_format_desc to "id".
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: b233e7b301ff524c9dfabaf60fc27d070d873b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b233e7b301ff524c9dfabaf60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:51 2010 +0200 wined3d: Rename the "format" field in wined3d_format_desc to "id". --- dlls/wined3d/buffer.c | 8 +++--- dlls/wined3d/context.c | 18 +++++++------- dlls/wined3d/cubetexture.c | 4 +- dlls/wined3d/device.c | 18 +++++++------- dlls/wined3d/directx.c | 21 ++++++++------- dlls/wined3d/drawprim.c | 14 +++++----- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 53 ++++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 23 +++++++++-------- dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 10 ++++---- dlls/wined3d/utils.c | 52 ++++++++++++++++++++------------------- dlls/wined3d/volume.c | 5 ++- dlls/wined3d/wined3d_private.h | 5 ++- 15 files changed, 124 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b233e7b301ff524c9dfab…

1 0

Henri Verbeet : wined3d: Remove the GetContainer() methods from the public wined3d interface.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 42b814c7d1e0ae27a1d4b18413a295b4b5989201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b814c7d1e0ae27a1d4b1841… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:50 2010 +0200 wined3d: Remove the GetContainer() methods from the public wined3d interface. There's nothing left that uses these. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 18 ------------------ dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/volume.c | 24 ++---------------------- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.idl | 8 -------- 6 files changed, 2 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 93559a1..2be3706 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4719,7 +4719,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DBaseSurfaceImpl_GetContainer, IWineD3DBaseSurfaceImpl_GetDesc, IWineD3DSurfaceImpl_LockRect, IWineD3DSurfaceImpl_UnlockRect, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 6c19218..64c5a28 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -148,24 +148,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknow IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID riid, void** ppContainer) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DBase *container = 0; - - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - } - - /* Standalone surfaces return the device as container. */ - if (This->container.u.base) container = This->container.u.base; - else container = (IWineD3DBase *)This->resource.device; - - TRACE("Relaying to QueryInterface\n"); - return IUnknown_QueryInterface(container, riid, ppContainer); -} - HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index bd1b775..68e36ee 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -503,7 +503,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ - IWineD3DBaseSurfaceImpl_GetContainer, IWineD3DBaseSurfaceImpl_GetDesc, IWineGDISurfaceImpl_LockRect, IWineGDISurfaceImpl_UnlockRect, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index eeb9361..349c7ec 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -184,27 +184,8 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa /* ******************************************* IWineD3DVolume parts follow ******************************************* */ -static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID riid, void** ppContainer) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); - - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - return E_FAIL; - } - - /* Although surfaces can be standalone, volumes can't */ - if (!This->container) { - ERR("Volume without an container. Should not happen.\n"); - return E_FAIL; - } - - TRACE("Relaying to QueryInterface\n"); - return IUnknown_QueryInterface((IWineD3DVolumeTexture *)This->container, riid, ppContainer); -} - -static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) { +static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc) +{ IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); @@ -349,7 +330,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_UnLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ - IWineD3DVolumeImpl_GetContainer, IWineD3DVolumeImpl_GetDesc, IWineD3DVolumeImpl_LockBox, IWineD3DVolumeImpl_UnlockBox, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84415d6..22fb79b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2124,8 +2124,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, - REFIID riid, void **ppContainer) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ee3f364..b6e73ec 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2384,10 +2384,6 @@ interface IWineD3DClipper : IWineD3DBase ] interface IWineD3DSurface : IWineD3DResource { - HRESULT GetContainer( - [in] REFIID riid, - [out] void **container - ); HRESULT GetDesc( [out] WINED3DSURFACE_DESC *desc ); @@ -2501,10 +2497,6 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - HRESULT GetContainer( - [in] REFIID riid, - [out] void **container - ); HRESULT GetDesc( [out] WINED3DVOLUME_DESC *desc );

1 0

Henri Verbeet : wined3d: Don' t set a NULL container of type WINED3D_CONTAINER_TEXTURE.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 22428d97e18e76ba76c10df945cf956ab1897101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22428d97e18e76ba76c10df94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 25 20:46:49 2010 +0200 wined3d: Don't set a NULL container of type WINED3D_CONTAINER_TEXTURE. Any container type other than WINED3D_CONTAINER_NONE implies a valid pointer of the specified type. This fixes a regression introduced by 368e5eb87ae983e4ea2f66b3ca2f4154b36bbcda. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 963d132..c3d0976 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5663,7 +5663,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl); if (swapchain->back_buffers[0]) - surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_TEXTURE, NULL); + surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_NONE, NULL); swapchain->back_buffers[0] = back_impl; if (back_impl) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 662ef7b..93559a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -96,6 +96,9 @@ void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_ { TRACE("surface %p, container %p.\n", surface, container); + if (!container && type != WINED3D_CONTAINER_NONE) + ERR("Setting NULL container of type %#x.\n", type); + if (type == WINED3D_CONTAINER_SWAPCHAIN) { surface->get_drawable_size = get_drawable_size_swapchain;

1 0

Eric Pouech : dbghelp: dwarf debug info: a few more fixes to dwarf parsing.
by Alexandre Julliard Aug. 26, 2010

Aug. 26, 2010

Module: wine Branch: master Commit: 1e0af22ad2ed5a0dc9bf7f39814b00b223ce453f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0af22ad2ed5a0dc9bf7f398… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Aug 25 21:43:46 2010 +0200 dbghelp: dwarf debug info: a few more fixes to dwarf parsing. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 16 ++++++++++++++++ programs/winedbg/memory.c | 5 ++++- 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index f4c88a0..531a740 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -132,6 +132,7 @@ enum location_error {loc_err_internal = -1, /* internal while computing */ loc_err_too_complex = -2, /* couldn't compute location (even at runtime) */ loc_err_out_of_scope = -3, /* variable isn't available at current address */ loc_err_cant_read = -4, /* couldn't read memory at given address */ + loc_err_no_location = -5, /* likely optimized away (by compiler) */ }; struct location diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a0fcc12..d67c72a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1511,6 +1511,22 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->compiland, name.u.string, param_type, &v)->symt; } + else + { + /* variable has been optimiezd away... report anyway */ + loc.kind = loc_error; + loc.reg = loc_err_no_location; + if (subpgm->func) + { + symt_add_func_local(subpgm->ctx->module, subpgm->func, + is_pmt ? DataIsParam : DataIsLocal, + &loc, block, param_type, name.u.string); + } + else + { + WARN("dropping global variable %s which has been optimized away\n", name.u.string); + } + } if (is_pmt && subpgm->func && subpgm->func->type) symt_add_function_signature_parameter(subpgm->ctx->module, (struct symt_function_signature*)subpgm->func->type, diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 7d6112a..1c8388c 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -676,7 +676,7 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) const struct dbg_internal_var* div; /* negative register values are wine's dbghelp hacks - * see dlls/dbghelp/dbghelp_internal.h for the details + * see dlls/dbghelp/dbghelp_private.h for the details */ switch (regno) { @@ -692,6 +692,9 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) case -4: if (buffer) snprintf(buffer, len, "<couldn't read memory>"); return FALSE; + case -5: + if (buffer) snprintf(buffer, len, "<has been optimized away by compiler>"); + return FALSE; } for (div = be_cpu->context_vars; div->name; div++)

1 0