June 2012 - Wine-commits - list.winehq.org

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1f6d078e1bb866f2bff35d98e255e6568b8a2304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6d078e1bb866f2bff35d98e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:21 2012 +0200 Assorted spelling fixes. --- dlls/d3dcompiler_43/hlsl.y | 2 +- dlls/d3drm/tests/d3drm.c | 4 ++-- dlls/shell32/dde.c | 4 ++-- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5691848..c9aa94c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -71,7 +71,7 @@ hlsl_prog: /* empty */ preproc_directive: PRE_LINE STRING { - TRACE("Updating line informations to file %s, line %u\n", debugstr_a($2), $1); + TRACE("Updating line information to file %s, line %u\n", debugstr_a($2), $1); hlsl_ctx.line_no = $1 - 1; d3dcompiler_free(hlsl_ctx.source_file); hlsl_ctx.source_file = $2; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 69aff86..0cc9c83 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -214,7 +214,7 @@ static void test_MeshBuilder(void) size = sizeof(name); hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); - ok(!strcmp(name, "Object"), "Retreived name '%s' instead of 'Object'\n", name); + ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name); size = strlen("Object"); /* No space for null character */ hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); @@ -229,7 +229,7 @@ static void test_MeshBuilder(void) size = sizeof(name); hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); - ok(!strcmp(name, ""), "Retreived name '%s' instead of ''\n", name); + ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name); val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 144470b..c44f05d 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -86,8 +86,8 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, { static BYTE groups_data[] = "\r\n"; FIXME( "returning empty groups list\n" ); - /* this is an workaround for an app wich expect some data - * and cant handle NULL. */ + /* This is a workaround for an application which expects some data + * and cannot handle NULL. */ return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); } FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index b90fdfa..3f9e57c 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -519,7 +519,7 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, BOOL bMustExist, WIN32_FIN FileStructW *pFileStructW; WORD uOffsetW, *pOffsetW; - TRACE("(pszUnixPath=%s, bMustExsist=%s, pFindData=%p, pIDL=%p)\n", + TRACE("(pszUnixPath=%s, bMustExist=%s, pFindData=%p, pIDL=%p)\n", debugstr_a(pszUnixPath), bMustExist ? "T" : "F", pFindData, pIDL); if (pFindData) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 9b94d7a..46ce23e 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -488,7 +488,7 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) /* according to QA1469 a movie has to be fully loaded before we can reliably start the Extraction session. - If loaded earlier then we only get an extraction session for + If loaded earlier, then we only get an extraction session for the part of the movie that is loaded at that time. We are trying to load as much of the movie as we can before we

1 0

André Hentschel : ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate.
by Alexandre Julliard 04 Jun '12

04 Jun '12

Module: wine Branch: master Commit: 1013d2e75c33d1c990e01d3fc9b03a3c1c6578e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013d2e75c33d1c990e01d3fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 2 18:53:57 2012 +0200 ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate. --- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/nt.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 65c8b8f..a048e1d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -486,7 +486,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) } #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <fstab.h> static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { @@ -587,7 +587,7 @@ static char *get_default_drive_device( const char *root ) } RtlLeaveCriticalSection( &dir_section ); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) || defined(__DragonFly__) char *device = NULL; int fd, res = -1; struct stat st; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 8e48602..e54b42a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2267,7 +2267,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, unsigned int flags ) @@ -2388,7 +2388,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) struct statfs stfs; if (fstatfs( fd, &stfs ) < 0) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3ed8038..b90672b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1159,7 +1159,7 @@ void fill_cpu_info(void) fclose(f); } } -#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) { int ret, num; size_t len; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3b07e77..4a83a70 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -420,7 +420,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ -#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */ TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */ TRAP_x86_NMI = T_NMI, /* NMI interrupt */

1 0

Henri Verbeet : ddraw/tests: Split up test_initialize().
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: d61d842630d75c00611ce4d32cfdc2d77c14cc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61d842630d75c00611ce4d32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:48 2012 +0200 ddraw/tests: Split up test_initialize(). --- dlls/ddraw/tests/d3d.c | 130 --------------------------------------------- dlls/ddraw/tests/ddraw1.c | 45 ++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 27 +++++++++ dlls/ddraw/tests/ddraw4.c | 27 +++++++++ dlls/ddraw/tests/ddraw7.c | 27 +++++++++ 5 files changed, 126 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d61d842630d75c00611ce…

1 0

