January 2013 - Wine-commits

Huw Davies : riched20: Add a helper to debug the run text.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: c17af77b5ce7be2067b8eb5c35d11e82f5408fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17af77b5ce7be2067b8eb5c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 30 15:10:19 2013 +0000 riched20: Add a helper to debug the run text. --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.h | 2 ++ dlls/riched20/list.c | 2 +- dlls/riched20/para.c | 2 +- dlls/riched20/run.c | 12 ++++++------ dlls/riched20/wrap.c | 8 ++++---- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b7dcaf7..d2203e2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -374,15 +374,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete is a number of chars to delete from THIS run */ nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (remaning %d) chars at %d in '%s' (%d)\n", + TRACE("Deleting %d (remaning %d) chars at %d in %s (%d)\n", nCharsToDelete, nChars, c.nOffset, - debugstr_w(run->strText->szData), run->strText->nLen); + debugstr_run( run ), run->strText->nLen); /* nOfs is a character offset (from the start of the document to the current (deleted) run */ add_undo_insert_run( editor, nOfs + nChars, run->strText->szData + c.nOffset, nCharsToDelete, run->nFlags, run->style ); - TRACE("Post deletion string: %s (%d)\n", debugstr_w(run->strText->szData), run->strText->nLen); + TRACE("Post deletion string: %s (%d)\n", debugstr_run( run ), run->strText->nLen); TRACE("Shift value: %d\n", shift); ME_StrDeleteV(run->strText, c.nOffset, nCharsToDelete); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 87e6351..0dba15f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -56,6 +56,8 @@ static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) (fe).lindex=-1;\ }; +static inline const char *debugstr_run( const ME_Run *run ) { return debugstr_w( run->strText->szData ); } + /* style.c */ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) DECLSPEC_HIDDEN; void ME_AddRefStyle(ME_Style *item) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 15e9194..ef07420 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -211,7 +211,7 @@ void ME_DumpDocument(ME_TextBuffer *buffer) TRACE(" - StartRow\n"); break; case diRun: - TRACE(" - Run(\"%s\", %d, flags=%x)\n", debugstr_w(pItem->member.run.strText->szData), + TRACE(" - Run(%s, %d, flags=%x)\n", debugstr_run( &pItem->member.run ), pItem->member.run.nCharOfs, pItem->member.run.nFlags); break; case diTextEnd: diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c909358..2d572c9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -410,7 +410,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, pTmp = ME_FindItemFwd(pTmp, diRunOrParagraphOrEnd); if (pTmp->type != diRun) break; - TRACE("shifting \"%s\" by %d (previous %d)\n", debugstr_w(pTmp->member.run.strText->szData), shift, pTmp->member.run.nCharOfs); + TRACE("shifting %s by %d (previous %d)\n", debugstr_run( &pTmp->member.run ), shift, pTmp->member.run.nCharOfs); pTmp->member.run.nCharOfs += shift; pTmp->member.run.para = &tp->member.para; } while(1); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 0c594d3..3167c86 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -64,7 +64,7 @@ void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) */ if (p->type == diRun) /* propagate in all runs in this para */ { - TRACE("PropagateCharOffset(%s, %d)\n", debugstr_w(p->member.run.strText->szData), shift); + TRACE("PropagateCharOffset(%s, %d)\n", debugstr_run( &p->member.run ), shift); do { p->member.run.nCharOfs += shift; assert(p->member.run.nCharOfs >= 0); @@ -121,9 +121,9 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) ofs = 0; break; case diRun: - TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = \"%s\", flags=%08x, fx&mask = %08x\n", + TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = %s, flags=%08x, fx&mask = %08x\n", p->member.run.nCharOfs, p->member.run.nCharOfs+ofsp, ofsp+ofs, - p->member.run.strText->nLen, debugstr_w(p->member.run.strText->szData), + p->member.run.strText->nLen, debugstr_run( &p->member.run ), p->member.run.nFlags, p->member.run.style->fmt.dwMask & p->member.run.style->fmt.dwEffects); assert(ofs == p->member.run.nCharOfs); @@ -265,7 +265,7 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar run = &item->member.run; - TRACE("Before split: %s(%d, %d)\n", debugstr_w(run->strText->szData), + TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y); ME_SplitRunSimple(editor, &cursor); @@ -283,8 +283,8 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar ME_CheckCharOffsets(editor); TRACE("After check after split\n"); TRACE("After split: %s(%d, %d), %s(%d, %d)\n", - debugstr_w(run->strText->szData), run->pt.x, run->pt.y, - debugstr_w(run2->strText->szData), run2->pt.x, run2->pt.y); + debugstr_run( run ), run->pt.x, run->pt.y, + debugstr_run( run2 ), run2->pt.x, run2->pt.y); } return cursor.pRun; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 8ac14f9..b62d30b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -189,7 +189,7 @@ static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) if (p->type == diRun) { ME_Run *run = &p->member.run; - TRACE("%s - (%d, %d)\n", debugstr_w(run->strText->szData), run->pt.x, run->pt.y); + TRACE("%s - (%d, %d)\n", debugstr_run(run), run->pt.x, run->pt.y); } p = p->next; } @@ -241,7 +241,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i /* this run is the end of spaces, so the run edge is a good point to split */ wc->pt = pp->member.run.pt; wc->bOverflown = TRUE; - TRACE("Split point is: %s|%s\n", debugstr_w(piter->member.run.strText->szData), debugstr_w(pp->member.run.strText->szData)); + TRACE("Split point is: %s|%s\n", debugstr_run( &piter->member.run ), debugstr_run( &pp->member.run )); return pp; } wc->pt = piter->member.run.pt; @@ -266,7 +266,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem if (pp) return pp; } - TRACE("Must backtrack to split at: %s\n", debugstr_w(p->member.run.strText->szData)); + TRACE("Must backtrack to split at: %s\n", debugstr_run( &p->member.run )); if (wc->pLastSplittableRun) { if (wc->pLastSplittableRun->member.run.nFlags & (MERF_GRAPHICS|MERF_TAB)) @@ -303,7 +303,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem return wc->pLastSplittableRun; } } - TRACE("Backtracking failed, trying desperate: %s\n", debugstr_w(p->member.run.strText->szData)); + TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) return ME_SplitRun(wc, piter, idesp);

1 0

Huw Davies : riched20: Add a helper to retrieve the run text.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 27578f8bb61fa12cf949d26758b2d7285747e414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27578f8bb61fa12cf949d2675… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 30 15:10:20 2013 +0000 riched20: Add a helper to retrieve the run text. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 34 +++++++++++++++++----------------- dlls/riched20/editor.h | 10 +++++++++- dlls/riched20/paint.c | 5 ++--- dlls/riched20/run.c | 48 +++++++++++++++++++++++++++--------------------- dlls/riched20/wrap.c | 2 +- dlls/riched20/writer.c | 8 ++++---- 7 files changed, 61 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27578f8bb61fa12cf949d…

1 0

Hans Leidekker : msi: Avoid a crash in msi_dialog_handle_event.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 8df6708af44bdd4850cda3b1533c614bc586c1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df6708af44bdd4850cda3b15… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 30 16:27:54 2013 +0100 msi: Avoid a crash in msi_dialog_handle_event. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4d8564d..1e0e23e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -692,7 +692,7 @@ void msi_dialog_handle_event( msi_dialog* dialog, LPCWSTR control, else if ( !strcmpW( attribute, szProperty ) ) { MSIFEATURE *feature = msi_seltree_get_selected_feature( ctrl ); - msi_dialog_set_property( dialog->package, ctrl->property, feature->Directory ); + if (feature) msi_dialog_set_property( dialog->package, ctrl->property, feature->Directory ); } else if ( !strcmpW( attribute, szSelectionPath ) ) {

1 0

Hans Leidekker : wbemprox: Build a PNP device ID that better matches the graphics card.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 71f0dd6044d6d01f5d274e7fadc425116fe73722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f0dd6044d6d01f5d274e7fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 30 16:27:22 2013 +0100 wbemprox: Build a PNP device ID that better matches the graphics card. --- dlls/wbemprox/builtin.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 699d051..d97ca67 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -343,7 +343,7 @@ static const struct column col_videocontroller[] = { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING } + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR baseboard_manufacturerW[] = @@ -395,10 +395,6 @@ static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; -static const WCHAR videocontroller_pnpdeviceidW[] = - {'P','C','I','\\','V','E','N','_','1','0','0','2','&','D','E','V','_','6','7','1','8','&', - 'S','U','B','S','Y','S','_','2','2','0','1','1','4','5','8','&','R','E','V','_','0','0','\\', - '4','&','3','8','A','C','1','8','A','C','&','0','&','0','0','0','9',0}; #include "pshpack1.h" struct record_baseboard @@ -1206,6 +1202,19 @@ static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) return ret; } +static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +{ + static const WCHAR fmtW[] = + {'P','C','I','\\','V','E','N','_','%','0','4','X','&','D','E','V','_','%','0','4','X', + '&','S','U','B','S','Y','S','_','%','0','8','X','&','R','E','V','_','%','0','2','X','\\', + '0','&','D','E','A','D','B','E','E','F','&','0','&','D','E','A','D',0}; + WCHAR *ret; + + if (!(ret = heap_alloc( sizeof(fmtW) + 2 * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + return ret; +} + static void fill_videocontroller( struct table *table ) { @@ -1241,7 +1250,7 @@ done: rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name ); - rec->pnpdevice_id = videocontroller_pnpdeviceidW; + rec->pnpdevice_id = get_pnpdeviceid( &desc ); TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Hans Leidekker : msi: Set _BrowseProperty to INSTALLDIR.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 166a7e993cb0033fac7ec2712c346558fb7bd100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166a7e993cb0033fac7ec2712… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 30 16:28:17 2013 +0100 msi: Set _BrowseProperty to INSTALLDIR. --- dlls/msi/package.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f8f818d..db0ec25 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -749,6 +749,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; static const WCHAR szComputerName[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; + static const WCHAR szBrowseProperty[] = {'_','B','r','o','w','s','e','P','r','o','p','e','r','t','y',0}; + static const WCHAR szInstallDir[] = {'I','N','S','T','A','L','L','D','I','R',0}; /* * Other things that probably should be set: @@ -1020,6 +1022,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_free( computername ); } } + msi_set_property( package->db, szBrowseProperty, szInstallDir, -1 ); } static UINT msi_load_summary_properties( MSIPACKAGE *package )

1 0

Dmitry Timoshkov : windowscodecs: Implement GetThumbnail in the ICO frame decoder.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: e6c88226ef89698fc6dcba708b0dfe203b4c32eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c88226ef89698fc6dcba708… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 31 00:48:05 2013 +0800 windowscodecs: Implement GetThumbnail in the ICO frame decoder. --- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tests/icoformat.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 7aec245..ec09aa6 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -200,8 +200,8 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p)\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return IWICBitmapFrameDecode_QueryInterface(iface, &IID_IWICBitmapSource, (void **)ppIThumbnail); } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index e9c0a48..c53739d 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -133,17 +133,24 @@ static void test_bad_icondirentry_size(void) if (SUCCEEDED(hr)) { - UINT width = 0, height = 0; - IWICBitmapSource *thumbnail = NULL; + UINT width, height; + IWICBitmapSource *thumbnail; + width = height = 0; hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); - todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); - - if (thumbnail) IWICBitmapSource_Release(thumbnail); + ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + if (hr == S_OK) + { + width = height = 0; + hr = IWICBitmapSource_GetSize(thumbnail, &width, &height); + ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); + ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + IWICBitmapSource_Release(thumbnail); + } IWICBitmapFrameDecode_Release(framedecode); }

