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

Vincent Povirk : windowscodecs: Implement Initialize for the TIFF decoder.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 0d285eac802829bc333603801067e6176006dc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d285eac802829bc333603801… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 17 15:44:28 2010 -0500 windowscodecs: Implement Initialize for the TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 139 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1c6b75a..38edf70 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -20,7 +20,9 @@ #include "wine/port.h" #include <stdarg.h> - +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #ifdef HAVE_TIFFIO_H #include <tiffio.h> #endif @@ -54,6 +56,7 @@ static CRITICAL_SECTION init_tiff_cs = { &init_tiff_cs_debug, -1, 0, 0, 0, 0 }; static void *libtiff_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(TIFFClientOpen); +MAKE_FUNCPTR(TIFFClose); #undef MAKE_FUNCPTR static void *load_libtiff(void) @@ -74,6 +77,7 @@ static void *load_libtiff(void) return NULL; \ } LOAD_FUNCPTR(TIFFClientOpen); + LOAD_FUNCPTR(TIFFClose); #undef LOAD_FUNCPTR } @@ -84,9 +88,101 @@ static void *load_libtiff(void) return result; } +static tsize_t tiff_stream_read(thandle_t client_data, tdata_t data, tsize_t size) +{ + IStream *stream = (IStream*)client_data; + ULONG bytes_read; + HRESULT hr; + + hr = IStream_Read(stream, data, size, &bytes_read); + if (FAILED(hr)) bytes_read = 0; + return bytes_read; +} + +static tsize_t tiff_stream_write(thandle_t client_data, tdata_t data, tsize_t size) +{ + IStream *stream = (IStream*)client_data; + ULONG bytes_written; + HRESULT hr; + + hr = IStream_Write(stream, data, size, &bytes_written); + if (FAILED(hr)) bytes_written = 0; + return bytes_written; +} + +static toff_t tiff_stream_seek(thandle_t client_data, toff_t offset, int whence) +{ + IStream *stream = (IStream*)client_data; + LARGE_INTEGER move; + DWORD origin; + ULARGE_INTEGER new_position; + HRESULT hr; + + move.QuadPart = offset; + switch (whence) + { + case SEEK_SET: + origin = STREAM_SEEK_SET; + break; + case SEEK_CUR: + origin = STREAM_SEEK_CUR; + break; + case SEEK_END: + origin = STREAM_SEEK_END; + break; + default: + ERR("unknown whence value %i\n", whence); + return -1; + } + + hr = IStream_Seek(stream, move, origin, &new_position); + if (SUCCEEDED(hr)) return new_position.QuadPart; + else return -1; +} + +static int tiff_stream_close(thandle_t client_data) +{ + /* Caller is responsible for releasing the stream object. */ + return 0; +} + +static toff_t tiff_stream_size(thandle_t client_data) +{ + IStream *stream = (IStream*)client_data; + STATSTG statstg; + HRESULT hr; + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr)) return statstg.cbSize.QuadPart; + else return -1; +} + +static int tiff_stream_map(thandle_t client_data, tdata_t *addr, toff_t *size) +{ + /* Cannot mmap streams */ + return 0; +} + +static void tiff_stream_unmap(thandle_t client_data, tdata_t addr, toff_t size) +{ + /* No need to ever do this, since we can't map things. */ +} + +static TIFF* tiff_open_stream(IStream *stream, const char *mode) +{ + return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, + tiff_stream_write, tiff_stream_seek, tiff_stream_close, + tiff_stream_size, tiff_stream_map, tiff_stream_unmap); +} + typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; LONG ref; + IStream *stream; + CRITICAL_SECTION lock; /* Must be held when tiff is used or initiailzed is set */ + TIFF *tiff; + BOOL initialized; } TiffDecoder; static HRESULT WINAPI TiffDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, @@ -130,6 +226,10 @@ static ULONG WINAPI TiffDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + if (This->tiff) pTIFFClose(This->tiff); + if (This->stream) IStream_Release(This->stream); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This); } @@ -146,8 +246,36 @@ static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStr static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - FIXME("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); - return E_NOTIMPL; + TiffDecoder *This = (TiffDecoder*)iface; + TIFF *tiff; + HRESULT hr=S_OK; + + TRACE("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto exit; + } + + tiff = tiff_open_stream(pIStream, "r"); + + if (!tiff) + { + hr = E_FAIL; + goto exit; + } + + This->tiff = tiff; + This->stream = pIStream; + IStream_AddRef(pIStream); + This->initialized = TRUE; + +exit: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI TiffDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -252,6 +380,11 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &TiffDecoder_Vtbl; This->ref = 1; + This->stream = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TiffDecoder.lock"); + This->tiff = NULL; + This->initialized = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Roderick Colenbrander : wined3d: Remove WGL RGBA float support because it doesn' t make sense without pbuffers.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 8f604afa96088d0302744255c09646c8b59e743f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f604afa96088d0302744255c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 21 19:16:23 2010 +0100 wined3d: Remove WGL RGBA float support because it doesn't make sense without pbuffers. --- dlls/wined3d/directx.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95dcf91..82b2029 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2885,24 +2885,9 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined return FALSE; return TRUE; - } else if(cfg->iPixelType == WGL_TYPE_RGBA_FLOAT_ARB) { /* Float RGBA formats; TODO: WGL_NV_float_buffer */ - if (format_desc->format == WINED3DFMT_R16_FLOAT) - return (cfg->redSize == 16 && cfg->greenSize == 0 && cfg->blueSize == 0 && cfg->alphaSize == 0); - if (format_desc->format == WINED3DFMT_R16G16_FLOAT) - return (cfg->redSize == 16 && cfg->greenSize == 16 && cfg->blueSize == 0 && cfg->alphaSize == 0); - if (format_desc->format == WINED3DFMT_R16G16B16A16_FLOAT) - return (cfg->redSize == 16 && cfg->greenSize == 16 && cfg->blueSize == 16 && cfg->alphaSize == 16); - if (format_desc->format == WINED3DFMT_R32_FLOAT) - return (cfg->redSize == 32 && cfg->greenSize == 0 && cfg->blueSize == 0 && cfg->alphaSize == 0); - if (format_desc->format == WINED3DFMT_R32G32_FLOAT) - return (cfg->redSize == 32 && cfg->greenSize == 32 && cfg->blueSize == 0 && cfg->alphaSize == 0); - if (format_desc->format == WINED3DFMT_R32G32B32A32_FLOAT) - return (cfg->redSize == 32 && cfg->greenSize == 32 && cfg->blueSize == 32 && cfg->alphaSize == 32); - } else { - /* Probably a color index mode */ - return FALSE; } + /* Probably a RGBA_float or color index mode */ return FALSE; }

