February 2007 - Wine-Commits

Rob Shearman : widl: Print EXPR_NUM expresssions as unsigned to avoid printing an extra negative sign when lval is large .
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 94a0a9016500bbaf5a8986e76394d4f49bc6e37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a0a9016500bbaf5a8986e76… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 26 15:06:21 2007 +0000 widl: Print EXPR_NUM expresssions as unsigned to avoid printing an extra negative sign when lval is large. --- tools/widl/header.c | 2 +- tools/widl/typegen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6cf52b1..6e4a8fc 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -363,7 +363,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_VOID: break; case EXPR_NUM: - fprintf(h, "%ld", e->u.lval); + fprintf(h, "%lu", e->u.lval); break; case EXPR_HEXNUM: fprintf(h, "0x%lx", e->u.lval); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b72e87b..9d13a2d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2177,7 +2177,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_VOID: break; case EXPR_NUM: - fprintf(h, "%ld", e->u.lval); + fprintf(h, "%lu", e->u.lval); break; case EXPR_HEXNUM: fprintf(h, "0x%lx", e->u.lval);

1 0

Rob Shearman : ole32: The stream returned by StgStreamImpl_Clone should have one reference, so call AddRef before returning.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 3bd31cfd1620cbc826c840e857e212fbf4c215a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd31cfd1620cbc826c840e85… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 26 12:57:19 2007 +0000 ole32: The stream returned by StgStreamImpl_Clone should have one reference, so call AddRef before returning. Move the call to StorageBaseImpl_AddStream to StgStreamImpl_Construct to fix StgStreamImpl_Clone, which forgets to call it. Add tests for OLE structured storage tests for IStream::Clone. --- dlls/ole32/stg_stream.c | 5 +++++ dlls/ole32/storage32.c | 15 +-------------- dlls/ole32/storage32.h | 1 + dlls/ole32/tests/storage32.c | 6 ++++++ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 63bdaad..6f2ec9a 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -880,6 +880,8 @@ static HRESULT WINAPI StgStreamImpl_Clone( return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */ *ppstm = (IStream*) new_stream; + IStream_AddRef(*ppstm); + seek_pos.QuadPart = This->currentPosition.QuadPart; hres=StgStreamImpl_Seek (*ppstm, seek_pos, STREAM_SEEK_SET, NULL); @@ -974,6 +976,9 @@ StgStreamImpl* StgStreamImpl_Construct( * this stream are large or small. */ StgStreamImpl_OpenBlockChain(newStream); + + /* add us to the storage's list of active streams */ + StorageBaseImpl_AddStream(parentStorage, newStream); } return newStream; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c575ce5..dc2db11 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -93,8 +93,6 @@ static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This); static void StorageImpl_SaveFileHeader(StorageImpl* This); -static void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm); - static void Storage32Impl_AddBlockDepot(StorageImpl* This, ULONG blockIndex); static ULONG Storage32Impl_AddExtBlockDepot(StorageImpl* This); static ULONG Storage32Impl_GetNextExtendedBlock(StorageImpl* This, ULONG blockIndex); @@ -468,12 +466,6 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( */ IStream_AddRef(*ppstm); - /* - * add us to the storage's list of active streams - */ - - StorageBaseImpl_AddStream(This,newStream); - res = S_OK; goto end; } @@ -1063,11 +1055,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( * the reference. */ IStream_AddRef(*ppstm); - - /* add us to the storage's list of active streams - */ - StorageBaseImpl_AddStream(This,newStream); - } else { @@ -1895,7 +1882,7 @@ static HRESULT WINAPI StorageImpl_Stat( IStorage* iface, * Internal stream list handlers */ -static void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) +void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) { TRACE("Stream added (stg=%p strm=%p)\n", stg, strm); list_add_tail(&stg->strmHead,&strm->StrmListEntry); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 5f2aea8..569cb36 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -257,6 +257,7 @@ struct StorageBaseImpl * StorageBaseImpl stream list handlers */ +void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm); void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm); /**************************************************************************** diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 9a90ad3..710aa45 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -232,6 +232,7 @@ static void test_storage_stream(void) IStorage *stg = NULL; HRESULT r; IStream *stm = NULL; + IStream *stm2 = NULL; ULONG count = 0; LARGE_INTEGER pos; ULARGE_INTEGER p; @@ -281,6 +282,9 @@ static void test_storage_stream(void) r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); + r = IStream_Clone(stm, &stm2); + ok(r==S_OK, "failed to clone stream\n"); + r = IStream_Write(stm, NULL, 0, NULL ); ok(r==STG_E_INVALIDPOINTER, "IStream->Write wrong error\n"); r = IStream_Write(stm, "Hello\n", 0, NULL ); @@ -317,6 +321,8 @@ static void test_storage_stream(void) ok(count == 0, "read bytes from empty stream\n"); /* wrap up */ + r = IStream_Release(stm2); + ok(r == 0, "wrong ref count\n"); r = IStream_Release(stm); ok(r == 0, "wrong ref count\n"); r = IStorage_Release(stg);