1 0

Maarten Lankhorst : dbghelp: Add support for zlib compressed debug sections .
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 1dc3ef518854173e545b9ec2b71be1dba461895d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc3ef518854173e545b9ec2b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 29 13:01:10 2013 +0100 dbghelp: Add support for zlib compressed debug sections. Patch created with the assistance of Eric Pouech who helped diagnose the problem, wrote some parts of this patch and reviewed this patch. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/dwarf.c | 157 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 138 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index fcbe40f..7cb0544 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = dbghelp EXTRADEFS = -D_IMAGEHLP_SOURCE_ IMPORTS = psapi DELAYIMPORTS = version +EXTRALIBS = @ZLIB@ C_SRCS = \ coff.c \ diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2ce26fa..8ded268 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -42,7 +42,12 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_ZLIB +#include <zlib.h> +#endif + #include "windef.h" +#include "winternl.h" #include "winbase.h" #include "winuser.h" #include "ole2.h" @@ -157,6 +162,7 @@ typedef struct dwarf2_debug_info_s typedef struct dwarf2_section_s { + BOOL compressed; const unsigned char* address; unsigned size; DWORD_PTR rva; @@ -3282,29 +3288,134 @@ static void dwarf2_location_compute(struct process* pcs, } } -static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) +#ifdef HAVE_ZLIB +static void *zalloc(void *priv, uInt items, uInt sz) { - HeapFree(GetProcessHeap(), 0, modfmt); + return HeapAlloc(GetProcessHeap(), 0, items * sz); +} + +static void zfree(void *priv, void *addr) +{ + HeapFree(GetProcessHeap(), 0, addr); +} + +static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, + const char* zsectname, + struct image_section_map* ism) +{ + z_stream z; + LARGE_INTEGER li; + int res; + BOOL ret = FALSE; + + BYTE *addr, *sect = (BYTE *)image_map_section(ism); + size_t sz = image_get_map_size(ism); + + if (sz <= 12 || memcmp(sect, "ZLIB", 4)) + { + ERR("invalid compressed section %s\n", zsectname); + goto out; + } + +#ifdef WORDS_BIGENDIAN + li.u.HighPart = *(DWORD*)&sect[4]; + li.u.LowPart = *(DWORD*)&sect[8]; +#else + li.u.HighPart = RtlUlongByteSwap(*(DWORD*)&sect[4]); + li.u.LowPart = RtlUlongByteSwap(*(DWORD*)&sect[8]); +#endif + + addr = HeapAlloc(GetProcessHeap(), 0, li.QuadPart); + if (!addr) + goto out; + + z.next_in = &sect[12]; + z.avail_in = sz - 12; + z.opaque = NULL; + z.zalloc = zalloc; + z.zfree = zfree; + + res = inflateInit(&z); + if (res != Z_OK) + { + FIXME("inflateInit failed with %i / %s\n", res, z.msg); + goto out_free; + } + + do { + z.next_out = addr + z.total_out; + z.avail_out = li.QuadPart - z.total_out; + res = inflate(&z, Z_FINISH); + } while (z.avail_in && res == Z_STREAM_END); + + if (res != Z_STREAM_END) + { + FIXME("Decompression failed with %i / %s\n", res, z.msg); + goto out_end; + } + + ret = TRUE; + section->compressed = TRUE; + section->address = addr; + section->rva = image_get_map_rva(ism); + section->size = z.total_out; + +out_end: + inflateEnd(&z); +out_free: + if (!ret) + HeapFree(GetProcessHeap(), 0, addr); +out: + image_unmap_section(ism); + return ret; } +#endif + static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_file_map* fmap, - const char* sectname, struct image_section_map* ism) + const char* sectname, const char* zsectname, + struct image_section_map* ism) { struct image_section_map local_ism; if (!ism) ism = &local_ism; - if (!image_find_section(fmap, sectname, ism)) + + section->compressed = FALSE; + if (image_find_section(fmap, sectname, ism)) { - section->address = NULL; - section->size = 0; - section->rva = 0; - return FALSE; + section->address = (const BYTE*)image_map_section(ism); + section->size = image_get_map_size(ism); + section->rva = image_get_map_rva(ism); + return TRUE; } - section->address = (const BYTE*)image_map_section(ism); - section->size = image_get_map_size(ism); - section->rva = image_get_map_rva(ism); - return TRUE; + section->address = NULL; + section->size = 0; + section->rva = 0; + + if (zsectname && image_find_section(fmap, zsectname, ism)) + { +#ifdef HAVE_ZLIB + return dwarf2_init_zsection(section, zsectname, ism); +#else + FIXME("dbghelp not built with zlib, but compressed section found\n" ); +#endif + } + + return FALSE; +} + +static inline void dwarf2_fini_section(dwarf2_section_t* section) +{ + if (section->compressed) + HeapFree(GetProcessHeap(), 0, (void*)section->address); +} + +static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) +{ + dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_loc); + dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_frame); + HeapFree(GetProcessHeap(), 0, modfmt); } BOOL dwarf2_parse(struct module* module, unsigned long load_offset, @@ -3318,12 +3429,12 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - dwarf2_init_section(&eh_frame, fmap, ".eh_frame", &eh_frame_sect); - dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect); - dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); - dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); - dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); - dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); + dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect); + dwarf2_init_section(&section[section_debug], fmap, ".debug_info", ".zdebug_info", &debug_sect); + dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", ".zdebug_abbrev", &debug_abbrev_sect); + dwarf2_init_section(&section[section_string], fmap, ".debug_str", ".zdebug_str", &debug_str_sect); + dwarf2_init_section(&section[section_line], fmap, ".debug_line", ".zdebug_line", &debug_line_sect); + dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", ".zdebug_ranges", &debug_ranges_sect); /* to do anything useful we need either .eh_frame or .debug_info */ if ((!eh_frame.address || eh_frame.address == IMAGE_NO_MAP) && @@ -3365,8 +3476,8 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, /* As we'll need later some sections' content, we won't unmap these * sections upon existing this function */ - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", ".zdebug_loc", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", ".zdebug_frame", NULL); dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; while (mod_ctx.data < mod_ctx.end_data) @@ -3385,6 +3496,12 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; leave: + dwarf2_fini_section(&section[section_debug]); + dwarf2_fini_section(&section[section_abbrev]); + dwarf2_fini_section(&section[section_string]); + dwarf2_fini_section(&section[section_line]); + dwarf2_fini_section(&section[section_ranges]); + image_unmap_section(&debug_sect); image_unmap_section(&debug_abbrev_sect); image_unmap_section(&debug_str_sect);