1 0

Roderick Colenbrander : wined3d: Fix depth blit regression.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 5ffb08897507492ee67443d7a095446750c57857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffb08897507492ee67443d7a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 21 16:42:03 2010 +0100 wined3d: Fix depth blit regression. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 54eb6ec..9850731 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -158,9 +158,9 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, else { rect.left = 0; - rect.top = 0; + rect.top = h; rect.right = w; - rect.bottom = h; + rect.bottom = 0; } switch (target)

1 0

Vincent Povirk : windowscodecs: Add a stub TIFF decoder.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 73cd5693902febfa328571d935752b48d2fd479f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cd5693902febfa328571d93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 8 17:07:29 2010 -0600 windowscodecs: Add a stub TIFF decoder. --- configure | 71 +++++++++ configure.ac | 11 ++ dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 37 +++++ dlls/windowscodecs/tiffformat.c | 270 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + include/config.h.in | 6 + 8 files changed, 398 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73cd5693902febfa32857…

1 0

Roderick Colenbrander : wined3d: Use the format table instead of WGL-checks in CheckDepthStencilMatch when FBOs are used .
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 28a2c7ab292a0d0ad1247d9d11fdbd35b49311d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a2c7ab292a0d0ad1247d9d1… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Mar 21 19:05:38 2010 +0100 wined3d: Use the format table instead of WGL-checks in CheckDepthStencilMatch when FBOs are used. --- dlls/wined3d/directx.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 64542a1..95dcf91 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2965,15 +2965,26 @@ static HRESULT WINAPI IWineD3DImpl_CheckDepthStencilMatch(IWineD3D *iface, UINT adapter = &This->adapters[Adapter]; rt_format_desc = getFormatDescEntry(RenderTargetFormat, &adapter->gl_info); ds_format_desc = getFormatDescEntry(DepthStencilFormat, &adapter->gl_info); - cfgs = adapter->cfgs; - nCfgs = adapter->nCfgs; - for (it = 0; it < nCfgs; ++it) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[it], rt_format_desc)) - { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[it], ds_format_desc)) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if ((rt_format_desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) && + (ds_format_desc->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) { + TRACE_(d3d_caps)("(%p) : Formats matched\n", This); + return WINED3D_OK; + } + } + else + { + cfgs = adapter->cfgs; + nCfgs = adapter->nCfgs; + for (it = 0; it < nCfgs; ++it) { + if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[it], rt_format_desc)) { - TRACE_(d3d_caps)("(%p) : Formats matched\n", This); - return WINED3D_OK; + if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[it], ds_format_desc)) + { + TRACE_(d3d_caps)("(%p) : Formats matched\n", This); + return WINED3D_OK; + } } } } @@ -3200,7 +3211,6 @@ static BOOL CheckDepthStencilCapability(struct wined3d_adapter *adapter, /* Only allow depth/stencil formats */ if (!(ds_format_desc->depth_size || ds_format_desc->stencil_size)) return FALSE; - /* Walk through all WGL pixel formats to find a match */ for (it = 0; it < adapter->nCfgs; ++it) { @@ -3231,7 +3241,6 @@ static BOOL CheckRenderTargetCapability(struct wined3d_adapter *adapter, { /* Filter out non-RT formats */ if (!(check_format_desc->Flags & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; - if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { WineD3D_PixelFormat *cfgs = adapter->cfgs; int it;

1 0

Andrew Nguyen : include: Add prototypes for RtlEncryptMemory and RtlDecryptMemory in ntsecapi.h.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: c62dd29b377b92d032055cc11ad78e3c012beae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62dd29b377b92d032055cc11… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 21 10:31:02 2010 -0500 include: Add prototypes for RtlEncryptMemory and RtlDecryptMemory in ntsecapi.h. --- dlls/advapi32/crypt.c | 4 ++-- include/ntsecapi.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 492d642..bb019d0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2302,7 +2302,7 @@ BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) /****************************************************************************** * SystemFunction040 (ADVAPI32.@) * - * MSDN documents this function as RtlEncryptMemory. + * MSDN documents this function as RtlEncryptMemory and declares it in ntsecapi.h. * * PARAMS * memory [I/O] Pointer to memory to encrypt. @@ -2330,7 +2330,7 @@ NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) /****************************************************************************** * SystemFunction041 (ADVAPI32.@) * - * MSDN documents this function as RtlDecryptMemory. + * MSDN documents this function as RtlDecryptMemory and declares it in ntsecapi.h. * * PARAMS * memory [I/O] Pointer to memory to decrypt. diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 3ce14b3..cafe903 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -337,8 +337,12 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; #define RtlGenRandom SystemFunction036 +#define RtlEncryptMemory SystemFunction040 +#define RtlDecryptMemory SystemFunction041 BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); +NTSTATUS WINAPI RtlEncryptMemory(PVOID,ULONG,ULONG); +NTSTATUS WINAPI RtlDecryptMemory(PVOID,ULONG,ULONG); NTSTATUS WINAPI LsaAddAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING,ULONG); NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*,PULONG,PNTSTATUS);

1 0

Andrew Nguyen : advapi32: Fix SystemFunction036 prototype to match ntsecapi .h.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 890ce5360dd4ef14dcbebfa694d9af34f35e07bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=890ce5360dd4ef14dcbebfa69… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 21 10:30:58 2010 -0500 advapi32: Fix SystemFunction036 prototype to match ntsecapi.h. --- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/tests/crypt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a26770e..492d642 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2274,7 +2274,7 @@ BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) * Failure: FALSE */ -BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) +BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) { int dev_random; diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 12288fd..6cfbbbf 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,7 +64,7 @@ static BOOL (WINAPI *pCryptSetHashParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetKeyParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetProvParam)(HCRYPTPROV, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptVerifySignatureW)(HCRYPTHASH, BYTE*, DWORD, HCRYPTKEY, LPCWSTR, DWORD); -static BOOL (WINAPI *pSystemFunction036)(PVOID, ULONG); +static BOOLEAN (WINAPI *pSystemFunction036)(PVOID, ULONG); static void init_function_pointers(void) {

1 0

Eric Pouech : dbghelp: Properly bail out if get an error while reading ELF header.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: 4c3361e39e636eec51c1651460d2b72c4a139007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3361e39e636eec51c165146… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:48:13 2010 +0100 dbghelp: Properly bail out if get an error while reading ELF header. --- dlls/dbghelp/elf_module.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 573a040..e0fab9c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -272,7 +272,12 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) lseek(fmap->u.elf.fd, fmap->u.elf.elfhdr.e_shoff, SEEK_SET); for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)); + if (read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) + { + HeapFree(GetProcessHeap, 0, fmap->u.elf.sect); + fmap->u.elf.sect = NULL; + goto done; + } fmap->u.elf.sect[i].mapped = IMAGE_NO_MAP; }

1 0

Francois Gouget : qedit: Don't cast NULL.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: e18e1c19fd9b3e1c90f409e596a4e069acd46212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18e1c19fd9b3e1c90f409e59… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:01 2010 +0100 qedit: Don't cast NULL. --- dlls/qedit/samplegrabber.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 1875c51..73b952f 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1264,7 +1264,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes) TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : (const AM_MEDIA_TYPE *)NULL); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); return *mtypes ? S_OK : E_OUTOFMEMORY; }

