May 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: More filesource fixes.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: c4cdfdac35928cb4a6ad867078f01a9d2398092a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cdfdac35928cb4a6ad86707… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 14:27:51 2008 -0700 quartz: More filesource fixes. After a flush call there should be no more samples in the buffer. --- dlls/quartz/filesource.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 1ac37b0..f410b56 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1166,7 +1166,8 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (buffer >= This->samples) { - FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); + if (buffer != This->samples) + FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); hr = VFW_E_TIMEOUT; buffer = ~0; } @@ -1188,7 +1189,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dw if (buffer == This->samples) { assert(!This->queued_number); - hr = E_FAIL; + hr = VFW_E_TIMEOUT; } else { @@ -1342,12 +1343,16 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) { FileAsyncReader *This = impl_from_IAsyncReader(iface); + int x; TRACE("()\n"); EnterCriticalSection(&This->csList); ResetEvent(This->handle_list[This->samples]); This->bFlushing = FALSE; + for (x = 0; x < This->samples; ++x) + assert(!This->sample_list[x].pSample); + LeaveCriticalSection(&This->csList); return S_OK;

1 0

James Hawkins : urlmon: Fix a test that fails in win2k3.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: edacd984ef0d0d5d70dda7cd3a4d98f6b5522dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edacd984ef0d0d5d70dda7cd3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu May 1 01:33:07 2008 -0500 urlmon: Fix a test that fails in win2k3. --- dlls/urlmon/tests/misc.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 96612b0..208dff8 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -721,6 +721,8 @@ static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r 3,0,0,0}; static const BYTE secid10[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; +static const BYTE secid10_2[] = + {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e','.','j','p','g',3,0,0,0}; static struct secmgr_test { LPCWSTR url; @@ -733,7 +735,6 @@ static struct secmgr_test { {url1, 0, S_OK, sizeof(secid1), secid1, S_OK}, {url2, 100, 0x80041001, 0, NULL, E_INVALIDARG}, {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, - {url10,3, S_OK, sizeof(secid10),secid10,S_OK}, {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} @@ -781,6 +782,23 @@ static void test_SecurityManager(void) } zone = 100; + hres = IInternetSecurityManager_MapUrlToZone(secmgr, url10, &zone, 0); + ok(hres == S_OK, "MapUrlToZone failed: %08x, expected S_OK\n", hres); + ok(zone == 3, "zone=%d, expected 3\n", zone); + + /* win2k3 translates %20 into a space */ + size = sizeof(buf); + memset(buf, 0xf0, sizeof(buf)); + hres = IInternetSecurityManager_GetSecurityId(secmgr, url10, buf, &size, 0); + ok(hres == S_OK, "GetSecurityId failed: %08x, expected S_OK\n", hres); + ok(size == sizeof(secid10) || + size == sizeof(secid10_2), /* win2k3 */ + "size=%d, expected %d or %d\n", size, sizeof(secid10), sizeof(secid10_2)); + ok(!memcmp(buf, secid10, size) || + !memcmp(buf, secid10_2, size), /* win2k3 */ + "wrong secid\n"); + + zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0); ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08x, expected E_INVALIDARG\n", hres); ok(zone == 100 || zone == -1, "zone=%d\n", zone);

1 0

Maarten Lankhorst : Revert "quartz: Handle failures better in acmwrapper.".
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 4afc2ae9511a45f995cf6a9246ec57dd2a185e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afc2ae9511a45f995cf6a924… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 30 10:33:07 2008 -0700 Revert "quartz: Handle failures better in acmwrapper.". This reverts commit 1ba8ece76e1b87f43270edb1324c31b818e8162e. Code for holding sample doesn't make sense and shouldn't be there because it should really be handled by keeping track of the last successful position of a frame sent and aborting the whole processing as soon as rejection occurs. --- dlls/quartz/acmwrapper.c | 94 +++++++--------------------------------------- 1 files changed, 14 insertions(+), 80 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 92d0298..60b8fd1 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -48,9 +48,6 @@ typedef struct ACMWrapperImpl LPWAVEFORMATEX pWfIn; LPWAVEFORMATEX pWfOut; - IMediaSample *recv, *xmit; - ULONG done; - LONGLONG lasttime_real; LONGLONG lasttime_sent; } ACMWrapperImpl; @@ -69,61 +66,32 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte HRESULT hr; LONGLONG tStart = -1, tStop = -1, tMed; - assert(pSample); - - if (This->xmit) - { - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], This->xmit); - if (hr != S_OK) - return hr; - IMediaSample_Release(This->xmit); - This->xmit = NULL; - } - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); return hr; } - cbSrcStream = IMediaSample_GetActualDataLength(pSample); - preroll = (IMediaSample_IsPreroll(pSample) == S_OK); - if (pSample != This->recv) - { - if (This->recv) - { - /* Get rid of buffered sample first */ - hr = ACMWrapper_ProcessSampleData(pTransformFilter, This->recv); - if (hr != S_OK) - return hr; - if (This->recv) - return S_FALSE; - } + preroll = (IMediaSample_IsPreroll(pSample) == S_OK); - IMediaSample_GetTime(pSample, &tStart, &tStop); + IMediaSample_GetTime(pSample, &tStart, &tStop); + cbSrcStream = IMediaSample_GetActualDataLength(pSample); - /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ - if (IMediaSample_IsDiscontinuity(pSample) == S_OK) - { - This->lasttime_real = tStart; - This->lasttime_sent = tStart; - } - else if (This->lasttime_real == tStart) - tStart = This->lasttime_sent; - else - WARN("Discontinuity\n"); - } - else + /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ + if (IMediaSample_IsDiscontinuity(pSample) == S_OK) { - tStart = This->lasttime_sent; - tStop = This->lasttime_real; - cbSrcStream -= This->done; - pbSrcStream += This->done; + This->lasttime_real = tStart; + This->lasttime_sent = tStart; } + else if (This->lasttime_real == tStart) + tStart = This->lasttime_sent; + else + WARN("Discontinuity\n"); + tMed = tStart; - TRACE("Sample data ptr = %p, size = %u\n", pbSrcStream, cbSrcStream); + TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { @@ -233,44 +201,17 @@ error: ash.pbSrc += ash.cbSrcLengthUsed; ash.cbSrcLength -= ash.cbSrcLengthUsed; - if (hr == S_FALSE) - { - This->xmit = pOutSample; - if (ash.cbSrcLength && !This->recv) - { - This->recv = pSample; - IMediaSample_AddRef(This->recv); - } - else if (This->recv) - { - IMediaSample_Release(This->recv); - This->recv = NULL; - } - - This->done = IMediaSample_GetActualDataLength(pSample) - ash.cbSrcLength; - break; - } - if (pOutSample) IMediaSample_Release(pOutSample); pOutSample = NULL; + } This->lasttime_real = tStop; This->lasttime_sent = tMed; - if (hr != S_OK) FIXME("FATALITY: %08x\n", hr); - else if (This->recv) - { - assert(This->recv == pSample); - IMediaSample_Release(This->recv); - This->recv = NULL; - } - - if (hr == S_FALSE) - return S_OK; return hr; } @@ -336,13 +277,7 @@ static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter) This->has = 0; This->lasttime_real = This->lasttime_sent = -1; - if (This->recv) - IMediaSample_Release(This->recv); - - if (This->xmit) - IMediaSample_Release(This->xmit); - This->recv = This->xmit = NULL; return S_OK; } @@ -378,7 +313,6 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) *ppv = (LPVOID)This; This->lasttime_real = This->lasttime_sent = -1; - This->recv = This->xmit = NULL; return hr; }

