December 2010 - Wine-Commits

Alexandre Julliard : winex11: Make the tool window flag take precedence when setting the window type.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 66814d0dd62a39cc261cc9b1a4abe69b1d60f30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66814d0dd62a39cc261cc9b1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 28 11:49:37 2010 +0100 winex11: Make the tool window flag take precedence when setting the window type. This prevents some menus from being marked as dialogs. --- dlls/winex11.drv/window.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3803efd..65c046b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1198,10 +1198,9 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + /* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */ + else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); -#if 0 /* many window managers don't handle utility windows very well */ - else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); -#endif else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE),

1 0

Michael Stefaniuc : avifil32: Use an iface instead of a vtbl pointer in IGetFrameImpl.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 157480df1a00f041706fa91d405be36b2c2dd00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=157480df1a00f041706fa91d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:18:54 2010 +0100 avifil32: Use an iface instead of a vtbl pointer in IGetFrameImpl. --- dlls/avifil32/getframe.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index db05f85..6f3e6ba 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -62,7 +62,7 @@ static const struct IGetFrameVtbl igetframeVtbl = { typedef struct _IGetFrameImpl { /* IUnknown stuff */ - const IGetFrameVtbl *lpVtbl; + IGetFrame IGetFrame_iface; LONG ref; /* IGetFrame stuff */ @@ -92,6 +92,11 @@ typedef struct _IGetFrameImpl { /***********************************************************************/ +static inline IGetFrameImpl *impl_from_IGetFrame(IGetFrame *iface) +{ + return CONTAINING_RECORD(iface, IGetFrameImpl, IGetFrame_iface); +} + static void AVIFILE_CloseCompressor(IGetFrameImpl *This) { if (This->lpInFormat != This->lpOutFormat) { @@ -120,7 +125,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); if (pg != NULL) { - pg->lpVtbl = &igetframeVtbl; + pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; pg->ref = 1; pg->lCurrentFrame = -1; pg->pStream = pStream; @@ -133,7 +138,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, REFIID refiid, LPVOID *obj) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); @@ -149,7 +154,7 @@ static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)\n", iface); @@ -159,7 +164,7 @@ static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)\n", iface); @@ -180,7 +185,7 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); LONG readBytes; LONG readSamples; @@ -299,7 +304,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, LONG lEnd, LONG lRate) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p,%d,%d,%d)\n", iface, lStart, lEnd, lRate); @@ -310,7 +315,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p)\n", iface); @@ -324,7 +329,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, LPVOID lpBits, INT x, INT y, INT dx, INT dy) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); AVISTREAMINFOW sInfo; LPBITMAPINFOHEADER lpbi = lpbiWanted;

1 0