1 0

Misha Koshelev : oleview: Add safearray type.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 85aefa3567e9a3dcfce749a62e0395b3d56acdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aefa3567e9a3dcfce749a62… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 25 12:40:42 2007 -0600 oleview: Add safearray type. --- programs/oleview/typelib.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 37c2a75..779ed26 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -76,6 +76,7 @@ static const WCHAR wszVT_UNKNOWN[] = { 'I','U','n','k','n','o','w','n','\0' }; static const WCHAR wszVT_DISPATCH[] = { 'I','D','i','s','p','a','t','c','h','\0' }; static const WCHAR wszVT_DATE[] = { 'D','A','T','E','\0' }; static const WCHAR wszVT_R8[] = { 'd','o','u','b','l','e','\0' }; +static const WCHAR wszVT_SAFEARRAY[] = { 'S','A','F','E','A','R','R','A','Y','\0' }; const WCHAR wszFormat[] = { '0','x','%','.','8','l','x','\0' }; static const WCHAR wszStdCall[] = { '_','s','t','d','c','a','l','l','\0' }; @@ -342,6 +343,12 @@ void CreateTypeInfo(WCHAR *wszAddTo, WCHAR *wszAddAfter, TYPEDESC tdesc, ITypeIn } CreateTypeInfo(wszAddTo, wszAddAfter, U(tdesc).lpadesc->tdescElem, pTypeInfo); break; + case VT_SAFEARRAY: + AddToStrW(wszAddTo, wszVT_SAFEARRAY); + AddToStrW(wszAddTo, wszOpenBrackets2); + CreateTypeInfo(wszAddTo, wszAddAfter, *U(tdesc).lptdesc, pTypeInfo); + AddToStrW(wszAddTo, wszCloseBrackets2); + break; case VT_PTR: CreateTypeInfo(wszAddTo, wszAddAfter, *U(tdesc).lptdesc, pTypeInfo); AddToStrW(wszAddTo, wszAsterix);

1 0

Misha Koshelev : oleview: Make optional flag "optional" not "opt.".
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 15d10978aef27370083aa1f79ffb87d1ba9576fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d10978aef27370083aa1f79… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 25 01:36:36 2007 -0600 oleview: Make optional flag "optional" not "opt.". --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 6af26ec..37c2a75 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -87,7 +87,7 @@ static const WCHAR wszPARAMFLAG_FIN[] = { 'i','n','\0' }; static const WCHAR wszPARAMFLAG_FOUT[] = { 'o','u','t','\0' }; static const WCHAR wszPARAMFLAG_FLCID[] = { 'c','i','d','\0' }; static const WCHAR wszPARAMFLAG_FRETVAL[] = { 'r','e','t','v','a','l','\0' }; -static const WCHAR wszPARAMFLAG_FOPT[] = { 'o','p','t','\0' }; +static const WCHAR wszPARAMFLAG_FOPT[] = { 'o','p','t','i','o','n','a','l','\0' }; static const WCHAR wszPARAMFLAG_FHASCUSTDATA[] = { 'h','a','s','c','u','s','t','d','a','t','a','\0' }; static const WCHAR wszDefaultValue[]