1 0

James Hawkins : user32: Fix a test that fails in win2k3.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 5f2536841456a9b72d8ad6c6a91cf9d9f665ddba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2536841456a9b72d8ad6c6a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu May 1 01:31:25 2008 -0500 user32: Fix a test that fails in win2k3. --- dlls/user32/tests/sysparams.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 7623a67..8e95ffd 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -727,9 +727,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ * do it twice to make the intended change). So skip parts of the tests on * those platforms */ if( !iswin9x) { - test_setborder(1, 1, dpi); - test_setborder(0, 1, dpi); + /* win2k3 fails if you set the same border twice, or if size is 0 */ test_setborder(2, 1, dpi); + test_setborder(1, 1, dpi); + test_setborder(3, 1, dpi); } test_setborder(1, 0, dpi); test_setborder(0, 0, dpi);

1 0

Rob Shearman : advapi32: Make sure not to return a credential with a NULL UserName field when a Mac Keychain doesn 't have an account name attribute.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: d245e7978dc5761ebdf6ec5e8df77182d0aa5f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d245e7978dc5761ebdf6ec5e8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 30 22:05:17 2008 +0100 advapi32: Make sure not to return a credential with a NULL UserName field when a Mac Keychain doesn't have an account name attribute. --- dlls/advapi32/cred.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 44de697..50a27c0 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -250,6 +250,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require void *cred_blob; LPWSTR domain = NULL; LPWSTR user = NULL; + BOOL user_name_present = FALSE; SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; UInt32 info_tags[] = { kSecServerItemAttr, kSecSecurityDomainItemAttr, kSecAccountItemAttr, @@ -269,6 +270,19 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); return ERROR_NOT_FOUND; } + + for (i = 0; i < attr_list->count; i++) + if (attr_list->attr[i].tag == kSecAccountItemAttr && attr_list->attr[i].data) + { + user_name_present = TRUE; + break; + } + if (!user_name_present) + { + WARN("no kSecAccountItemAttr for item\n"); + return ERROR_NOT_FOUND; + } + if (buffer) { credential->Flags = 0;

1 0

James Hawkins : gdi32: Remove a dependency on the amount of available memory.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: c17bb019f49ee7aee867b67f95df928a031cb0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17bb019f49ee7aee867b67f9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu May 1 01:29:24 2008 -0500 gdi32: Remove a dependency on the amount of available memory. --- dlls/gdi32/tests/bitmap.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 27a6c88..2ef2891 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -982,10 +982,14 @@ static void test_bitmap(void) SetLastError(0xdeadbeef); hbmp = CreateBitmap(0x7ffffff, 9, 1, 1, NULL); - ok(!hbmp, "CreateBitmap should fail\n"); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY /* XP */ || - GetLastError() == ERROR_INVALID_PARAMETER /* Win2k */, - "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + if (!hbmp) + { + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY /* XP */ || + GetLastError() == ERROR_INVALID_PARAMETER /* Win2k */, + "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + } + else + DeleteObject(hbmp); SetLastError(0xdeadbeef); hbmp = CreateBitmap(0x7ffffff + 1, 1, 1, 1, NULL);