1 0

Sergey Guralnik : winemenubuilder: Try to wait for creating icon files.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 79808429c16c9bec8026cbd57158dcff26691334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79808429c16c9bec8026cbd57… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 23 15:07:44 2013 +0200 winemenubuilder: Try to wait for creating icon files. --- programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5a5789f..c931363 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1055,10 +1055,19 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt hr = open_module_icon(filename, index, ppStream); if (FAILED(hr)) { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + if(bWait && hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) + { + WINE_WARN("Can't find file: %s, give a chance to parent process to create it\n", + wine_dbgstr_w(filename)); + return hr; + } + else + { + static const WCHAR dot_icoW[] = {'.','i','c','o',0}; + int len = strlenW(filename); + if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + } } if (FAILED(hr)) hr = open_file_type_icon(filename, ppStream);

1 0

Charles Davis : winebuild: Use Clang to assemble if found.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: c14bdaf1ddb7d0e5587f63f1216b61c9ecb7a8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14bdaf1ddb7d0e5587f63f12… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 28 13:42:12 2013 -0700 winebuild: Use Clang to assemble if found. --- tools/winebuild/utils.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 559e476..262ff3a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -288,8 +288,6 @@ char *find_tool( const char *name, const char * const *names ) unsigned int i, len; struct stat st; - if (target_alias) return strmake( "%s-%s", target_alias, name ); - if (!dirs) { char *path; @@ -322,6 +320,8 @@ char *find_tool( const char *name, const char * const *names ) while (*names) { len = strlen(*names) + sizeof(EXEEXT) + 1; + if (target_alias) + len += strlen(target_alias) + 1; file = xmalloc( maxlen + len ); for (i = 0; i < count; i++) @@ -330,6 +330,12 @@ char *find_tool( const char *name, const char * const *names ) p = file + strlen(file); if (p == file) *p++ = '.'; if (p[-1] != '/') *p++ = '/'; + if (target_alias) + { + strcpy( p, target_alias ); + p += strlen(p); + *p++ = '-'; + } strcpy( p, *names ); strcat( p, EXEEXT ); @@ -338,21 +344,38 @@ char *find_tool( const char *name, const char * const *names ) free( file ); names++; } - return xstrdup( name ); + return NULL; } struct strarray *get_as_command(void) { + static int as_is_clang = 0; struct strarray *args = strarray_init(); if (!as_command) { + as_command = find_tool( "clang", NULL ); + if (as_command) as_is_clang = 1; + } + + if (!as_command) + { static const char * const commands[] = { "gas", "as", NULL }; as_command = find_tool( "as", commands ); } + + if (!as_command) + fatal_error( "cannot find suitable assembler\n" ); + strarray_add_one( args, as_command ); - if (force_pointer_size) + if (as_is_clang) + { + strarray_add( args, "-xassembler", "-c", NULL ); + if (force_pointer_size) + strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + } + else if (force_pointer_size) { switch (target_platform) { @@ -386,6 +409,10 @@ struct strarray *get_ld_command(void) static const char * const commands[] = { "ld", "gld", NULL }; ld_command = find_tool( "ld", commands ); } + + if (!ld_command) + fatal_error( "cannot find suitable linker\n" ); + strarray_add_one( args, ld_command ); if (force_pointer_size) @@ -421,6 +448,9 @@ const char *get_nm_command(void) static const char * const commands[] = { "nm", "gnm", NULL }; nm_command = find_tool( "nm", commands ); } + + if (!nm_command) + fatal_error( "cannot find suitable name lister\n" ); return nm_command; }

