May 2009 - Wine-Commits - list.winehq.org

Eric Pouech : user32: Clearly separate the 16bit code out of user32.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 3c3ba771790fda4f6862d74d820deb59253dc2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3ba771790fda4f6862d74d8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 5 21:25:25 2009 +0200 user32: Clearly separate the 16bit code out of user32. --- dlls/user32/dde_misc.c | 21 ++------ dlls/user32/dde_private.h | 6 +-- dlls/user32/ddeml16.c | 112 +++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 109 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c3ba771790fda4f6862d…

1 0

Francois Gouget : wineps.drv: PSDRV_CmpColor() and PSDRV_Write{ArrayGet, InitClip, RRectangle}() are unused so remove them.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: aec7cdce8a225d020cafa823bfd325ad1e292453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec7cdce8a225d020cafa823b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:34:08 2009 +0200 wineps.drv: PSDRV_CmpColor() and PSDRV_Write{ArrayGet, InitClip, RRectangle}() are unused so remove them. --- dlls/wineps.drv/color.c | 27 --------------------------- dlls/wineps.drv/ps.c | 35 ----------------------------------- dlls/wineps.drv/psdrv.h | 2 -- 3 files changed, 0 insertions(+), 64 deletions(-) diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 3c5d5c8..f952eff 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -23,33 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -/********************************************************************** - * PSDRV_CmpColor - * - * Return TRUE if col1 == col2 - */ -BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2) -{ - if(col1->type != col2->type) - return FALSE; - - switch(col1->type) { - case PSCOLOR_GRAY: - if(col1->value.gray.i == col2->value.gray.i) - return TRUE; - break; - case PSCOLOR_RGB: - if( col1->value.rgb.r == col2->value.rgb.r && - col1->value.rgb.g == col2->value.rgb.g && - col1->value.rgb.b == col2->value.rgb.b ) - return TRUE; - break; - default: - ERR("Unknown colour type %d\n", col1->type); - } - return FALSE; -} - /********************************************************************** * PSDRV_CopyColor diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 1fa4f44..372b373 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -112,13 +112,6 @@ static const char psrectangle[] = /* x, y, width, height, -width */ "%d 0 rlineto\n" "closepath\n"; -static const char psrrectangle[] = /* x, y, width, height, -width */ -"%d %d rmoveto\n" -"%d 0 rlineto\n" -"0 %d rlineto\n" -"%d 0 rlineto\n" -"closepath\n"; - static const char psglyphshow[] = /* glyph name */ "/%s glyphshow\n"; @@ -169,9 +162,6 @@ static const char psclosepath[] = static const char psclip[] = "clip\n"; -static const char psinitclip[] = -"initclip\n"; - static const char pseoclip[] = "eoclip\n"; @@ -187,9 +177,6 @@ static const char pshatch[] = static const char psrotate[] = /* ang */ "%.1f rotate\n"; -static const char psarrayget[] = -"%s %d get\n"; - static const char psarrayput[] = "%s %d %d put\n"; @@ -508,15 +495,6 @@ BOOL PSDRV_WriteRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width, return PSDRV_WriteSpool(physDev, buf, strlen(buf)); } -BOOL PSDRV_WriteRRectangle(PSDRV_PDEVICE *physDev, INT x, INT y, INT width, - INT height) -{ - char buf[100]; - - sprintf(buf, psrrectangle, x, y, width, height, -width); - return PSDRV_WriteSpool(physDev, buf, strlen(buf)); -} - BOOL PSDRV_WriteArc(PSDRV_PDEVICE *physDev, INT x, INT y, INT w, INT h, double ang1, double ang2) { @@ -651,11 +629,6 @@ BOOL PSDRV_WriteEOClip(PSDRV_PDEVICE *physDev) return PSDRV_WriteSpool(physDev, pseoclip, sizeof(pseoclip)-1); } -BOOL PSDRV_WriteInitClip(PSDRV_PDEVICE *physDev) -{ - return PSDRV_WriteSpool(physDev, psinitclip, sizeof(psinitclip)-1); -} - BOOL PSDRV_WriteHatch(PSDRV_PDEVICE *physDev) { return PSDRV_WriteSpool(physDev, pshatch, sizeof(pshatch)-1); @@ -808,14 +781,6 @@ BOOL PSDRV_WriteData(PSDRV_PDEVICE *physDev, const BYTE *data, DWORD number) return TRUE; } -BOOL PSDRV_WriteArrayGet(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nIndex) -{ - char buf[100]; - - sprintf(buf, psarrayget, pszArrayName, nIndex); - return PSDRV_WriteSpool(physDev, buf, strlen(buf)); -} - BOOL PSDRV_WriteArrayPut(PSDRV_PDEVICE *physDev, CHAR *pszArrayName, INT nIndex, LONG lObject) { char buf[100]; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index efc8460..fb90aeb 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -426,7 +426,6 @@ extern BOOL PSDRV_SetPen( PSDRV_PDEVICE *physDev ); extern void PSDRV_SetClip(PSDRV_PDEVICE* phyDev); extern void PSDRV_ResetClip(PSDRV_PDEVICE* phyDev); -extern BOOL PSDRV_CmpColor(PSCOLOR *col1, PSCOLOR *col2); extern BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2); extern void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor, COLORREF wincolor ); @@ -457,7 +456,6 @@ extern BOOL PSDRV_WriteGSave(PSDRV_PDEVICE *physDev); extern BOOL PSDRV_WriteGRestore(PSDRV_PDEVICE *physDev); extern BOOL PSDRV_WriteNewPath(PSDRV_PDEVICE *physDev); extern BOOL PSDRV_WriteClosePath(PSDRV_PDEVICE *physDev); -extern BOOL PSDRV_WriteInitClip(PSDRV_PDEVICE *physDev); extern BOOL PSDRV_WriteClip(PSDRV_PDEVICE *physDev); extern BOOL PSDRV_WriteRectClip(PSDRV_PDEVICE *physDev, INT x, INT y, INT w, INT h); extern BOOL PSDRV_WriteRectClip2(PSDRV_PDEVICE *physDev, CHAR *pszArrayName);