Henri Verbeet : ddraw/tests: Split up test_coop_level_surf_create().
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 34c9586b603df3a34bf40ff290c91e762a887897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c9586b603df3a34bf40ff29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:49 2012 +0200 ddraw/tests: Split up test_coop_level_surf_create(). --- dlls/ddraw/tests/d3d.c | 76 --------------------------------------------- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw4.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw7.c | 24 ++++++++++++++ 5 files changed, 96 insertions(+), 76 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f0ec3cb..24700f6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3626,80 +3626,6 @@ static void z_format_test(void) ok(count, "Expected at least one supported Z Buffer format\n"); } -static void test_coop_level_surf_create(void) -{ - IDirectDrawSurface7 *surface7; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface *surface1; - IDirectDraw7 *ddraw7; - IDirectDraw4 *ddraw4; - IDirectDraw2 *ddraw2; - IDirectDraw *ddraw1; - DDSURFACEDESC2 ddsd2; - DDSURFACEDESC ddsd; - HRESULT hr; - - /* IDirectDraw */ - if (FAILED(hr = DirectDrawCreate(NULL, &ddraw1, NULL))) - { - skip("Failed to create IDirectDraw object (%#x), skipping tests.\n", hr); - return; - } - - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(ddraw1, &ddsd, &surface1, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - /* IDirectDraw2 */ - if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2))) - { - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw2_CreateSurface(ddraw2, &ddsd, &surface1, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw2_Release(ddraw2); - } - else skip("Failed to query IDirectDraw2 interface, skipping tests.\n"); - - /* IDirectDraw4 */ - if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw4, (void **)&ddraw4))) - { - memset(&ddsd2, 0, sizeof(ddsd2)); - ddsd2.dwSize = sizeof(ddsd2); - ddsd2.dwFlags = DDSD_CAPS; - ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw4_CreateSurface(ddraw4, &ddsd2, &surface4, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw4_Release(ddraw4); - } - else skip("Failed to query IDirectDraw4 interface, skipping tests.\n"); - - IDirectDraw_Release(ddraw1); - - /* IDirectDraw7 */ - if (FAILED(hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL))) - { - skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); - return; - } - - memset(&ddsd2, 0, sizeof(ddsd2)); - ddsd2.dwSize = sizeof(ddsd2); - ddsd2.dwFlags = DDSD_CAPS; - ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw7_CreateSurface(ddraw7, &ddsd2, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw7_Release(ddraw7); -} - static void test_get_caps1(void) { D3DDEVICEDESC hw_caps, hel_caps; @@ -4053,6 +3979,4 @@ START_TEST(d3d) test_get_caps1(); D3D1_releaseObjects(); } - - test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a3b71c3..fb8b0be 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2414,6 +2414,29 @@ static void test_initialize(void) } } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + DDSURFACEDESC ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -2432,4 +2455,5 @@ START_TEST(ddraw1) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 0b4e536..c6641ae 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2533,6 +2533,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + DDSURFACEDESC ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -2553,4 +2576,5 @@ START_TEST(ddraw2) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f505653..0bf0eea 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2648,6 +2648,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface4 *surface; + IDirectDraw4 *ddraw; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2669,4 +2692,5 @@ START_TEST(ddraw4) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6faa46c..4152f6b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2457,6 +2457,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface7 *surface; + IDirectDraw7 *ddraw; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2485,4 +2508,5 @@ START_TEST(ddraw7) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); }

1 0