Hwang YunSong : msvidc32: Update Korean resource.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: a13078eebd477b6343a2428b7911325735533b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13078eebd477b6343a2428b7… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Dec 28 11:15:13 2010 +0900 msvidc32: Update Korean resource. --- dlls/msvidc32/msvidc32_Ko.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Ko.rc b/dlls/msvidc32/msvidc32_Ko.rc index a2adeea..8f4b399 100644 --- a/dlls/msvidc32/msvidc32_Ko.rc +++ b/dlls/msvidc32/msvidc32_Ko.rc @@ -1,5 +1,6 @@ /* * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,10 +19,12 @@ #include "msvidc32_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { IDS_NAME "MS-CRAM" - IDS_DESCRIPTION "Wine �� 1 �� ڵ�" + IDS_DESCRIPTION "Wine 비디오 1 비디오 코덱" }

1 0

Jacek Caban : mshtml: Fixed unsafe cast in CreateChromeWindow2 implementation.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: a131886a86e62d55e343cc78df09d5f4dbad12bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a131886a86e62d55e343cc78d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 27 22:22:02 2010 +0100 mshtml: Fixed unsafe cast in CreateChromeWindow2 implementation. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 13 +++++++++++-- dlls/mshtml/nsservice.c | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index bff3d14..15c5abf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -705,6 +705,7 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*); NSContainer *NSContainer_Create(HTMLDocumentObj*,NSContainer*); void NSContainer_Release(NSContainer*); +nsresult create_chrome_window(nsIWebBrowserChrome*,nsIWebBrowserChrome**); void init_mutation(HTMLDocumentNode*); void release_mutation(HTMLDocumentNode*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d766af8..e9a176d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1150,8 +1150,6 @@ static nsresult NSAPI nsWebBrowserChrome_ExitModalEventLoop(nsIWebBrowserChrome return NS_ERROR_NOT_IMPLEMENTED; } -#undef NSWBCHROME_THIS - static const nsIWebBrowserChromeVtbl nsWebBrowserChromeVtbl = { nsWebBrowserChrome_QueryInterface, nsWebBrowserChrome_AddRef, @@ -1711,6 +1709,17 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { nsSupportsWeakReference_GetWeakReference }; +nsresult create_chrome_window(nsIWebBrowserChrome *parent, nsIWebBrowserChrome **ret) +{ + NSContainer *new_container; + + if(parent->lpVtbl != &nsWebBrowserChromeVtbl) + return NS_ERROR_UNEXPECTED; + + new_container = NSContainer_Create(NULL, NSWBCHROME_THIS(parent)); + *ret = NSWBCHROME(new_container); + return NS_OK; +} NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) { diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 792feb5..b280020 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -99,8 +99,7 @@ static nsresult NSAPI nsWindowCreator_CreateChromeWindow2(nsIWindowCreator2 *ifa if(cancel) *cancel = FALSE; - *_retval = NSWBCHROME(NSContainer_Create(NULL, (NSContainer*)parent)); - return NS_OK; + return create_chrome_window(parent, _retval); } static const nsIWindowCreator2Vtbl nsWindowCreatorVtbl = {

1 0

Michael Stefaniuc : msxml3: Standardize the COM usage in saxreader.c.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 13e1997860503b8583d08548cfb3bfa6cca60fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e1997860503b8583d08548c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:12:06 2010 +0100 msxml3: Standardize the COM usage in saxreader.c. --- dlls/msxml3/saxreader.c | 204 ++++++++++++++++++---------------------------- 1 files changed, 80 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13e1997860503b8583d08…

1 0

Nikolay Sivov : oleaut32: Use function description layout instead of hardcoded byte offsets.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: b3514b4718cc87f5c0ceff479bf8c52906c00309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3514b4718cc87f5c0ceff479… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 27 23:53:02 2010 +0300 oleaut32: Use function description layout instead of hardcoded byte offsets. --- dlls/oleaut32/typelib.c | 83 ++++++++++++++++++++-------------------------- dlls/oleaut32/typelib.h | 24 ++++++------- 2 files changed, 47 insertions(+), 60 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 72e1932..8482afe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1906,11 +1906,11 @@ MSFT_DoFuncs(TLBContext* pcx, * in the first part of this file segment. */ - int infolen, nameoffset, reclength, nrattributes, i; + int infolen, nameoffset, reclength, i; int recoffset = offset + sizeof(INT); char *recbuf = HeapAlloc(GetProcessHeap(), 0, 0xffff); - MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + MSFT_FuncRecord *pFuncRec = (MSFT_FuncRecord*)recbuf; TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1919,6 +1919,8 @@ MSFT_DoFuncs(TLBContext* pcx, for ( i = 0; i < cFuncs ; i++ ) { + int optional; + *pptfd = TLB_Alloc(sizeof(TLBFuncDesc)); /* name, eventually add to a hash table */ @@ -1933,56 +1935,40 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ - MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); + MSFT_ReadLEDWords(&reclength, sizeof(pFuncRec->Info), pcx, recoffset); reclength &= 0xffff; - MSFT_ReadLEDWords(pFuncRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK); + MSFT_ReadLEDWords(&pFuncRec->DataType, reclength - FIELD_OFFSET(MSFT_FuncRecord, DataType), pcx, DO_NOT_SEEK); - /* do the attributes */ - nrattributes = (reclength - pFuncRec->nrargs * 3 * sizeof(int) - 0x18) - / sizeof(int); + /* size without argument data */ + optional = reclength - pFuncRec->nrargs*sizeof(MSFT_ParameterInfo); - if ( nrattributes > 0 ) - { - (*pptfd)->helpcontext = pFuncRec->OptAttr[0] ; + if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpContext)) + (*pptfd)->helpcontext = pFuncRec->HelpContext; - if ( nrattributes > 1 ) - { - (*pptfd)->HelpString = MSFT_ReadString(pcx, - pFuncRec->OptAttr[1]) ; + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oHelpString)) + (*pptfd)->HelpString = MSFT_ReadString(pcx, pFuncRec->oHelpString); - if ( nrattributes > 2 ) - { - if ( pFuncRec->FKCCIC & 0x2000 ) - { - if (!IS_INTRESOURCE(pFuncRec->OptAttr[2])) - ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->OptAttr[2]); - (*pptfd)->Entry = (BSTR)(DWORD_PTR)LOWORD(pFuncRec->OptAttr[2]); - } - else - { - (*pptfd)->Entry = MSFT_ReadString(pcx, - pFuncRec->OptAttr[2]); - } - if( nrattributes > 5 ) - { - (*pptfd)->HelpStringContext = pFuncRec->OptAttr[5] ; - - if ( nrattributes > 6 && pFuncRec->FKCCIC & 0x80 ) - { - MSFT_CustData(pcx, - pFuncRec->OptAttr[6], - &(*pptfd)->pCustData); - } - } - } - else - { - (*pptfd)->Entry = (BSTR)-1; - } + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oEntry)) + { + if (pFuncRec->FKCCIC & 0x2000 ) + { + if (!IS_INTRESOURCE(pFuncRec->oEntry)) + ERR("ordinal 0x%08x invalid, IS_INTRESOURCE is false\n", pFuncRec->oEntry); + (*pptfd)->Entry = (BSTR)(DWORD_PTR)LOWORD(pFuncRec->oEntry); } + else + (*pptfd)->Entry = MSFT_ReadString(pcx, pFuncRec->oEntry); } + else + (*pptfd)->Entry = (BSTR)-1; + + if (optional > FIELD_OFFSET(MSFT_FuncRecord, HelpStringContext)) + (*pptfd)->HelpStringContext = pFuncRec->HelpStringContext; + + if (optional > FIELD_OFFSET(MSFT_FuncRecord, oCustData) && pFuncRec->FKCCIC & 0x80) + MSFT_CustData(pcx, pFuncRec->oCustData, &(*pptfd)->pCustData); /* fill the FuncDesc Structure */ MSFT_ReadLEDWords( & (*pptfd)->funcdesc.memid, sizeof(INT), pcx, @@ -2047,7 +2033,7 @@ MSFT_DoFuncs(TLBContext* pcx, { INT* pInt = (INT *)((char *)pFuncRec + reclength - - (pFuncRec->nrargs * 4 + 1) * sizeof(INT) ); + (pFuncRec->nrargs * 4) * sizeof(INT) ); PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; @@ -2059,11 +2045,14 @@ MSFT_DoFuncs(TLBContext* pcx, } else elemdesc->u.paramdesc.pparamdescex = NULL; + /* custom info */ - if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) + if (optional > (FIELD_OFFSET(MSFT_FuncRecord, oArgCustData) + + j*sizeof(pFuncRec->oArgCustData[0])) && + pFuncRec->FKCCIC & 0x80 ) { MSFT_CustData(pcx, - pFuncRec->OptAttr[7+j], + pFuncRec->oArgCustData[j], &(*pptfd)->pParamDesc[j].pCustData); } @@ -2120,7 +2109,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, (*pptvd)->HelpContext = pVarRec->HelpContext; if(reclength > FIELD_OFFSET(MSFT_VarRecord, oHelpString)) - (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString) ; + (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString); if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) (*pptvd)->HelpStringContext = pVarRec->HelpStringContext; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 210db33..6649407 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -177,7 +177,7 @@ typedef struct tagMSFT_ImpInfo { /* function description data */ typedef struct { -/* INT recsize; record size including some xtra stuff */ + INT Info; /* record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -202,19 +202,17 @@ typedef struct { INT16 nrargs; /* number of arguments (including optional ????) */ INT16 nroargs; /* nr of optional arguments */ #endif + /* optional attribute fields, the number of them is variable */ - INT OptAttr[1]; -/* -0* INT helpcontext; -1* INT oHelpString; -2* INT oEntry; // either offset in string table or numeric as it is // -3* INT res9; // unknown (-1) // -4* INT resA; // unknown (-1) // -5* INT HelpStringContext; - // these are controlled by a bit set in the FKCCIC field // -6* INT oCustData; // custom data for function // -7* INT oArgCustData[1]; // custom data per argument // -*/ + INT HelpContext; + INT oHelpString; + INT oEntry; /* either offset in string table or numeric as it is */ + INT res9; /* unknown (-1) */ + INT resA; /* unknown (-1) */ + INT HelpStringContext; + /* these are controlled by a bit set in the FKCCIC field */ + INT oCustData; /* custom data for function */ + INT oArgCustData[1]; /* custom data per argument */ } MSFT_FuncRecord; /* after this may follow an array with default value pointers if the

1 0

Greg Geldorp : shell32/tests: Support for IShellFolderView:: RemoveObject was removed in Win7.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 7234ddd2634b1ce92b641f00a4a8f3d6a2bac2f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7234ddd2634b1ce92b641f00a… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Dec 27 20:54:38 2010 +0100 shell32/tests: Support for IShellFolderView::RemoveObject was removed in Win7. --- dlls/shell32/tests/shlview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6534970..101cdf3 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -776,9 +776,9 @@ static void test_IShellFolderView(void) /* ::RemoveObject */ i = 0xdeadbeef; hr = IShellFolderView_RemoveObject(folderview, NULL, &i); - ok(hr == S_OK, "got (0x%08x)\n", hr); - ok(i == 0 || i == -1 /* Win7 */ || broken(i == 0xdeadbeef) /* Vista, 2k8 */, - "got %d\n", i); + ok(hr == S_OK || hr == E_FAIL, "got (0x%08x)\n", hr); + if (hr == S_OK) ok(i == 0 || broken(i == 0xdeadbeef) /* Vista, 2k8 */, + "got %d\n", i); IShellFolderView_Release(folderview);

1 0

Eric Pouech : dbghelp: For targets on Linux, report the VDSO system page as a known ELF module.
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 1966ba8b7f42c3fd2c286b2010af277eaebbe9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1966ba8b7f42c3fd2c286b201… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:36 2010 +0100 dbghelp: For targets on Linux, report the VDSO system page as a known ELF module. --- dlls/dbghelp/elf_module.c | 92 +++++++++++++++++++++++++++++++++++++++-- dlls/dbghelp/image_private.h | 2 + 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 305f420..2bfa2a4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1297,6 +1297,59 @@ static BOOL elf_load_file_from_dll_path(HANDLE hProcess, return ret; } +#ifdef AT_SYSINFO_EHDR +/****************************************************************** + * elf_search_auxv + * + * locate some a value from the debuggee auxillary vector + */ +static BOOL elf_search_auxv(const struct process* pcs, unsigned type, unsigned long* val) +{ + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME]; + SYMBOL_INFO*si = (SYMBOL_INFO*)buffer; + void* addr; + void* str; + void* str_max; + Elf_auxv_t auxv; + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = MAX_SYM_NAME; + if (!SymFromName(pcs->handle, "libwine.so.1!__wine_main_environ", si) || + !(addr = (void*)(DWORD_PTR)si->Address) || + !ReadProcessMemory(pcs->handle, addr, &addr, sizeof(addr), NULL) || + !addr) + { + FIXME("can't find symbol in module\n"); + return FALSE; + } + /* walk through envp[] */ + /* envp[] strings are located after the auxillary vector, so protect the walk */ + str_max = (void*)(DWORD_PTR)~0L; + while (ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && + (addr = (void*)((DWORD_PTR)addr + sizeof(str))) != NULL && str != NULL) + str_max = min(str_max, str); + + /* Walk through the end of envp[] array. + * Actually, there can be several NULLs at the end of envp[]. This happens when an env variable is + * deleted, the last entry is replaced by an extra NULL. + */ + while (addr < str_max && ReadProcessMemory(pcs->handle, addr, &str, sizeof(str), NULL) && str == NULL) + addr = (void*)((DWORD_PTR)addr + sizeof(str)); + + while (ReadProcessMemory(pcs->handle, addr, &auxv, sizeof(auxv), NULL) && auxv.a_type != AT_NULL) + { + if (auxv.a_type == type) + { + *val = auxv.a_un.a_val; + return TRUE; + } + addr = (void*)((DWORD_PTR)addr + sizeof(auxv)); + } + + return FALSE; +} +#endif + /****************************************************************** * elf_search_and_load_file * @@ -1330,12 +1383,12 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, if (!ret) ret = elf_load_file_from_dll_path(pcs, filename, load_offset, dyn_addr, elf_info); } - + return ret; } typedef BOOL (*enum_elf_modules_cb)(const WCHAR*, unsigned long load_addr, - unsigned long dyn_addr, void* user); + unsigned long dyn_addr, BOOL is_system, void* user); /****************************************************************** * elf_enum_modules_internal @@ -1351,6 +1404,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, struct link_map lm; char bufstr[256]; WCHAR bufstrW[MAX_PATH]; + unsigned long ehdr_addr; if (!pcs->dbg_hdr_addr || !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, @@ -1374,9 +1428,16 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, bufstr[sizeof(bufstr) - 1] = '\0'; MultiByteToWideChar(CP_UNIXCP, 0, bufstr, -1, bufstrW, sizeof(bufstrW) / sizeof(WCHAR)); if (main_name && !bufstrW[0]) strcpyW(bufstrW, main_name); - if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, user)) break; + if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) break; } } +#ifdef AT_SYSINFO_EHDR + if (!lm_addr && elf_search_auxv(pcs, AT_SYSINFO_EHDR, &ehdr_addr)) + { + static const WCHAR vdsoW[] = {'[','v','d','s','o',']','.','s','o',0}; + cb(vdsoW, ehdr_addr, 0, TRUE, user); + } +#endif return TRUE; } @@ -1432,7 +1493,7 @@ struct elf_enum_user }; static BOOL elf_enum_modules_translate(const WCHAR* name, unsigned long load_addr, - unsigned long dyn_addr, void* user) + unsigned long dyn_addr, BOOL is_system, void* user) { struct elf_enum_user* eeu = user; return eeu->cb(name, load_addr, eeu->user); @@ -1479,12 +1540,33 @@ struct elf_load * modules. */ static BOOL elf_load_cb(const WCHAR* name, unsigned long load_addr, - unsigned long dyn_addr, void* user) + unsigned long dyn_addr, BOOL is_system, void* user) { struct elf_load* el = user; BOOL ret = TRUE; const WCHAR* p; + if (is_system) /* virtual ELF module, created by system. handle it from memory */ + { + struct module* module; + struct elf_map_file_data emfd; + struct image_file_map fmap; + + if ((module = module_is_already_loaded(el->pcs, name))) + { + el->elf_info.module = module; + el->elf_info.module->format_info[DFI_ELF]->u.elf_info->elf_mark = 1; + return module->module.SymType; + } + + emfd.kind = from_process; + emfd.u.process.handle = el->pcs->handle; + emfd.u.process.load_addr = (void*)load_addr; + + if (elf_map_file(&emfd, &fmap)) + el->ret = elf_load_file_from_fmap(el->pcs, name, &fmap, load_addr, 0, &el->elf_info); + return TRUE; + } if (el->name) { /* memcmp is needed for matches when bufstr contains also version information diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 34e2c18..23a05da 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -53,12 +53,14 @@ #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Sym Elf64_Sym +#define Elf_auxv_t Elf64_auxv_t #else #define Elf_Ehdr Elf32_Ehdr #define Elf_Shdr Elf32_Shdr #define Elf_Phdr Elf32_Phdr #define Elf_Dyn Elf32_Dyn #define Elf_Sym Elf32_Sym +#define Elf_auxv_t Elf32_auxv_t #endif #else #ifndef SHT_NULL

1 0

Jacek Caban : mshtml: Don't use DEFINE_THIS2 for HTMLDOMNode vtbl functions .
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: f52e0a776fa8520704291ee7e869c27f880f4602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52e0a776fa8520704291ee7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 27 20:13:09 2010 +0100 mshtml: Don't use DEFINE_THIS2 for HTMLDOMNode vtbl functions. --- dlls/mshtml/htmlanchor.c | 11 ++++++----- dlls/mshtml/htmlbody.c | 13 +++++++------ dlls/mshtml/htmlcomment.c | 11 ++++++----- dlls/mshtml/htmldoc.c | 15 ++++++++------- dlls/mshtml/htmlelem.c | 13 ++++++++----- dlls/mshtml/htmlelemcol.c | 15 ++++++++++----- dlls/mshtml/htmlembed.c | 11 ++++++----- dlls/mshtml/htmlform.c | 15 ++++++++------- dlls/mshtml/htmlframe.c | 21 ++++++++++++--------- dlls/mshtml/htmlgeneric.c | 11 ++++++----- dlls/mshtml/htmliframe.c | 21 +++++++++++---------- dlls/mshtml/htmlimg.c | 13 +++++++------ dlls/mshtml/htmlinput.c | 17 +++++++++-------- dlls/mshtml/htmlobject.c | 17 ++++++++++------- dlls/mshtml/htmloption.c | 11 ++++++----- dlls/mshtml/htmlscript.c | 13 +++++++------ dlls/mshtml/htmlselect.c | 17 +++++++++-------- dlls/mshtml/htmlstyleelem.c | 11 ++++++----- dlls/mshtml/htmltable.c | 11 ++++++----- dlls/mshtml/htmltablerow.c | 11 ++++++----- dlls/mshtml/htmltextarea.c | 15 ++++++++------- dlls/mshtml/htmltextnode.c | 15 +++++++-------- dlls/mshtml/mshtml_private.h | 3 +-- 23 files changed, 170 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f52e0a776fa8520704291…

1 0

Eric Pouech : dbghelp: Extend elf_map_file so that it can also handle ELF maps directly from debuggee address space .
by Alexandre Julliard Dec. 28, 2010

Dec. 28, 2010

Module: wine Branch: master Commit: 749dafd987111543279a62f8a480c904f8b04667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749dafd987111543279a62f8a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 27 15:03:30 2010 +0100 dbghelp: Extend elf_map_file so that it can also handle ELF maps directly from debuggee address space. --- dlls/dbghelp/elf_module.c | 126 ++++++++++++++++++++++++++++++++++++------ dlls/dbghelp/image_private.h | 1 + 2 files changed, 109 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 1b8ba70..305f420 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -110,6 +110,10 @@ const char* elf_map_section(struct image_section_map* ism) fmap->sect[ism->sidx].shdr.sh_type == SHT_NOBITS) return IMAGE_NO_MAP; + if (fmap->target_copy) + { + return fmap->target_copy + fmap->sect[ism->sidx].shdr.sh_offset; + } /* align required information on page size (we assume pagesize is a power of 2) */ ofst = fmap->sect[ism->sidx].shdr.sh_offset & ~(pgsz - 1); size = ((fmap->sect[ism->sidx].shdr.sh_offset + @@ -166,7 +170,8 @@ void elf_unmap_section(struct image_section_map* ism) { struct elf_file_map* fmap = &ism->fmap->u.elf; - if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) + if (ism->sidx >= 0 && ism->sidx < fmap->elfhdr.e_shnum && !fmap->target_copy && + fmap->sect[ism->sidx].mapped != IMAGE_NO_MAP) { unsigned long pgsz = getpagesize(); unsigned long ofst, size; @@ -223,6 +228,41 @@ static inline void elf_reset_file_map(struct image_file_map* fmap) fmap->u.elf.fd = -1; fmap->u.elf.shstrtab = IMAGE_NO_MAP; fmap->u.elf.alternate = NULL; + fmap->u.elf.target_copy = NULL; +} + +struct elf_map_file_data +{ + enum {from_file, from_process} kind; + union + { + struct + { + const WCHAR* filename; + } file; + struct + { + HANDLE handle; + void* load_addr; + } process; + } u; +}; + +static BOOL elf_map_file_read(struct image_file_map* fmap, struct elf_map_file_data* emfd, + void* buf, size_t len, off_t off) +{ + SIZE_T dw; + + switch (emfd->kind) + { + case from_file: + return pread(fmap->u.elf.fd, buf, len, off) == len; + case from_process: + return ReadProcessMemory(emfd->u.process.handle, + (void*)((unsigned long)emfd->u.process.load_addr + (unsigned long)off), + buf, len, &dw) && dw == len; + default: assert(0); + } } /****************************************************************** @@ -230,7 +270,7 @@ static inline void elf_reset_file_map(struct image_file_map* fmap) * * Maps an ELF file into memory (and checks it's a real ELF file) */ -static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) +static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* fmap) { static const BYTE elf_signature[4] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 }; struct stat statbuf; @@ -241,21 +281,40 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) unsigned len; BOOL ret = FALSE; - len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; - WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); + switch (emfd->kind) + { + case from_file: + len = WideCharToMultiByte(CP_UNIXCP, 0, emfd->u.file.filename, -1, NULL, 0, NULL, NULL); + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + WideCharToMultiByte(CP_UNIXCP, 0, emfd->u.file.filename, -1, filename, len, NULL, NULL); + break; + case from_process: + filename = NULL; + break; + default: assert(0); + } elf_reset_file_map(fmap); fmap->modtype = DMT_ELF; - /* check that the file exists, and that the module hasn't been loaded yet */ - if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; - - /* Now open the file, so that we can mmap() it. */ - if ((fmap->u.elf.fd = open(filename, O_RDONLY)) == -1) goto done; + fmap->u.elf.fd = -1; + fmap->u.elf.target_copy = NULL; - if (read(fmap->u.elf.fd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr)) != sizeof(fmap->u.elf.elfhdr)) + switch (emfd->kind) + { + case from_file: + /* check that the file exists, and that the module hasn't been loaded yet */ + if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; + + /* Now open the file, so that we can mmap() it. */ + if ((fmap->u.elf.fd = open(filename, O_RDONLY)) == -1) goto done; + break; + case from_process: + break; + } + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.elfhdr, sizeof(fmap->u.elf.elfhdr), 0)) goto done; + /* and check for an ELF header */ if (memcmp(fmap->u.elf.elfhdr.e_ident, elf_signature, sizeof(elf_signature))) goto done; @@ -271,8 +330,8 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - if (pread(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), - fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) + if (!elf_map_file_read(fmap, emfd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr), + fmap->u.elf.elfhdr.e_shoff + i * sizeof(fmap->u.elf.sect[i].shdr))) { HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); fmap->u.elf.sect = NULL; @@ -286,8 +345,8 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) fmap->u.elf.elf_start = ~0L; for (i = 0; i < fmap->u.elf.elfhdr.e_phnum; i++) { - if (pread(fmap->u.elf.fd, &phdr, sizeof(phdr), - fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) == sizeof(phdr) && + if (elf_map_file_read(fmap, emfd, &phdr, sizeof(phdr), + fmap->u.elf.elfhdr.e_phoff + i * sizeof(phdr)) && phdr.p_type == PT_LOAD) { tmp = (phdr.p_vaddr + phdr.p_memsz + page_mask) & ~page_mask; @@ -299,6 +358,25 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) * otherwise, all addresses are zero based and start has no effect */ fmap->u.elf.elf_size -= fmap->u.elf.elf_start; + + switch (emfd->kind) + { + case from_file: break; + case from_process: + if (!(fmap->u.elf.target_copy = HeapAlloc(GetProcessHeap(), 0, fmap->u.elf.elf_size))) + { + HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); + goto done; + } + if (!ReadProcessMemory(emfd->u.process.handle, emfd->u.process.load_addr, fmap->u.elf.target_copy, + fmap->u.elf.elf_size, NULL)) + { + HeapFree(GetProcessHeap(), 0, fmap->u.elf.target_copy); + HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); + goto done; + } + break; + } ret = TRUE; done: HeapFree(GetProcessHeap(), 0, filename); @@ -325,6 +403,7 @@ static void elf_unmap_file(struct image_file_map* fmap) HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); close(fmap->u.elf.fd); } + HeapFree(GetProcessHeap(), 0, fmap->u.elf.target_copy); fmap = fmap->u.elf.alternate; } } @@ -737,7 +816,11 @@ static int elf_new_public_symbols(struct module* module, const struct hash_table static BOOL elf_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD crc) { BOOL ret; - if (!elf_map_file(file, fmap)) return FALSE; + struct elf_map_file_data emfd; + + emfd.kind = from_file; + emfd.u.file.filename = file; + if (!elf_map_file(&emfd, fmap)) return FALSE; if (!(ret = crc == calc_crc32(fmap->u.elf.fd))) { WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", @@ -979,7 +1062,11 @@ BOOL elf_fetch_file_info(const WCHAR* name, DWORD_PTR* base, { struct image_file_map fmap; - if (!elf_map_file(name, &fmap)) return FALSE; + struct elf_map_file_data emfd; + + emfd.kind = from_file; + emfd.u.file.filename = name; + if (!elf_map_file(&emfd, &fmap)) return FALSE; if (base) *base = fmap.u.elf.elf_start; *size = fmap.u.elf.elf_size; *checksum = calc_crc32(fmap.u.elf.fd); @@ -1110,10 +1197,13 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, { BOOL ret = FALSE; struct image_file_map fmap; + struct elf_map_file_data emfd; TRACE("Processing elf file '%s' at %08lx\n", debugstr_w(filename), load_offset); - if (!elf_map_file(filename, &fmap)) return ret; + emfd.kind = from_file; + emfd.u.file.filename = filename; + if (!elf_map_file(&emfd, &fmap)) return ret; /* Next, we need to find a few of the internal ELF headers within * this thing. We need the main executable header, and the section diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 808f6a1..34e2c18 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -81,6 +81,7 @@ struct image_file_map int fd; const char* shstrtab; struct image_file_map* alternate; /* another ELF file (linked to this one) */ + char* target_copy; #ifdef __ELF__ Elf_Ehdr elfhdr; struct

1 0