1 0

Francois Gouget : rpcrt4: Remove WINAPI on static functions where not needed.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 082147d906cc5db3f0cf901008da2849b4e6ebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082147d906cc5db3f0cf90100… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 6 03:43:50 2009 +0200 rpcrt4: Remove WINAPI on static functions where not needed. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 390a7d4..d078d69 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1808,7 +1808,7 @@ typedef struct _HttpTimerThreadData HANDLE timer_cancelled; } HttpTimerThreadData; -static VOID CALLBACK rpcrt4_http_keep_connection_active_timer_proc(PVOID param, BOOLEAN dummy) +static VOID rpcrt4_http_keep_connection_active_timer_proc(PVOID param, BOOLEAN dummy) { HINTERNET in_request = param; RpcPktHdr *idle_pkt;

1 0

Francois Gouget : winedbg: Remove an unused debug channel.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 6980949f4956d21bd22eb7ce6992c3ac045d7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6980949f4956d21bd22eb7ce6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:33:10 2009 +0200 winedbg: Remove an unused debug channel. --- programs/winedbg/crashdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 9abd5b7..3b32adb 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -27,7 +27,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #define MAX_PROGRAM_NAME_LENGTH 80

1 0

Francois Gouget : credui: Remove spaces before '\n'.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 5ecc5f73d25e3cf5b8d8149037957a56a68ee9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecc5f73d25e3cf5b8d814903… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 6 03:43:12 2009 +0200 credui: Remove spaces before '\n'. --- dlls/credui/credui_Ro.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc index 73a1140..3d3367e 100644 --- a/dlls/credui/credui_Ro.rc +++ b/dlls/credui/credui_Ro.rc @@ -47,7 +47,7 @@ STRINGTABLE DISCARDABLE IDS_INCORRECTPASSWORDTITLE "Autentificare eșuată" IDS_INCORRECTPASSWORD "Verificați numele de utilizator și parola." IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" - IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit. \n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." + IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." } #pragma code_page(default)

1 0

Francois Gouget : notepad: Make NOTEPAD_DoReplace(All)?() static.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: cdc82702ba48dd73b41b4b11ffd13a1d47d0bd78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc82702ba48dd73b41b4b11f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 6 03:34:02 2009 +0200 notepad: Make NOTEPAD_DoReplace(All)?() static. --- programs/notepad/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 5d462a0..fcea9e3 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -415,7 +415,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } -void NOTEPAD_DoReplace(FINDREPLACE *fr) +static void NOTEPAD_DoReplace(FINDREPLACE *fr) { LPTSTR content; int len = lstrlen(fr->lpstrFindWhat); @@ -447,7 +447,7 @@ void NOTEPAD_DoReplace(FINDREPLACE *fr) NOTEPAD_DoFind(fr); } -void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) +static void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) { LPTSTR content; LPTSTR found;

1 0

Stefan Leichter : gdiplus: Add stub for GdipGetImageThumbnail.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: a91a97d8ef861e461e2119943856ed70dd4b2bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91a97d8ef861e461e2119943… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue May 5 22:02:25 2009 +0200 gdiplus: Add stub for GdipGetImageThumbnail. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a9d4c9d..6b6bc79 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -295,7 +295,7 @@ @ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) @ stdcall GdipGetImageRawFormat(ptr ptr) -@ stub GdipGetImageThumbnail +@ stdcall GdipGetImageThumbnail(ptr long long ptr ptr ptr) @ stdcall GdipGetImageType(ptr ptr) @ stdcall GdipGetImageVerticalResolution(ptr ptr) @ stdcall GdipGetImageWidth(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index fde6ab3..6ab3cca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1663,3 +1663,15 @@ GpStatus WINGDIPAPI GdipImageForceValidation(GpImage *image) return Ok; } + +/***************************************************************************** + * GdipGetImageThumbnail [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT height, + GpImage **ret_image, GetThumbnailImageAbort cb, + VOID * cb_data) +{ + FIXME("(%p %u %u %p %p %p) stub\n", + image, width, height, ret_image, cb, cb_data); + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 4041c2c..3cc6d26 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -328,6 +328,7 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); +GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*); GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*);

1 0

Uwe Bonnes : wineboot: Print failing command line.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 22dde33ed28109268aa94dc32aa86e5feb11712c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22dde33ed28109268aa94dc32… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Tue May 5 20:11:51 2009 +0200 wineboot: Print failing command line. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index c647fe6..0aec488 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -506,7 +506,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, if( (res=runCmd(szCmdLine, NULL, bSynchronous, FALSE ))==INVALID_RUNCMD_RETURN ) { - WINE_ERR("Error running cmd #%d (%d)\n", i, GetLastError() ); + WINE_ERR("Error running cmd %s (%d)\n", wine_dbgstr_w(szCmdLine), GetLastError() ); } WINE_TRACE("Done processing cmd #%d\n", i);

1 0

Aric Stewart : msctf: Implement ITfMessagePump.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 1b92fcfa181c4cce4910057ff0ebea54bbf8feb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b92fcfa181c4cce4910057ff… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 5 10:52:00 2009 -0500 msctf: Implement ITfMessagePump. --- dlls/msctf/threadmgr.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 40 ++++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2d43a19..fa13a2f 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -60,6 +60,7 @@ typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; + const ITfMessagePumpVtbl *MessagePumpVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -85,6 +86,11 @@ static inline ThreadMgr *impl_from_ITfKeystrokeMgrVtbl(ITfKeystrokeMgr *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl)); } +static inline ThreadMgr *impl_from_ITfMessagePumpVtbl(ITfMessagePump *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,MessagePumpVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -163,6 +169,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->KeystrokeMgrVtbl; } + else if (IsEqualIID(iid, &IID_ITfMessagePump)) + { + *ppvOut = &This->MessagePumpVtbl; + } if (*ppvOut) { @@ -576,6 +586,80 @@ static const ITfKeystrokeMgrVtbl ThreadMgr_KeystrokeMgrVtbl = }; /***************************************************** + * ITfMessagePump functions + *****************************************************/ + +static HRESULT WINAPI MessagePump_QueryInterface(ITfMessagePump *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI MessagePump_AddRef(ITfMessagePump *iface) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI MessagePump_Release(ITfMessagePump *iface) +{ + ThreadMgr *This = impl_from_ITfMessagePumpVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI MessagePump_PeekMessageA(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + UINT wRemoveMsg, BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = PeekMessageA(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + return S_OK; +} + +static HRESULT WINAPI MessagePump_GetMessageA(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = GetMessageA(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax); + return S_OK; +} + +static HRESULT WINAPI MessagePump_PeekMessageW(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + UINT wRemoveMsg, BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = PeekMessageW(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + return S_OK; +} + +static HRESULT WINAPI MessagePump_GetMessageW(ITfMessagePump *iface, + LPMSG pMsg, HWND hwnd, UINT wMsgFilterMin, UINT wMsgFilterMax, + BOOL *pfResult) +{ + if (!pfResult) + return E_INVALIDARG; + *pfResult = GetMessageW(pMsg, hwnd, wMsgFilterMin, wMsgFilterMax); + return S_OK; +} + +static const ITfMessagePumpVtbl ThreadMgr_MessagePumpVtbl = +{ + MessagePump_QueryInterface, + MessagePump_AddRef, + MessagePump_Release, + + MessagePump_PeekMessageA, + MessagePump_GetMessageA, + MessagePump_PeekMessageW, + MessagePump_GetMessageW +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -718,6 +802,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; + This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index 9255fea..115e643 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -22,6 +22,7 @@ import "comcat.idl"; import "textstor.idl"; /* import "ctfutb.idl"; */ #endif +cpp_quote("#include <winuser.h>") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") @@ -646,3 +647,42 @@ interface ITfKeyEventSink : IUnknown [in] REFGUID rguid, [out] BOOL *pfEaten); }; + +[ + object, + local, + uuid(8f1b8ad8-0b6b-4874-90c5-bd76011e8f7c), + pointer_default(unique) +] +interface ITfMessagePump : IUnknown +{ + HRESULT PeekMessageA( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [in] UINT wRemoveMsg, + [out] BOOL *pfResult); + + HRESULT GetMessageA( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [out] BOOL *pfResult); + + HRESULT PeekMessageW( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [in] UINT wRemoveMsg, + [out] BOOL *pfResult); + + HRESULT GetMessageW( + [out] LPMSG pMsg, + [in] HWND hwnd, + [in] UINT wMsgFilterMin, + [in] UINT wMsgFilterMax, + [out] BOOL *pfResult); +};

1 0

Alexandre Julliard : winedump: Add dumping of x86_64 exception tables.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 8ad9457fca96c0070e54156d84017030e850a706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad9457fca96c0070e54156d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 12:06:20 2009 +0200 winedump: Add dumping of x86_64 exception tables. --- tools/winedump/pe.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 173 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 491228f..bbe4d56 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -520,6 +520,177 @@ static void dump_dir_exported_functions(void) printf("\n"); } + +struct runtime_function +{ + DWORD BeginAddress; + DWORD EndAddress; + DWORD UnwindData; +}; + +union handler_data +{ + struct runtime_function chain; + DWORD handler; +}; + +struct opcode +{ + BYTE offset; + BYTE code : 4; + BYTE info : 4; +}; + +struct unwind_info +{ + BYTE version : 3; + BYTE flags : 5; + BYTE prolog; + BYTE count; + BYTE frame_reg : 4; + BYTE frame_offset : 4; + struct opcode opcodes[1]; /* count entries */ + /* followed by union handler_data */ +}; + +#define UWOP_PUSH_NONVOL 0 +#define UWOP_ALLOC_LARGE 1 +#define UWOP_ALLOC_SMALL 2 +#define UWOP_SET_FPREG 3 +#define UWOP_SAVE_NONVOL 4 +#define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_SAVE_XMM128 8 +#define UWOP_SAVE_XMM128_FAR 9 +#define UWOP_PUSH_MACHFRAME 10 + +#define UNW_FLAG_EHANDLER 1 +#define UNW_FLAG_UHANDLER 2 +#define UNW_FLAG_CHAININFO 4 + +static void dump_x86_64_unwind_info( const struct runtime_function *function ) +{ + static const char * const reg_names[16] = + { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; + + union handler_data *handler_data; + const struct unwind_info *info; + unsigned int i, count; + + printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); + if (function->UnwindData & 1) + { + const struct runtime_function *next = RVA( function->UnwindData & ~1, sizeof(*next) ); + printf( " -> function %08x-%08x\n", next->BeginAddress, next->EndAddress ); + return; + } + info = RVA( function->UnwindData, sizeof(*info) ); + + printf( " unwind info at %08x\n", function->UnwindData ); + if (info->version != 1) + { + printf( " *** unknown version %u\n", info->version ); + return; + } + printf( " flags %x", info->flags ); + if (info->flags & UNW_FLAG_EHANDLER) printf( " EHANDLER" ); + if (info->flags & UNW_FLAG_UHANDLER) printf( " UHANDLER" ); + if (info->flags & UNW_FLAG_CHAININFO) printf( " CHAININFO" ); + printf( "\n prolog 0x%x bytes\n", info->prolog ); + + if (info->frame_reg) + printf( " frame register %s offset 0x%x(%%rsp)\n", + reg_names[info->frame_reg], info->frame_offset * 16 ); + + for (i = 0; i < info->count; i++) + { + printf( " 0x%02x: ", info->opcodes[i].offset ); + switch (info->opcodes[i].code) + { + case UWOP_PUSH_NONVOL: + printf( "push %%%s\n", reg_names[info->opcodes[i].info] ); + break; + case UWOP_ALLOC_LARGE: + if (info->opcodes[i].info) + { + count = *(DWORD *)&info->opcodes[i+1]; + i += 2; + } + else + { + count = *(USHORT *)&info->opcodes[i+1] * 8; + i++; + } + printf( "sub $0x%x,%%rsp\n", count ); + break; + case UWOP_ALLOC_SMALL: + count = (info->opcodes[i].info + 1) * 8; + printf( "sub $0x%x,%%rsp\n", count ); + break; + case UWOP_SET_FPREG: + printf( "lea 0x%x(%%rsp),%s\n", + info->frame_offset * 16, reg_names[info->frame_reg] ); + break; + case UWOP_SAVE_NONVOL: + count = *(USHORT *)&info->opcodes[i+1] * 8; + printf( "mov %%%s,0x%x(%%rsp)\n", reg_names[info->opcodes[i].info], count ); + i++; + break; + case UWOP_SAVE_NONVOL_FAR: + count = *(DWORD *)&info->opcodes[i+1]; + printf( "mov %%%s,0x%x(%%rsp)\n", reg_names[info->opcodes[i].info], count ); + i += 2; + break; + case UWOP_SAVE_XMM128: + count = *(USHORT *)&info->opcodes[i+1] * 16; + printf( "movaps %%xmm%u,0x%x(%%rsp)\n", info->opcodes[i].info, count ); + i++; + break; + case UWOP_SAVE_XMM128_FAR: + count = *(DWORD *)&info->opcodes[i+1]; + printf( "movaps %%xmm%u,0x%x(%%rsp)\n", info->opcodes[i].info, count ); + i += 2; + break; + case UWOP_PUSH_MACHFRAME: + printf( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); + break; + default: + printf( "*** unknown code %u\n", info->opcodes[i].code ); + break; + } + } + + handler_data = (union handler_data *)&info->opcodes[(info->count + 1) & ~1]; + if (info->flags & UNW_FLAG_CHAININFO) + { + printf( " -> function %08x-%08x\n", + handler_data->chain.BeginAddress, handler_data->chain.EndAddress ); + return; + } + if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) + printf( " handler %08x data at %08x\n", handler_data->handler, + function->UnwindData + (char *)(&handler_data->handler + 1) - (char *)info ); +} + +static void dump_dir_exceptions(void) +{ + unsigned int i, size = 0; + const struct runtime_function *funcs = get_dir_and_size(IMAGE_FILE_EXCEPTION_DIRECTORY, &size); + const IMAGE_FILE_HEADER *file_header = &PE_nt_headers->FileHeader; + + if (!funcs) return; + + if (file_header->Machine == IMAGE_FILE_MACHINE_AMD64) + { + size /= sizeof(*funcs); + printf( "Exception info (%u functions):\n", size ); + for (i = 0; i < size; i++) dump_x86_64_unwind_info( funcs + i ); + } + else printf( "Exception information not supported for %s binaries\n", + get_machine_str(file_header->Machine)); +} + + static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il) { /* FIXME: This does not properly handle large images */ @@ -1295,6 +1466,8 @@ void pe_dump(void) dump_dir_clr_header(); if (all || !strcmp(globals.dumpsect, "reloc")) dump_dir_reloc(); + if (all || !strcmp(globals.dumpsect, "except")) + dump_dir_exceptions(); } if (globals.do_debug) dump_debug();

1 0