Henri Verbeet : d3dx9: Use wine_dbgstr_rect() in some more places.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 176d27e88993d353fddf82312a31e95b5cbd5c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176d27e88993d353fddf82312… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:50 2012 +0200 d3dx9: Use wine_dbgstr_rect() in some more places. --- dlls/d3dx9_36/font.c | 23 +++--- dlls/d3dx9_36/sprite.c | 7 +- dlls/d3dx9_36/surface.c | 214 ++++++++++++++++++++++------------------------- 3 files changed, 116 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=176d27e88993d353fddf8…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DStateBlock9Impl.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 79d62ca1fb9cbee24368fc831ca70ced22588588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d62ca1fb9cbee24368fc831… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:51 2012 +0200 d3d9: Get rid of IDirect3DStateBlock9Impl. --- dlls/d3d9/d3d9_private.h | 24 ++++--------- dlls/d3d9/device.c | 4 +- dlls/d3d9/stateblock.c | 87 ++++++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5e44f43..0105010 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -245,25 +245,15 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; -/* ----------------------- */ -/* IDirect3DStateBlock9 */ -/* ----------------------- */ - -/***************************************************************************** - * IDirect3DStateBlock9 implementation structure - */ -typedef struct IDirect3DStateBlock9Impl { - IDirect3DStateBlock9 IDirect3DStateBlock9_iface; - LONG ref; - - /* IDirect3DStateBlock9 fields */ +struct d3d9_stateblock +{ + IDirect3DStateBlock9 IDirect3DStateBlock9_iface; + LONG refcount; struct wined3d_stateblock *wined3d_stateblock; + IDirect3DDevice9Ex *parent_device; +}; - /* Parent reference */ - IDirect3DDevice9Ex *parentDevice; -} IDirect3DStateBlock9Impl; - -HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device *device, +HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *device, D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) DECLSPEC_HIDDEN; /* --------------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 93b00f8..d17887f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1525,7 +1525,7 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, D3DSTATEBLOCKTYPE type, IDirect3DStateBlock9 **stateblock) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DStateBlock9Impl *object; + struct d3d9_stateblock *object; HRESULT hr; TRACE("iface %p, type %#x, stateblock %p.\n", iface, type, stateblock); @@ -1575,7 +1575,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_stateblock *wined3d_stateblock; - IDirect3DStateBlock9Impl *object; + struct d3d9_stateblock *object; HRESULT hr; TRACE("iface %p, stateblock %p.\n", iface, stateblock); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8e08684..8ec8db9 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -25,67 +25,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) +static inline struct d3d9_stateblock *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DStateBlock9Impl, IDirect3DStateBlock9_iface); + return CONTAINING_RECORD(iface, struct d3d9_stateblock, IDirect3DStateBlock9_iface); } -static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, - REFIID riid, void **ppobj) +static HRESULT WINAPI d3d9_stateblock_QueryInterface(IDirect3DStateBlock9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DStateBlock9_AddRef(iface); - *ppobj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *ppobj = NULL; + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(IDirect3DStateBlock9 *iface) +static ULONG WINAPI d3d9_stateblock_AddRef(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + ULONG refcount = InterlockedIncrement(&stateblock->refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DStateBlock9Impl_Release(IDirect3DStateBlock9 *iface) +static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + ULONG refcount = InterlockedDecrement(&stateblock->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) { + if (!refcount) + { wined3d_mutex_lock(); - wined3d_stateblock_decref(This->wined3d_stateblock); + wined3d_stateblock_decref(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This); + IDirect3DDevice9Ex_Release(stateblock->parent_device); + HeapFree(GetProcessHeap(), 0, stateblock); } - return ref; + + return refcount; } -/* IDirect3DStateBlock9 Interface follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDirect3DDevice9 **device) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)This->parentDevice; + *device = (IDirect3DDevice9 *)stateblock->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -93,54 +92,54 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(IDirect3DStateBlock9 *iface) +static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_capture(This->wined3d_stateblock); + hr = wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(IDirect3DStateBlock9 *iface) +static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_apply(This->wined3d_stateblock); + hr = wined3d_stateblock_apply(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); return hr; } -static const IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = +static const struct IDirect3DStateBlock9Vtbl d3d9_stateblock_vtbl = { /* IUnknown */ - IDirect3DStateBlock9Impl_QueryInterface, - IDirect3DStateBlock9Impl_AddRef, - IDirect3DStateBlock9Impl_Release, + d3d9_stateblock_QueryInterface, + d3d9_stateblock_AddRef, + d3d9_stateblock_Release, /* IDirect3DStateBlock9 */ - IDirect3DStateBlock9Impl_GetDevice, - IDirect3DStateBlock9Impl_Capture, - IDirect3DStateBlock9Impl_Apply + d3d9_stateblock_GetDevice, + d3d9_stateblock_Capture, + d3d9_stateblock_Apply, }; -HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device *device, +HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *device, D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) { HRESULT hr; - stateblock->IDirect3DStateBlock9_iface.lpVtbl = &Direct3DStateBlock9_Vtbl; - stateblock->ref = 1; + stateblock->IDirect3DStateBlock9_iface.lpVtbl = &d3d9_stateblock_vtbl; + stateblock->refcount = 1; if (wined3d_stateblock) { @@ -159,8 +158,8 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device } } - stateblock->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(stateblock->parentDevice); + stateblock->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(stateblock->parent_device); return D3D_OK; }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexDeclaration9Impl.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: bdd42942c0157cf0f01ba02fea482bc90dae97d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd42942c0157cf0f01ba02fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:52 2012 +0200 d3d9: Get rid of IDirect3DVertexDeclaration9Impl. --- dlls/d3d9/d3d9_private.h | 36 +++++----------- dlls/d3d9/device.c | 22 +++++----- dlls/d3d9/vertexdeclaration.c | 90 ++++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdd42942c0157cf0f01ba…

1 0