1 0

Eric Pouech : dbghelp: Some cleanup in dwarf include files.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 99c27e7da487afb76472c1a5714d46bc8ca33729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c27e7da487afb76472c1a57… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:27:49 2008 +0200 dbghelp: Some cleanup in dwarf include files. --- dlls/dbghelp/dwarf.c | 67 ++++++++++++++++++++++++-------------------------- dlls/dbghelp/dwarf.h | 28 --------------------- 2 files changed, 32 insertions(+), 63 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8965f7f..ec4c351 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1982,29 +1982,40 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, } static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, - const dwarf2_comp_unit_t* comp_unit, struct module* module, const struct elf_thunk_area* thunks, - const unsigned char* comp_unit_cursor, + dwarf2_traverse_context_t* mod_ctx, unsigned long load_offset) { dwarf2_parse_context_t ctx; - dwarf2_traverse_context_t traverse; dwarf2_traverse_context_t abbrev_ctx; dwarf2_debug_info_t* di; + dwarf2_traverse_context_t cu_ctx; + const unsigned char* comp_unit_start = mod_ctx->data; + unsigned long cu_length; + unsigned short cu_version; + unsigned long cu_abbrev_offset; BOOL ret = FALSE; + cu_length = dwarf2_parse_u4(mod_ctx); + cu_ctx.data = cu_ctx.start_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); + cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); + cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); + TRACE("Compilation Unit Header found at 0x%x:\n", - comp_unit_cursor - sections[section_debug].address); - TRACE("- length: %lu\n", comp_unit->length); - TRACE("- version: %u\n", comp_unit->version); - TRACE("- abbrev_offset: %lu\n", comp_unit->abbrev_offset); - TRACE("- word_size: %u\n", comp_unit->word_size); + comp_unit_start - sections[section_debug].address); + TRACE("- length: %lu\n", cu_length); + TRACE("- version: %u\n", cu_version); + TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); + TRACE("- word_size: %u\n", cu_ctx.word_size); - if (comp_unit->version != 2) + if (cu_version != 2) { WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - comp_unit->version); + cu_version); return FALSE; } @@ -2012,26 +2023,21 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.sections = sections; ctx.section = section_debug; ctx.module = module; - ctx.word_size = comp_unit->word_size; + ctx.word_size = cu_ctx.word_size; ctx.thunks = thunks; ctx.load_offset = load_offset; - ctx.ref_offset = comp_unit_cursor - sections[section_debug].address; + ctx.ref_offset = comp_unit_start - sections[section_debug].address; memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; - traverse.start_data = comp_unit_cursor + sizeof(dwarf2_comp_unit_stream_t); - traverse.data = traverse.start_data; - traverse.word_size = comp_unit->word_size; - traverse.end_data = comp_unit_cursor + comp_unit->length + sizeof(unsigned); - - abbrev_ctx.start_data = sections[section_abbrev].address + comp_unit->abbrev_offset; + abbrev_ctx.start_data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.data = abbrev_ctx.start_data; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size; - abbrev_ctx.word_size = comp_unit->word_size; + abbrev_ctx.word_size = cu_ctx.word_size; dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); - dwarf2_read_one_debug_info(&ctx, &traverse, &di); + dwarf2_read_one_debug_info(&ctx, &cu_ctx, &di); if (di->abbrev->tag == DW_TAG_compile_unit) { @@ -2223,8 +2229,10 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, { dwarf2_section_t section[section_max]; unsigned char* ptr; - const unsigned char*comp_unit_cursor = debug; - const unsigned char*end_debug = debug + debug_size; + dwarf2_traverse_context_t mod_ctx; + + mod_ctx.start_data = mod_ctx.data = debug; + mod_ctx.end_data = debug + debug_size; module->loc_compute = dwarf2_location_compute; @@ -2251,20 +2259,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, module->dwarf2_info->debug_loc.size = loclist_size; } - while (comp_unit_cursor < end_debug) + while (mod_ctx.data < mod_ctx.end_data) { - const dwarf2_comp_unit_stream_t* comp_unit_stream; - dwarf2_comp_unit_t comp_unit; - - comp_unit_stream = (const dwarf2_comp_unit_stream_t*) comp_unit_cursor; - comp_unit.length = *(const unsigned long*) comp_unit_stream->length; - comp_unit.version = *(const unsigned short*) comp_unit_stream->version; - comp_unit.abbrev_offset = *(const unsigned long*) comp_unit_stream->abbrev_offset; - comp_unit.word_size = *(const unsigned char*) comp_unit_stream->word_size; - - dwarf2_parse_compilation_unit(section, &comp_unit, module, - thunks, comp_unit_cursor, load_offset); - comp_unit_cursor += comp_unit.length + sizeof(unsigned); + dwarf2_parse_compilation_unit(section, module, thunks, &mod_ctx, load_offset); } module->module.SymType = SymDia; module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index c03799e..6a34bb5 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -18,34 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct -{ - unsigned char length[4]; - unsigned char version[2]; - unsigned char abbrev_offset[4]; - unsigned char word_size[1]; -} dwarf2_comp_unit_stream_t; - -typedef struct -{ - unsigned long length; - unsigned short version; - unsigned long abbrev_offset; - unsigned char word_size; -} dwarf2_comp_unit_t; - -typedef struct -{ - unsigned int length; - unsigned short version; - unsigned int prologue_length; - unsigned char min_insn_length; - unsigned char default_is_stmt; - int line_base; - unsigned char line_range; - unsigned char opcode_base; -} dwarf2_line_info_t; - typedef enum dwarf_tag_e { DW_TAG_padding = 0x00,

1 0

Eric Pouech : dbghelp: Revert commit ae1791b0b8d181e0d01f8db1cae4eba48edefbac and correctly fix what this patch was trying to do .
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 3bc7657616bcbe16e07792b3fd1bebd4cdb07ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc7657616bcbe16e07792b3f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:29:15 2008 +0200 dbghelp: Revert commit ae1791b0b8d181e0d01f8db1cae4eba48edefbac and correctly fix what this patch was trying to do. --- dlls/dbghelp/stabs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index f9b5991..889a775 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -792,10 +792,9 @@ static inline int stabs_pts_read_array(struct ParseTypedefData* ptd, static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typename, struct symt** ret_dt) { - static struct symt null_dt = {SymTagNull}; int idx; long sz = -1; - struct symt* new_dt = &null_dt; /* newly created data type */ + struct symt* new_dt = NULL; /* newly created data type */ struct symt* ref_dt; /* referenced data type (pointer...) */ long filenr1, subnr1, tmp; @@ -808,7 +807,7 @@ static int stabs_pts_read_type_def(struct ParseTypedefData* ptd, const char* typ while (*ptd->ptr == '=') { ptd->ptr++; - PTS_ABORTIF(ptd, new_dt->tag != SymTagNull); + PTS_ABORTIF(ptd, new_dt != NULL); /* first handle attribute if any */ switch (*ptd->ptr)

1 0

Eric Pouech : dbghelp: Prevent debug overflow of internal buffer while tracing.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 5ccf6a3394b267f6b556dc1002cab27a0ad4d2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf6a3394b267f6b556dc100… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:28:59 2008 +0200 dbghelp: Prevent debug overflow of internal buffer while tracing. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a2d0c23..d04ebfb 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1561,7 +1561,7 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root while (*ptr1) { ptr2 = ptr1 + strlen(ptr1) + 1; - TRACE("\t%s => %s\n", ptr1, ptr2); + TRACE("\t%s => %s\n", ptr1, debugstr_a(ptr2)); ptr1 = ptr2 + strlen(ptr2) + 1; } }

1 0

Eric Pouech : winedbg: Attach the source files to a given process, and unload them at process end.
by Alexandre Julliard 01 May '08

01 May '08

Module: wine Branch: master Commit: 95f2d367b377eb80102fc492ca79cdb242a0245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f2d367b377eb80102fc492c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 30 21:26:57 2008 +0200 winedbg: Attach the source files to a given process, and unload them at process end. --- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 8 +++- programs/winedbg/source.c | 102 +++++++++++++++++++++++------------------- programs/winedbg/winedbg.c | 7 +++ 4 files changed, 71 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95f2d367b377eb80102fc…

1 0