1 0

Misha Koshelev : oleview: Add forgotten newlines to forward declarations.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: e16318657a9c5af84ff988c6363e9de5b01fe626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16318657a9c5af84ff988c63… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 25 01:37:08 2007 -0600 oleview: Add forgotten newlines to forward declarations. --- programs/oleview/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 1a206a3..6af26ec 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -752,6 +752,7 @@ void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData) hFirst = TreeView_GetChild(typelib.hTree, hFirst); AddToTLDataStrWithTabsW(pTLData, wszPredefinition); + AddToTLDataStrW(pTLData, wszNewLine); hCur = hFirst; memset(&tvi, 0, sizeof(TVITEM)); @@ -766,6 +767,7 @@ void AddPredefinitions(HTREEITEM hFirst, TYPELIB_DATA *pTLData) { AddToStrW(wszText, wszSemicolon); AddToTLDataStrWithTabsW(pTLData, wszText); + AddToTLDataStrW(pTLData, wszNewLine); } hCur = TreeView_GetNextSibling(typelib.hTree, hCur); }

1 0

Misha Koshelev : oleview: Properly support enumerations.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 633e038b14792d6b592df49fd251c627935ef4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=633e038b14792d6b592df49fd… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 25 17:09:19 2007 -0600 oleview: Properly support enumerations. --- programs/oleview/typelib.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 98abc05..1a206a3 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -32,6 +32,7 @@ static const WCHAR wszFailed[] = { '<','f','a','i','l','e','d','>','\0' }; static const WCHAR wszSpace[] = { ' ','\0' }; static const WCHAR wszAsterix[] = { '*','\0' }; static const WCHAR wszComa[] = { ',','\0' }; +static const WCHAR wszEquals[] = { '=','\0' }; static const WCHAR wszSemicolon[] = { ';','\0' }; static const WCHAR wszNewLine[] = { '\n','\0' }; static const WCHAR wszOpenBrackets1[] = { '[','\0' }; @@ -428,6 +429,60 @@ int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) return 0; } +int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) +{ + int i; + TVINSERTSTRUCT tvis; + VARDESC *pVarDesc; + BSTR bstrName; + WCHAR wszText[MAX_LOAD_STRING]; + + U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; + U(tvis).item.cchTextMax = MAX_LOAD_STRING; + U(tvis).item.pszText = wszText; + tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hParent = hParent; + + for(i=0; i<cVars; i++) + { + TYPELIB_DATA *tld; + + if(FAILED(ITypeInfo_GetVarDesc(pTypeInfo, i, &pVarDesc))) continue; + if(FAILED(ITypeInfo_GetDocumentation(pTypeInfo, pVarDesc->memid, &bstrName, + NULL, NULL, NULL))) continue; + + tld = InitializeTLData(); + U(tvis).item.lParam = (LPARAM) tld; + + memset(wszText, 0, sizeof(wszText)); + AddToStrW(wszText, bstrName); + + if (pVarDesc->varkind == VAR_CONST) + { + VARIANT var; + VariantInit(&var); + if (VariantChangeType(&var, pVarDesc->lpvarValue, 0, VT_BSTR) == S_OK) + { + AddToStrW(wszText, wszSpace); + AddToStrW(wszText, wszEquals); + AddToStrW(wszText, wszSpace); + AddToStrW(wszText, V_BSTR(&var)); + } + } + + AddToTLDataStrW(tld, wszText); + if (i<cVars-1) + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszNewLine); + + SendMessage(typelib.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); + SysFreeString(bstrName); + ITypeInfo_ReleaseVarDesc(pTypeInfo, pVarDesc); + } + + return 0; +} + int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) { int i, j, tabSize; @@ -1032,6 +1087,12 @@ int PopulateTree(void) AddToStrW(tld->wszInsertAfter, bstrName); AddToStrW(tld->wszInsertAfter, wszSemicolon); AddToStrW(tld->wszInsertAfter, wszNewLine); + + bInsert = FALSE; + hParent = TreeView_InsertItem(typelib.hTree, &tvis); + EnumEnums(pTypeInfo, pTypeAttr->cVars, hParent); + AddChildrenData(hParent, tld); + AddToTLDataStrW(tld, tld->wszInsertAfter); break; case TKIND_RECORD: AddToTLDataStrW(tld, wszTKIND_RECORD);

1 0

Misha Koshelev : oleview: Report default values.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: a5d7c2fb1986b37ebc09041f63c74297c4e8b97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d7c2fb1986b37ebc09041f6… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 25 01:35:10 2007 -0600 oleview: Report default values. --- programs/oleview/typelib.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c452343..98abc05 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -87,10 +87,10 @@ static const WCHAR wszPARAMFLAG_FOUT[] = { 'o','u','t','\0' }; static const WCHAR wszPARAMFLAG_FLCID[] = { 'c','i','d','\0' }; static const WCHAR wszPARAMFLAG_FRETVAL[] = { 'r','e','t','v','a','l','\0' }; static const WCHAR wszPARAMFLAG_FOPT[] = { 'o','p','t','\0' }; -static const WCHAR wszPARAMFLAG_FHASDEFAULT[] - = { 'h','a','s','d','e','f','a','u','l','t','\0' }; static const WCHAR wszPARAMFLAG_FHASCUSTDATA[] = { 'h','a','s','c','u','s','t','d','a','t','a','\0' }; +static const WCHAR wszDefaultValue[] + = { 'd','e','f','a','u','l','t','v','a','l','u','e','\0' }; static const WCHAR wszReadOnly[] = { 'r','e','a','d','o','n','l','y','\0' }; @@ -559,9 +559,32 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int cFuncs, HTREEITEM hParent) ENUM_PARAM_FLAG(PARAMFLAG_FLCID); ENUM_PARAM_FLAG(PARAMFLAG_FRETVAL); ENUM_PARAM_FLAG(PARAMFLAG_FOPT); - ENUM_PARAM_FLAG(PARAMFLAG_FHASDEFAULT); ENUM_PARAM_FLAG(PARAMFLAG_FHASCUSTDATA); + if(U(pFuncDesc->lprgelemdescParam[j]).paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + { + VARIANT var, *param=&U(pFuncDesc->lprgelemdescParam[j]).paramdesc.pparamdescex->varDefaultValue; + VariantInit(&var); + if(bFirst) AddToTLDataStrW(tld, + wszOpenBrackets1); + else + { + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(tld, wszDefaultValue); + AddToTLDataStrW(tld, wszOpenBrackets2); + if (V_VT(param) == VT_BSTR) + { + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, V_BSTR(&var)); + AddToTLDataStrW(tld, wszInvertedComa); + } else if (VariantChangeType(&var, param, 0, VT_BSTR) == S_OK) + AddToTLDataStrW(tld, V_BSTR(&var)); + AddToTLDataStrW(tld, wszCloseBrackets2); + } + if(!bFirst) { AddToTLDataStrW(tld, wszCloseBrackets1);

1 0

Pierre d'Herbemont : winex11.drv: Check the valid rects after the set_window_pos wineserver call.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 0e28140ff8d59f28791663e63c59075e102de105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e28140ff8d59f28791663e63… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Fri Feb 23 20:26:28 2007 +0100 winex11.drv: Check the valid rects after the set_window_pos wineserver call. --- dlls/winex11.drv/winpos.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 56c2b7c..e41b11f 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -258,25 +258,6 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, old_client_rect = data->client_rect; - if (!IsRectEmpty( &valid_rects[0] )) - { - int x_offset = 0, y_offset = 0; - - if (data->whole_window) - { - /* the X server will move the bits for us */ - x_offset = data->whole_rect.left - new_whole_rect.left; - y_offset = data->whole_rect.top - new_whole_rect.top; - } - - if (x_offset != valid_rects[1].left - valid_rects[0].left || - y_offset != valid_rects[1].top - valid_rects[0].top) - { - /* FIXME: should copy the window bits here */ - valid_rects = NULL; - } - } - if (!(win = WIN_GetPtr( hwnd ))) return FALSE; if (win == WND_OTHER_PROCESS) { @@ -343,7 +324,29 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, TRACE( "win %p window %s client %s style %08x\n", hwnd, wine_dbgstr_rect(rectWindow), wine_dbgstr_rect(rectClient), new_style ); - /* FIXME: copy the valid bits */ + if (!IsRectEmpty( &valid_rects[0] )) + { + int x_offset = 0, y_offset = 0; + + if (data->whole_window) + { + /* the X server will move the bits for us */ + x_offset = data->whole_rect.left - new_whole_rect.left; + y_offset = data->whole_rect.top - new_whole_rect.top; + } + + if (x_offset != valid_rects[1].left - valid_rects[0].left || + y_offset != valid_rects[1].top - valid_rects[0].top) + { + /* FIXME: should copy the window bits here */ + RECT invalid_rect = valid_rects[0]; + + /* invalid_rects are relative to the client area */ + OffsetRect( &invalid_rect, -rectClient->left, -rectClient->top ); + RedrawWindow( hwnd, &invalid_rect, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); + } + } + if (data->whole_window && !data->lock_changes) {

1 0

Aric Stewart : imm32: Properly send WM_IME_NOTIFY using SendMessage.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: 99cb61ee8a8d122bb6f2b75751f02213886fc58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99cb61ee8a8d122bb6f2b7575… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 26 18:12:33 2007 +0900 imm32: Properly send WM_IME_NOTIFY using SendMessage. --- dlls/imm32/imm.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 69cd490..ff4916a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -169,6 +169,21 @@ static void ImmInternalPostIMEMessage(UINT msg, WPARAM wParam, LPARAM lParam) PostMessageW(target, msg, wParam, lParam); } +static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) +{ + LRESULT rc = 0; + + if (root_context->hwnd) + rc = SendMessageW(root_context->hwnd, WM_IME_NOTIFY, notify, lParam); + else + { + HWND target = GetFocus(); + if (target) + rc = SendMessageW(target, WM_IME_NOTIFY, notify, lParam); + } + + return rc; +} static void ImmInternalSetOpenStatus(BOOL fOpen) { @@ -202,7 +217,7 @@ static void ImmInternalSetOpenStatus(BOOL fOpen) else ShowWindow(hwndDefault, SW_SHOWNOACTIVATE); - SendMessageW(root_context->hwnd, WM_IME_NOTIFY, IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); } @@ -1231,7 +1246,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->font.lfFaceName, LF_FACESIZE); - ImmInternalPostIMEMessage(WM_IME_NOTIFY, IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1255,7 +1270,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) return FALSE; memcpy(&data->font,lplf,sizeof(LOGFONTW)); - ImmInternalPostIMEMessage(WM_IME_NOTIFY, IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1406,7 +1421,7 @@ BOOL WINAPI ImmSetCompositionWindow( if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); - ImmInternalPostIMEMessage(WM_IME_NOTIFY,IMN_SETCOMPOSITIONWINDOW, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; } @@ -1435,7 +1450,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) if (hIMC == (HIMC)FROM_IME) { ImmInternalSetOpenStatus(fOpen); - ImmInternalPostIMEMessage(WM_IME_NOTIFY, IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); return TRUE; }