Christian Costa : d3drm: Handle material list in mesh.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 84f2e0e9ac30fbd2ca2bf9ea3ebca24789908490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f2e0e9ac30fbd2ca2bf9ea3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:50 2012 +0200 d3drm: Handle material list in mesh. --- dlls/d3drm/meshbuilder.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 22aec7e..146450c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -74,6 +74,7 @@ typedef struct { LPVOID pFaceData; DWORD nb_coords2d; Coords2d* pCoords2d; + IDirect3DRMMaterial2* material; } IDirect3DRMMeshBuilderImpl; char templates[] = { @@ -361,6 +362,8 @@ static ULONG WINAPI IDirect3DRMMeshBuilder2Impl_Release(IDirect3DRMMeshBuilder2* if (!ref) { + if (This->material) + IDirect3DRMMaterial2_Release(This->material); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->pVertices); HeapFree(GetProcessHeap(), 0, This->pNormals); @@ -1202,7 +1205,87 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) } else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { - FIXME("MeshMaterialList not supported yet, ignoring...\n"); + DWORD nb_materials; + DWORD nb_face_indices; + DWORD data_size; + LPDIRECTXFILEOBJECT child; + DWORD i = 0; + float* values; + + TRACE("Process MeshMaterialList\n"); + + hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + goto end; + + nb_materials = *(DWORD*)ptr; + nb_face_indices = *(DWORD*)(ptr + sizeof(DWORD)); + data_size = 2 * sizeof(DWORD) + nb_face_indices * sizeof(DWORD); + + TRACE("nMaterials = %u, nFaceIndexes = %u\n", nb_materials, nb_face_indices); + + if (size != data_size) + WARN("Returned size %u does not match expected one %u\n", size, data_size); + + if (nb_materials > 2) + { + FIXME("Only one material per mesh supported, first one applies to all faces\n"); + nb_materials = 1; + } + + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(pData2, &child)) && (i < nb_materials)) + { + LPDIRECTXFILEDATA data; + LPDIRECTXFILEDATAREFERENCE reference; + LPDIRECT3DRMMATERIAL2 material; + + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (FAILED(hr)) + { + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (FAILED(hr)) + goto end; + + hr = IDirectXFileDataReference_Resolve(reference, &data); + IDirectXFileDataReference_Release(reference); + if (FAILED(hr)) + goto end; + } + + hr = Direct3DRMMaterial_create(&material); + if (FAILED(hr)) + { + IDirectXFileData_Release(data); + goto end; + } + + hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&ptr); + if (hr != DXFILE_OK) + { + IDirectXFileData_Release(data); + goto end; + } + + if (size != 44) + WARN("Material size %u does not match expected one %u\n", size, 44); + + values = (float*)ptr; + + IDirect3DRMMaterial2_SetAmbient(material, values[0], values [1], values[2]); /* Alpha ignored */ + IDirect3DRMMaterial2_SetPower(material, values[4]); + IDirect3DRMMaterial2_SetSpecular(material, values[5], values[6], values[7]); + IDirect3DRMMaterial2_SetEmissive(material, values[8], values[9], values[10]); + + This->material = material; + + IDirectXFileData_Release(data); + i++; + } + if (hr == S_OK) + WARN("Found more sub-objects than expected\n"); + else if (hr != DXFILEERR_NOMOREOBJECTS) + goto end; + hr = S_OK; } else {

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh .
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 38ba9bacd0adff172c1dd7a63647d32d40bcd1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ba9bacd0adff172c1dd7a63… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:58 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh. --- dlls/d3drm/meshbuilder.c | 19 ++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 146450c..3a6890c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2011,6 +2011,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = E_OUTOFMEMORY; } } + if (SUCCEEDED(hr)) + hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); } @@ -2652,13 +2654,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupQuality(IDirect3DRMMesh* iface } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL value) + D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL material) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, value); + TRACE("(%p)->(%u,%p)\n", This, id, material); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (This->groups[id].material) + IDirect3DRMMaterial2_Release(This->groups[id].material); + + This->groups[id].material = (LPDIRECT3DRMMATERIAL2)material; + + if (material) + IDirect3DRMMaterial2_AddRef(This->groups[id].material); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d35802..69aff86 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -372,7 +372,7 @@ static void test_MeshBuilder(void) ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); - todo_wine ok(material != NULL, "No material present\n"); + ok(material != NULL, "No material present\n"); if ((hr == D3DRM_OK) && material) { hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);

1 0