1 0

Eric Pouech : dbghelp: Removed the not-useful start_data field out of dwarf2_traverse_context_t.
by Alexandre Julliard March 22, 2010

March 22, 2010

Module: wine Branch: master Commit: d822aaff926cd7008864c9a6f76ca1fe3560203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d822aaff926cd7008864c9a6f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:54 2010 +0100 dbghelp: Removed the not-useful start_data field out of dwarf2_traverse_context_t. --- dlls/dbghelp/dwarf.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 199b3bb..2432f89 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -167,7 +167,6 @@ enum dwarf2_sections {section_debug, section_string, section_abbrev, section_lin typedef struct dwarf2_traverse_context_s { const unsigned char* data; - const unsigned char* start_data; const unsigned char* end_data; unsigned char word_size; } dwarf2_traverse_context_t; @@ -1957,12 +1956,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return FALSE; traverse.data = sections[section_line].address + offset; - traverse.start_data = traverse.data; traverse.end_data = traverse.data + 4; traverse.word_size = ctx->word_size; length = dwarf2_parse_u4(&traverse); - traverse.end_data = traverse.start_data + length; + traverse.end_data = sections[section_line].address + offset + length; version = dwarf2_parse_u2(&traverse); header_len = dwarf2_parse_u4(&traverse); @@ -2130,7 +2128,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, BOOL ret = FALSE; cu_length = dwarf2_parse_u4(mod_ctx); - cu_ctx.data = cu_ctx.start_data = mod_ctx->data; + cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; cu_version = dwarf2_parse_u2(&cu_ctx); @@ -2162,8 +2160,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; - abbrev_ctx.start_data = sections[section_abbrev].address + cu_abbrev_offset; - abbrev_ctx.data = abbrev_ctx.start_data; + abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size; abbrev_ctx.word_size = cu_ctx.word_size; dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); @@ -2416,10 +2413,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName)); - mod_ctx.start_data = mod_ctx.data = section[section_debug].address; + mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt)); if (!dwarf2_modfmt) return FALSE; dwarf2_modfmt->module = module;

1 0