1 0

Nikolay Sivov : comctl32: Use NM_RCLICK return value to allow default processing.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: ac4192e7699de937bc68ccbaa115338771855092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4192e7699de937bc68ccbaa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 01:22:07 2013 +0400 comctl32: Use NM_RCLICK return value to allow default processing. --- dlls/comctl32/listview.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd09ffb..c16a619 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -884,11 +884,13 @@ static inline LRESULT notify_listview(const LISTVIEW_INFO *infoPtr, INT code, LP return notify_hdr(infoPtr, code, (LPNMHDR)plvnm); } +/* Handles NM_DBLCLK, NM_CLICK, NM_RDBLCLK, NM_RCLICK. Only NM_RCLICK return value is used. */ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTESTINFO *lvht) { NMITEMACTIVATE nmia; LVITEMW item; HWND hwnd = infoPtr->hwndSelf; + LRESULT ret; TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); ZeroMemory(&nmia, sizeof(nmia)); @@ -899,8 +901,8 @@ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTEST item.iItem = lvht->iItem; item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmia.lParam = item.lParam; - notify_hdr(infoPtr, code, (LPNMHDR)&nmia); - return IsWindow(hwnd); + ret = notify_hdr(infoPtr, code, (NMHDR*)&nmia); + return IsWindow(hwnd) && (code == NM_RCLICK ? !ret : TRUE); } static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem)

1 0