Eric Pouech : dbghelp: Use build-id information to locate debug information (and prefer it over . debug_link when both are present).
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: d647bd108c5fa5350887b66353b8d2305f1d38b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d647bd108c5fa5350887b6635… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu May 31 21:41:23 2012 +0200 dbghelp: Use build-id information to locate debug information (and prefer it over .debug_link when both are present). --- dlls/dbghelp/elf_module.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 132 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e18c9ef..80352bc 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -890,25 +890,140 @@ found: } /****************************************************************** - * elf_debuglink_parse + * elf_locate_build_id_target * - * Parses a .gnu_debuglink section and loads the debug info from - * the external file specified there. + * Try to find the .so file containing the debug info out of the build-id note information */ -static BOOL elf_debuglink_parse(struct image_file_map* fmap, const struct module* module, - const BYTE* debuglink) +static BOOL elf_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { - /* The content of a debug link section is: - * 1/ a NULL terminated string, containing the file name for the - * debug info - * 2/ padding on 4 byte boundary - * 3/ CRC of the linked ELF file - */ - const char* dbg_link = (const char*)debuglink; - DWORD crc; + static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; + static const WCHAR buildidW[] = {'.','b','u','i','l','d','-','i','d','/'}; + static const WCHAR dotDebug0W[] = {'.','d','e','b','u','g',0}; + struct image_file_map* fmap_link = NULL; + WCHAR* p; + WCHAR* z; + const BYTE* idend = id + idlen; + struct elf_map_file_data emfd; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = HeapAlloc(GetProcessHeap(), 0, + sizeof(globalDebugDirW) + sizeof(buildidW) + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(dotDebug0W)); + z = p; + memcpy(z, globalDebugDirW, sizeof(globalDebugDirW)); + z += sizeof(globalDebugDirW) / sizeof(WCHAR); + memcpy(z, buildidW, sizeof(buildidW)); + z += sizeof(buildidW) / sizeof(WCHAR); + + if (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + if (id < idend) + *z++ = '/'; + while (id < idend) + { + *z++ = "0123456789abcdef"[*id >> 4 ]; + *z++ = "0123456789abcdef"[*id & 0x0F]; + id++; + } + memcpy(z, dotDebug0W, sizeof(dotDebug0W)); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + emfd.kind = from_file; + emfd.u.file.filename = p; + if (elf_map_file(&emfd, fmap_link)) + { + struct image_section_map buildid_sect; + if (elf_find_section(fmap_link, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; - crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - return elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + if (note[1] == idlen && + !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) + { + TRACE("Located debug information file at %s\n", debugstr_w(p)); + HeapFree(GetProcessHeap(), 0, p); + fmap->u.elf.alternate = fmap_link; + return TRUE; + } + WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(p)); + } + } + image_unmap_section(&buildid_sect); + } + elf_unmap_file(fmap_link); + } + + TRACE("not found\n"); + HeapFree(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + +/****************************************************************** + * elf_check_alternate + * + * Load alternate files for a given ELF file, looking at either .note.gnu_build-id + * or .gnu_debuglink sections. + */ +static BOOL elf_check_alternate(struct image_file_map* fmap, const struct module* module) +{ + BOOL ret = FALSE; + BOOL found = FALSE; + struct image_section_map buildid_sect, debuglink_sect; + + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (elf_find_section(fmap, ".note.gnu.build-id", SHT_NULL, &buildid_sect)) + { + const uint32_t* note; + + found = TRUE; + note = (const uint32_t*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NT_GNU_BUILD_ID) + { + ret = elf_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); + } + } + image_unmap_section(&buildid_sect); + } + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (!ret && elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + { + const char* dbg_link; + + found = TRUE; + dbg_link = (const char*)image_map_section(&debuglink_sect); + if (dbg_link != IMAGE_NO_MAP) + { + /* The content of a debug link section is: + * 1/ a NULL terminated string, containing the file name for the + * debug info + * 2/ padding on 4 byte boundary + * 3/ CRC of the linked ELF file + */ + DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + ret = elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); + if (!ret) + WARN("Couldn't load linked debug file for %s\n", + debugstr_w(module->module.ModuleName)); + } + image_unmap_section(&debuglink_sect); + } + return found ? ret : TRUE; } /****************************************************************** @@ -949,24 +1064,10 @@ static BOOL elf_load_debug_info_from_map(struct module* module, if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) { struct image_section_map stab_sect, stabstr_sect; - struct image_section_map debuglink_sect; - /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) - { - const BYTE* dbg_link; + /* check if we need an alternate file (from debuglink or build-id) */ + ret = elf_check_alternate(fmap, module); - dbg_link = (const BYTE*)image_map_section(&debuglink_sect); - if (dbg_link != IMAGE_NO_MAP) - { - lret = elf_debuglink_parse(fmap, module, dbg_link); - if (!lret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->module.ModuleName)); - ret = ret || lret; - } - image_unmap_section(&debuglink_sect); - } if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) {

1 0