1 0

Eric Pouech : dbghelp: Handle the . gnu_debuglink files with the newly added alternate mechanism.
by Alexandre Julliard Feb. 26, 2007

Feb. 26, 2007

Module: wine Branch: master Commit: e161dd92ee6b472df39fe9de3a705df7984cac2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e161dd92ee6b472df39fe9de3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Feb 24 21:01:15 2007 +0100 dbghelp: Handle the .gnu_debuglink files with the newly added alternate mechanism. --- dlls/dbghelp/elf_module.c | 118 +++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 67 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 4d15cb3..4b67ee1 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -112,8 +112,6 @@ struct elf_file_map const char* mapped; }* sect; int fd; - unsigned with_crc; - unsigned long crc; const char* shstrtab; struct elf_file_map* alternate; /* another ELF file (linked to this one) */ }; @@ -266,7 +264,6 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct elf_file_map* fmap) WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); fmap->fd = -1; - fmap->with_crc = 0; fmap->shstrtab = ELF_NO_MAP; fmap->alternate = NULL; @@ -856,10 +853,18 @@ static DWORD calc_crc32(struct elf_file_map* fmap) #undef UPDC32 } -static BOOL elf_load_debug_info_from_map(struct module* module, - struct elf_file_map* fmap, - struct pool* pool, - struct hash_table* ht_symtab); +static BOOL elf_check_debug_link(const WCHAR* file, struct elf_file_map* fmap, DWORD crc) +{ + BOOL ret; + if (!elf_map_file(file, fmap)) return FALSE; + if (!(ret = crc == calc_crc32(fmap))) + { + WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", + debugstr_w(file), calc_crc32(fmap), crc); + elf_unmap_file(fmap); + } + return ret; +} /****************************************************************** * elf_locate_debug_link @@ -880,20 +885,24 @@ static BOOL elf_load_debug_info_from_map(struct module* module, * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static WCHAR* elf_locate_debug_link(const char* filename, const WCHAR* loaded_file, - struct elf_file_map* fmap_link) +static BOOL elf_locate_debug_link(struct elf_file_map* fmap, const char* filename, + const WCHAR* loaded_file, DWORD crc) { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; const size_t globalDebugDirLen = sizeof(globalDebugDirW) / sizeof(WCHAR); size_t filename_len; - WCHAR* p; + WCHAR* p = NULL; WCHAR* slash; + struct elf_file_map* fmap_link = NULL; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); p = HeapAlloc(GetProcessHeap(), 0, (globalDebugDirLen + strlenW(loaded_file) + 6 + 1 + filename_len + 1) * sizeof(WCHAR)); - if (!p) return FALSE; + if (!p) goto found; /* we prebuild the string with "execdir" */ strcpyW(p, loaded_file); @@ -902,33 +911,34 @@ static WCHAR* elf_locate_debug_link(const char* filename, const WCHAR* loaded_fi /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (elf_map_file(p, fmap_link)) goto found; - - HeapValidate(GetProcessHeap(), 0, 0); + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* testing execdir/.debug/filename */ memcpy(slash, dotDebugW, sizeof(dotDebugW)); MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + sizeof(dotDebugW) / sizeof(WCHAR), filename_len); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* testing globaldebugdir/execdir/filename */ memmove(p + globalDebugDirLen, p, (slash - p) * sizeof(WCHAR)); memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR)); slash += globalDebugDirLen; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (elf_map_file(p, fmap_link)) goto found; + if (elf_check_debug_link(p, fmap_link, crc)) goto found; /* finally testing filename */ - if (elf_map_file(slash, fmap_link)) goto found; + if (elf_check_debug_link(slash, fmap_link, crc)) goto found; - HeapFree(GetProcessHeap(), 0, p); WARN("Couldn't locate or map %s\n", filename); - return NULL; + HeapFree(GetProcessHeap(), 0, p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; found: TRACE("Located debug information file %s at %s\n", filename, debugstr_w(p)); - return p; + HeapFree(GetProcessHeap(), 0, p); + fmap->alternate = fmap_link; + return TRUE; } /****************************************************************** @@ -937,10 +947,8 @@ found: * Parses a .gnu_debuglink section and loads the debug info from * the external file specified there. */ -static BOOL elf_debuglink_parse (struct module* module, - struct pool* pool, - struct hash_table* ht_symtab, - const BYTE* debuglink) +static BOOL elf_debuglink_parse(struct elf_file_map* fmap, struct module* module, + const BYTE* debuglink) { /* The content of a debug link section is: * 1/ a NULL terminated string, containing the file name for the @@ -948,28 +956,11 @@ static BOOL elf_debuglink_parse (struct module* module, * 2/ padding on 4 byte boundary * 3/ CRC of the linked ELF file */ - BOOL ret = FALSE; const char* dbg_link = (char*)debuglink; - struct elf_file_map fmap_link; - WCHAR* link_file; + DWORD crc; - link_file = elf_locate_debug_link(dbg_link, module->module.LoadedImageName, &fmap_link); - - if (link_file) - { - fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - fmap_link.with_crc = 1; - ret = elf_load_debug_info_from_map(module, &fmap_link, pool, - ht_symtab); - if (ret) - strcpyW(module->module.LoadedPdbName,link_file); - else - WARN("Couldn't load debug information from %s\n", debugstr_w(link_file)); - elf_unmap_file(&fmap_link); - HeapFree(GetProcessHeap(), 0, link_file); - } - - return ret; + crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + return elf_locate_debug_link(fmap, dbg_link, module->module.LoadedImageName, crc); } /****************************************************************** @@ -1002,14 +993,6 @@ static BOOL elf_load_debug_info_from_map(struct module* module, {NULL, 0, 0, 0} }; - if (fmap->with_crc && (fmap->crc != calc_crc32(fmap))) - { - ERR("Bad CRC for module %s (got %08x while expecting %08lx)\n", - debugstr_w(module->module.LoadedImageName), calc_crc32(fmap), fmap->crc); - /* we don't tolerate mis-matched files */ - return FALSE; - } - module->module.SymType = SymExport; /* create a hash table for the symtab */ @@ -1022,6 +1005,22 @@ static BOOL elf_load_debug_info_from_map(struct module* module, debug_line_sect, debug_loclist_sect; struct elf_section_map debuglink_sect; + /* if present, add the .gnu_debuglink file as an alternate to current one */ + if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) + { + const BYTE* dbg_link; + + dbg_link = (const BYTE*)elf_map_section(&debuglink_sect); + if (dbg_link != ELF_NO_MAP) + { + lret = elf_debuglink_parse(fmap, module, dbg_link); + if (!lret) + WARN("Couldn't load linked debug file for %s\n", + debugstr_w(module->module.ModuleName)); + ret = ret || lret; + } + elf_unmap_section(&debuglink_sect); + } if (elf_find_section(fmap, ".stab", SHT_NULL, &stab_sect) && elf_find_section(fmap, ".stabstr", SHT_NULL, &stabstr_sect)) { @@ -1088,21 +1087,6 @@ static BOOL elf_load_debug_info_from_map(struct module* module, elf_unmap_section(&debug_line_sect); elf_unmap_section(&debug_loclist_sect); } - if (elf_find_section(fmap, ".gnu_debuglink", SHT_NULL, &debuglink_sect)) - { - const BYTE* dbg_link; - - dbg_link = (const BYTE*)elf_map_section(&debuglink_sect); - if (dbg_link != ELF_NO_MAP) - { - lret = elf_debuglink_parse(module, pool, ht_symtab, dbg_link); - if (!lret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->module.ModuleName)); - ret = ret || lret; - } - elf_unmap_section(&debuglink_sect); - } } if (strstrW(module->module.ModuleName, S_ElfW) || !strcmpW(module->module.ModuleName, S_WineLoaderW))

1 0