March 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : rsaenh: Remove superfluous casts of zero.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: f2a331cd0ce3d508981152a84adf9d7ff8b766c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a331cd0ce3d508981152a84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 28 23:50:48 2010 +0200 rsaenh: Remove superfluous casts of zero. --- dlls/rsaenh/sha2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index d15e6fb..6c1a2e6 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -582,7 +582,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { *buffer++ = sha2_hex_digits[*d & 0x0f]; d++; } - *buffer = (char)0; + *buffer = 0; } else { MEMSET_BZERO(context, sizeof(context)); } @@ -911,7 +911,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { *buffer++ = sha2_hex_digits[*d & 0x0f]; d++; } - *buffer = (char)0; + *buffer = 0; } else { MEMSET_BZERO(context, sizeof(context)); } @@ -986,7 +986,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { *buffer++ = sha2_hex_digits[*d & 0x0f]; d++; } - *buffer = (char)0; + *buffer = 0; } else { MEMSET_BZERO(context, sizeof(context)); }

1 0

Mikhail Maroukhine : comctl32: Fix incorrect const type casting.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 3cad4a1d1623132beadec5164d4096062314c5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cad4a1d1623132beadec5164… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 18:23:45 2010 +0600 comctl32: Fix incorrect const type casting. --- dlls/comctl32/status.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index d0675da..1b69ef2 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -728,7 +728,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) static BOOL STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, - LPCWSTR text, BOOL isW) + LPWSTR text, BOOL isW) { STATUSWINDOWPART *part=NULL; BOOL changed = FALSE; @@ -759,7 +759,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, if (style & SBT_OWNERDRAW) { if (!(oldStyle & SBT_OWNERDRAW)) Free (part->text); - part->text = (LPWSTR)text; + part->text = text; } else { LPWSTR ntext; WCHAR *idx; @@ -1248,10 +1248,10 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_SetParts (infoPtr, (INT)wParam, (LPINT)lParam); case SB_SETTEXTA: - return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, FALSE); + return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPWSTR)lParam, FALSE); case SB_SETTEXTW: - return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, TRUE); + return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPWSTR)lParam, TRUE); case SB_SETTIPTEXTA: return STATUSBAR_SetTipTextA (infoPtr, (INT)wParam, (LPSTR)lParam);

1 0

Mikhail Maroukhine : comctl32: Fix compiler warnings.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6443d8754326db22ca79258d264b4b077d51232a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6443d8754326db22ca79258d2… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 20:49:09 2010 +0600 comctl32: Fix compiler warnings. --- dlls/comctl32/propsheet.c | 63 +++++++++++++++++++-------------------- dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4f197f6..25a9218 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1370,10 +1370,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, const PropSheetInfo * psInfo, LPCPROPSHEETPAGEW ppshpage) { - DLGTEMPLATE* pTemplate; + const DLGTEMPLATE* pTemplate; HWND hwndPage; DWORD resSize; - LPVOID temp = NULL; + DLGTEMPLATE* pTemplateCopy = NULL; TRACE("index %d\n", index); @@ -1384,7 +1384,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if (ppshpage->dwFlags & PSP_DLGINDIRECT) { - pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource; + pTemplate = ppshpage->u.pResource; resSize = GetTemplateSize(pTemplate); } else if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) @@ -1431,39 +1431,38 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, * Make a copy of the dialog template to make it writable */ } - temp = Alloc(resSize); - if (!temp) + pTemplateCopy = Alloc(resSize); + if (!pTemplateCopy) return FALSE; - TRACE("copying pTemplate %p into temp %p (%d)\n", pTemplate, temp, resSize); - memcpy(temp, pTemplate, resSize); - pTemplate = temp; + TRACE("copying pTemplate %p into pTemplateCopy %p (%d)\n", pTemplate, pTemplateCopy, resSize); + memcpy(pTemplateCopy, pTemplate, resSize); - if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF) + if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF) { - ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~DS_MODALFRAME; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_CAPTION; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_SYSMENU; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_THICKFRAME; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~DS_MODALFRAME; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_CAPTION; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_SYSMENU; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_POPUP; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_DISABLED; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_VISIBLE; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_THICKFRAME; - ((MyDLGTEMPLATEEX*)pTemplate)->exStyle |= WS_EX_CONTROLPARENT; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->exStyle |= WS_EX_CONTROLPARENT; } else { - pTemplate->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; - pTemplate->style &= ~DS_MODALFRAME; - pTemplate->style &= ~WS_CAPTION; - pTemplate->style &= ~WS_SYSMENU; - pTemplate->style &= ~WS_POPUP; - pTemplate->style &= ~WS_DISABLED; - pTemplate->style &= ~WS_VISIBLE; - pTemplate->style &= ~WS_THICKFRAME; + pTemplateCopy->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; + pTemplateCopy->style &= ~DS_MODALFRAME; + pTemplateCopy->style &= ~WS_CAPTION; + pTemplateCopy->style &= ~WS_SYSMENU; + pTemplateCopy->style &= ~WS_POPUP; + pTemplateCopy->style &= ~WS_DISABLED; + pTemplateCopy->style &= ~WS_VISIBLE; + pTemplateCopy->style &= ~WS_THICKFRAME; - pTemplate->dwExtendedStyle |= WS_EX_CONTROLPARENT; + pTemplateCopy->dwExtendedStyle |= WS_EX_CONTROLPARENT; } if (psInfo->proppage[index].useCallback) @@ -1472,18 +1471,18 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) hwndPage = CreateDialogIndirectParamW(ppshpage->hInstance, - pTemplate, + pTemplateCopy, hwndParent, ppshpage->pfnDlgProc, (LPARAM)ppshpage); else hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance, - pTemplate, + pTemplateCopy, hwndParent, ppshpage->pfnDlgProc, (LPARAM)ppshpage); /* Free a no more needed copy */ - Free(temp); + Free(pTemplateCopy); psInfo->proppage[index].hwndPage = hwndPage; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 5290788..9542e64 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -833,7 +833,7 @@ static void check_bitmap_data(const char *bm_data, ULONG bm_data_size, static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT max) { - ILHEAD *ilh = (ILHEAD *)ilh_data; + const ILHEAD *ilh = (const ILHEAD *)ilh_data; ok(ilh->usMagic == IMAGELIST_MAGIC, "wrong usMagic %4x (expected %02x)\n", ilh->usMagic, IMAGELIST_MAGIC); ok(ilh->usVersion == 0x101, "wrong usVersion %x (expected 0x101)\n", ilh->usVersion);

1 0

Nikolay Sivov : shlwapi: Use public define for QISearch table entry, make it available by name (as on Vista+).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 1372806e746ab3796e08f00c058bacd2cb93eab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1372806e746ab3796e08f00c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 19:23:19 2010 +0300 shlwapi: Use public define for QISearch table entry, make it available by name (as on Vista+). --- dlls/shlwapi/ordinal.c | 40 ++++++++++++++++++---------------------- dlls/shlwapi/shlwapi.spec | 2 +- include/shlwapi.h | 9 +++++++++ 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index bb17734..a79eace 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1634,6 +1634,8 @@ BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName) { HMENU hMenu; + TRACE("%p %s\n", hInst, debugstr_w(szName)); + if ((hMenu = LoadMenuW(hInst, szName))) { if (GetSubMenu(hMenu, 0)) @@ -1791,6 +1793,8 @@ BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, DWORD dwEffect = DROPEFFECT_LINK | DROPEFFECT_MOVE | DROPEFFECT_COPY; POINTL pt = { 0, 0 }; + TRACE("%p %p 0x%08x %p %p\n", pDrop, pDataObj, grfKeyState, lpPt, pdwEffect); + if (!lpPt) lpPt = &pt; @@ -1799,7 +1803,7 @@ BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, IDropTarget_DragEnter(pDrop, pDataObj, grfKeyState, *lpPt, pdwEffect); - if (*pdwEffect) + if (*pdwEffect != DROPEFFECT_NONE) return IDropTarget_Drop(pDrop, pDataObj, grfKeyState, *lpPt, pdwEffect); IDropTarget_DragLeave(pDrop); @@ -1891,7 +1895,7 @@ HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus) IOleControlSite* lpCSite = NULL; HRESULT hRet = E_FAIL; - TRACE("(%p,%s)\n", lpUnknown, fGotFocus ? "TRUE" : "FALSE"); + TRACE("(%p, %d)\n", lpUnknown, fGotFocus); if (lpUnknown) { hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, @@ -2149,12 +2153,10 @@ VOID WINAPI IUnknown_Set(IUnknown **lppDest, IUnknown *lpUnknown) { TRACE("(%p,%p)\n", lppDest, lpUnknown); - if (lppDest) - IUnknown_AtomicRelease(lppDest); /* Release existing interface */ + IUnknown_AtomicRelease(lppDest); if (lpUnknown) { - /* Copy */ IUnknown_AddRef(lpUnknown); *lppDest = lpUnknown; } @@ -2344,12 +2346,6 @@ BOOL WINAPI FDSA_DeleteItem(FDSA_info *info, DWORD where) return TRUE; } - -typedef struct { - REFIID refid; - DWORD indx; -} IFACE_INDEX_TBL; - /************************************************************************* * @ [SHLWAPI.219] * @@ -2360,22 +2356,22 @@ typedef struct { * Failure: E_POINTER or E_NOINTERFACE. */ HRESULT WINAPI QISearch( - LPVOID w, /* [in] Table of interfaces */ - IFACE_INDEX_TBL *x, /* [in] Array of REFIIDs and indexes into the table */ + void *base, /* [in] Table of interfaces */ + const QITAB *table, /* [in] Array of REFIIDs and indexes into the table */ REFIID riid, /* [in] REFIID to get interface for */ - LPVOID *ppv) /* [out] Destination for interface pointer */ + void **ppv) /* [out] Destination for interface pointer */ { HRESULT ret; IUnknown *a_vtbl; - IFACE_INDEX_TBL *xmove; + const QITAB *xmove; - TRACE("(%p %p %s %p)\n", w,x,debugstr_guid(riid),ppv); + TRACE("(%p %p %s %p)\n", base, table, debugstr_guid(riid), ppv); if (ppv) { - xmove = x; - while (xmove->refid) { - TRACE("trying (indx %d) %s\n", xmove->indx, debugstr_guid(xmove->refid)); - if (IsEqualIID(riid, xmove->refid)) { - a_vtbl = (IUnknown*)(xmove->indx + (LPBYTE)w); + xmove = table; + while (xmove->piid) { + TRACE("trying (offset %d) %s\n", xmove->dwOffset, debugstr_guid(xmove->piid)); + if (IsEqualIID(riid, xmove->piid)) { + a_vtbl = (IUnknown*)(xmove->dwOffset + (LPBYTE)base); TRACE("matched, returning (%p)\n", a_vtbl); *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); @@ -2385,7 +2381,7 @@ HRESULT WINAPI QISearch( } if (IsEqualIID(riid, &IID_IUnknown)) { - a_vtbl = (IUnknown*)(x->indx + (LPBYTE)w); + a_vtbl = (IUnknown*)(table->dwOffset + (LPBYTE)base); TRACE("returning first for IUnknown (%p)\n", a_vtbl); *ppv = a_vtbl; IUnknown_AddRef(a_vtbl); diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index d899232..367046b 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -216,7 +216,7 @@ 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall -noname QISearch(long long long long) +219 stdcall QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) diff --git a/include/shlwapi.h b/include/shlwapi.h index b449cfa..223bcdd 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1085,6 +1085,15 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 + +typedef struct +{ + const IID *piid; + int dwOffset; +} QITAB, *LPQITAB; + +HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shlwapi/tests: Use a single trace call variable for all tests.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: df04c25a86f915a27133246b78503910edaed346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df04c25a86f915a27133246b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 19:31:13 2010 +0300 shlwapi/tests: Use a single trace call variable for all tests. --- dlls/shlwapi/tests/ordinal.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8f974c9..6f518e9 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -136,6 +136,9 @@ static void ok_trace_(call_trace_t *texpected, call_trace_t *tgot, int line) #define ok_trace(a, b) ok_trace_(a, b, __LINE__) +/* trace of actually made calls */ +static call_trace_t trace_got; + static void test_GetAcceptLanguagesA(void) { static LPCSTR table[] = {"de,en-gb;q=0.7,en;q=0.3", @@ -1947,8 +1950,6 @@ static void test_SHGetObjectCompatFlags(void) RegCloseKey(root); } -static call_trace_t IUnknown_QueryServiceExec_trace; - typedef struct { const IOleCommandTargetVtbl *lpVtbl; LONG ref; @@ -2019,7 +2020,7 @@ static HRESULT WINAPI IOleCommandTargetImpl_Exec( VARIANT *pvaIn, VARIANT *pvaOut) { - add_call(&IUnknown_QueryServiceExec_trace, 3, CmdGroup, (void*)nCmdID, (void*)nCmdexecopt, pvaIn, pvaOut); + add_call(&trace_got, 3, CmdGroup, (void*)nCmdID, (void*)nCmdexecopt, pvaIn, pvaOut); return S_OK; } @@ -2068,8 +2069,6 @@ IProfferService* IProfferServiceImpl_Construct(void) return (IProfferService*)obj; } -static call_trace_t IUnknown_ProfferService_trace; - static HRESULT WINAPI IServiceProviderImpl_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppvObj) { IServiceProviderImpl *This = (IServiceProviderImpl *)iface; @@ -2085,7 +2084,7 @@ static HRESULT WINAPI IServiceProviderImpl_QueryInterface(IServiceProvider *ifac IUnknown_AddRef(iface); /* native uses redefined IID_IServiceProvider symbol, so we can't compare pointers */ if (IsEqualIID(riid, &IID_IServiceProvider)) - add_call(&IUnknown_QueryServiceExec_trace, 1, iface, &IID_IServiceProvider, 0, 0, 0); + add_call(&trace_got, 1, iface, &IID_IServiceProvider, 0, 0, 0); return S_OK; } @@ -2117,13 +2116,13 @@ static HRESULT WINAPI IServiceProviderImpl_QueryService( /* native uses redefined pointer for IID_IOleCommandTarget, not one from uuid.lib */ if (IsEqualIID(riid, &IID_IOleCommandTarget)) { - add_call(&IUnknown_QueryServiceExec_trace, 2, iface, service, &IID_IOleCommandTarget, 0, 0); + add_call(&trace_got, 2, iface, service, &IID_IOleCommandTarget, 0, 0); *ppv = IOleCommandTargetImpl_Construct(); } if (IsEqualIID(riid, &IID_IProfferService)) { if (IsEqualIID(service, &IID_IProfferService)) - add_call(&IUnknown_ProfferService_trace, 2, &IID_IProfferService, &IID_IProfferService, 0, 0, 0); + add_call(&trace_got, 2, &IID_IProfferService, &IID_IProfferService, 0, 0, 0); *ppv = IProfferServiceImpl_Construct(); } return S_OK; @@ -2170,14 +2169,14 @@ static void test_IUnknown_QueryServiceExec(void) add_call(&trace_expected, 2, provider, &dummy_serviceid, &IID_IOleCommandTarget, 0, 0); add_call(&trace_expected, 3, &dummy_groupid, (void*)0x1, (void*)0x2, (void*)0x3, (void*)0x4); - init_call_trace(&IUnknown_QueryServiceExec_trace); + init_call_trace(&trace_got); hr = pIUnknown_QueryServiceExec((IUnknown*)provider, &dummy_serviceid, &dummy_groupid, 0x1, 0x2, (void*)0x3, (void*)0x4); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_trace(&trace_expected, &IUnknown_QueryServiceExec_trace); + ok_trace(&trace_expected, &trace_got); free_call_trace(&trace_expected); - free_call_trace(&IUnknown_QueryServiceExec_trace); + free_call_trace(&trace_got); IServiceProvider_Release(provider); } @@ -2195,7 +2194,7 @@ static HRESULT WINAPI IProfferServiceImpl_QueryInterface(IProfferService *iface, else if (IsEqualIID(riid, &IID_IServiceProvider)) { *ppvObj = IServiceProviderImpl_Construct(); - add_call(&IUnknown_ProfferService_trace, 1, iface, &IID_IServiceProvider, 0, 0, 0); + add_call(&trace_got, 1, iface, &IID_IServiceProvider, 0, 0, 0); return S_OK; } @@ -2230,13 +2229,13 @@ static ULONG WINAPI IProfferServiceImpl_Release(IProfferService *iface) static HRESULT WINAPI IProfferServiceImpl_ProfferService(IProfferService *iface, REFGUID service, IServiceProvider *pService, DWORD *pCookie) { - add_call(&IUnknown_ProfferService_trace, 3, service, pService, pCookie, 0, 0); + add_call(&trace_got, 3, service, pService, pCookie, 0, 0); return S_OK; } static HRESULT WINAPI IProfferServiceImpl_RevokeService(IProfferService *iface, DWORD cookie) { - add_call(&IUnknown_ProfferService_trace, 4, (void*)cookie, 0, 0, 0, 0); + add_call(&trace_got, 4, (void*)cookie, 0, 0, 0, 0); return S_OK; } @@ -2287,12 +2286,12 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 2, &IID_IProfferService, &IID_IProfferService, 0, 0, 0); add_call(&trace_expected, 3, &dummy_serviceid, provider, &cookie, 0, 0); - init_call_trace(&IUnknown_ProfferService_trace); + init_call_trace(&trace_got); hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, provider, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_trace(&trace_expected, &IUnknown_ProfferService_trace); - free_call_trace(&IUnknown_ProfferService_trace); + ok_trace(&trace_expected, &trace_got); + free_call_trace(&trace_got); free_call_trace(&trace_expected); /* same with ::Revoke path */ @@ -2302,11 +2301,11 @@ static void test_IUnknown_ProfferService(void) add_call(&trace_expected, 2, &IID_IProfferService, &IID_IProfferService, 0, 0, 0); add_call(&trace_expected, 4, (void*)cookie, 0, 0, 0, 0); - init_call_trace(&IUnknown_ProfferService_trace); + init_call_trace(&trace_got); hr = pIUnknown_ProfferService((IUnknown*)proff, &dummy_serviceid, 0, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_trace(&trace_expected, &IUnknown_ProfferService_trace); - free_call_trace(&IUnknown_ProfferService_trace); + ok_trace(&trace_expected, &trace_got); + free_call_trace(&trace_got); free_call_trace(&trace_expected); IServiceProvider_Release(provider);

1 0

Nikolay Sivov : shlwapi: More trace for menu related helpers.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 3058b68bdce083d6562cb8367e14628f2929339f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3058b68bdce083d6562cb8367… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 22:25:32 2010 +0300 shlwapi: More trace for menu related helpers. --- dlls/shlwapi/ordinal.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index a79eace..51c7941 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1719,6 +1719,9 @@ void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lP DWORD WINAPI SHRemoveAllSubMenus(HMENU hMenu) { int iItemCount = GetMenuItemCount(hMenu) - 1; + + TRACE("%p\n", hMenu); + while (iItemCount >= 0) { HMENU hSubMenu = GetSubMenu(hMenu, iItemCount); @@ -1744,6 +1747,7 @@ DWORD WINAPI SHRemoveAllSubMenus(HMENU hMenu) */ UINT WINAPI SHEnableMenuItem(HMENU hMenu, UINT wItemID, BOOL bEnable) { + TRACE("%p, %u, %d\n", hMenu, wItemID, bEnable); return EnableMenuItem(hMenu, wItemID, bEnable ? MF_ENABLED : MF_GRAYED); } @@ -1762,6 +1766,7 @@ UINT WINAPI SHEnableMenuItem(HMENU hMenu, UINT wItemID, BOOL bEnable) */ DWORD WINAPI SHCheckMenuItem(HMENU hMenu, UINT uID, BOOL bCheck) { + TRACE("%p, %u, %d\n", hMenu, uID, bCheck); return CheckMenuItem(hMenu, uID, bCheck ? MF_CHECKED : MF_UNCHECKED); } @@ -2945,7 +2950,8 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle */ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl) { - return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE); + TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl); + return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE); } /************************************************************************* @@ -3460,12 +3466,12 @@ UINT WINAPI SHDefExtractIconWrapW(LPCWSTR pszIconFile, int iIndex, UINT uFlags, HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, BOOL bInvokeDefault) { IContextMenu *iContext; - HRESULT hRet = E_FAIL; + HRESULT hRet; - TRACE("(%p,%p,%p,%d)\n", hWnd, lpFolder, lpApidl, bInvokeDefault); + TRACE("(%p, %p, %p, %d)\n", hWnd, lpFolder, lpApidl, bInvokeDefault); if (!lpFolder) - return hRet; + return E_FAIL; /* Get the context menu from the shell folder */ hRet = IShellFolder_GetUIObjectOf(lpFolder, hWnd, 1, &lpApidl, @@ -3485,7 +3491,7 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST if (SUCCEEDED(hQuery)) { if (bInvokeDefault && - (dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != 0xFFFFFFFF) + (dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != (UINT)-1) { CMINVOKECOMMANDINFO cmIci; /* Invoke the default item */ @@ -4255,18 +4261,24 @@ BOOL WINAPI SHIsLowMemoryMachine (DWORD x) */ INT WINAPI GetMenuPosFromID(HMENU hMenu, UINT wID) { - MENUITEMINFOW mi; - INT nCount = GetMenuItemCount(hMenu), nIter = 0; + MENUITEMINFOW mi; + INT nCount = GetMenuItemCount(hMenu), nIter = 0; + + TRACE("%p %u\n", hMenu, wID); + + while (nIter < nCount) + { + mi.cbSize = sizeof(mi); + mi.fMask = MIIM_ID; + if (GetMenuItemInfoW(hMenu, nIter, TRUE, &mi) && mi.wID == wID) + { + TRACE("ret %d\n", nIter); + return nIter; + } + nIter++; + } - while (nIter < nCount) - { - mi.cbSize = sizeof(mi); - mi.fMask = MIIM_ID; - if (GetMenuItemInfoW(hMenu, nIter, TRUE, &mi) && mi.wID == wID) - return nIter; - nIter++; - } - return -1; + return -1; } /************************************************************************* @@ -4276,6 +4288,7 @@ INT WINAPI GetMenuPosFromID(HMENU hMenu, UINT wID) */ DWORD WINAPI SHMenuIndexFromID(HMENU hMenu, UINT uID) { + TRACE("%p %u\n", hMenu, uID); return GetMenuPosFromID(hMenu, uID); }

1 0

Nikolay Sivov : shlwapi: Complete IUnknown_SetOwner call.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 66aa3dc834a4e3778d9dd9b74cc464a5d304f613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66aa3dc834a4e3778d9dd9b74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 04:17:56 2010 +0300 shlwapi: Complete IUnknown_SetOwner call. --- .gitignore | 1 + dlls/shlwapi/ordinal.c | 41 +++++++++++++++++++---------------------- dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/shdeprecated.idl | 31 +++++++++++++++++++++++++++++++ 5 files changed, 53 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index bb19dad..6ea657d 100644 --- a/.gitignore +++ b/.gitignore @@ -193,6 +193,7 @@ include/qedit.h include/richole.h include/sensevts.h include/servprov.h +include/shdeprecated.h include/shldisp.h include/shobjidl.h include/shtypes.h diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 70c3285..bb17734 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -42,6 +42,7 @@ #include "mmsystem.h" #include "objbase.h" #include "exdisp.h" +#include "shdeprecated.h" #include "shlobj.h" #include "shlwapi.h" #include "shellapi.h" @@ -1349,36 +1350,32 @@ HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd) /************************************************************************* * @ [SHLWAPI.173] * - * Call a method on as as yet unidentified object. + * Call a SetOwner method of IShellService from specified object. * * PARAMS - * pUnk [I] Object supporting the unidentified interface, - * arg [I] Argument for the call on the object. + * iface [I] Object that supports IShellService + * pUnk [I] Argument for the SetOwner call * * RETURNS - * S_OK. + * Corresponding return value from last call or E_FAIL for null input */ -HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg) +HRESULT WINAPI IUnknown_SetOwner(IUnknown *iface, IUnknown *pUnk) { - static const GUID guid_173 = { - 0x5836fb00, 0x8187, 0x11cf, { 0xa1,0x2b,0x00,0xaa,0x00,0x4a,0xe8,0x37 } - }; - IMalloc *pUnk2; + IShellService *service; + HRESULT hr; - TRACE("(%p,%d)\n", pUnk, arg); + TRACE("(%p, %p)\n", iface, pUnk); - /* Note: arg may not be a ULONG and pUnk2 is for sure not an IMalloc - - * We use this interface as its vtable entry is compatible with the - * object in question. - * FIXME: Find out what this object is and where it should be defined. - */ - if (pUnk && - SUCCEEDED(IUnknown_QueryInterface(pUnk, &guid_173, (void**)&pUnk2))) + if (!iface) return E_FAIL; + + hr = IUnknown_QueryInterface(iface, &IID_IShellService, (void**)&service); + if (hr == S_OK) { - IMalloc_Alloc(pUnk2, arg); /* Faked call!! */ - IMalloc_Release(pUnk2); + hr = IShellService_SetOwner(service, pUnk); + IShellService_Release(service); } - return S_OK; + + return hr; } /************************************************************************* diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 5a1a255..f8d19e2 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "docobj.h" #include "exdisp.h" +#include "shdeprecated.h" #include "shlguid.h" #include "shlobj.h" #include "shldisp.h" diff --git a/include/Makefile.in b/include/Makefile.in index ce35804..c9570f0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -77,6 +77,7 @@ PUBLIC_IDL_H_SRCS = \ richole.idl \ sensevts.idl \ servprov.idl \ + shdeprecated.idl \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl new file mode 100644 index 0000000..304b087 --- /dev/null +++ b/include/shdeprecated.idl @@ -0,0 +1,31 @@ +/* + * Deprecated shell interfaces + * + * Copyright (C) 2010 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; + +[ + object, + local, + uuid(5836fb00-8187-11cf-a12b-00aa004ae837) +] +interface IShellService : IUnknown +{ + HRESULT SetOwner( [in] IUnknown *pUnk ); +}

1 0

Francois Gouget : winedbg: Fix compilation with gcc 2. 95 and non-GNU compilers.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 51dfd9adb11885daec878737f18f89fb05c1516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51dfd9adb11885daec878737f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:55:27 2010 +0100 winedbg: Fix compilation with gcc 2.95 and non-GNU compilers. --- programs/winedbg/db_disasm64.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index d7f7c03..98f7ef2 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -32,11 +32,25 @@ #include <stdio.h> #include "debugger.h" -static int (*db_printf)(const char* format, ...) -#ifdef __GNUC__ - __attribute__((format (printf,1,2))); +#ifndef __GNUC__ +#define __attribute__(X) #endif -static int no_printf(const char* format, ...) {return 0;} + +static int db_debug = 0; +static int db_printf(const char* format, ...) __attribute__((format (printf,1,2))); +int db_printf(const char* format, ...) +{ + va_list valist; + int len = 0; + if (db_debug) + { + va_start(valist, format); + len = dbg_printf(format, valist); + va_end(valist); + } + return len; +} + typedef DWORD_PTR db_addr_t; typedef BOOL boolean_t; @@ -79,7 +93,7 @@ static ULONG64 db_get_value(db_addr_t addr, int size, int is_signed) static void db_printsym(db_addr_t addr, unsigned unused) { - if (db_printf != no_printf) + if (db_debug) { ADDRESS64 a; @@ -1642,6 +1656,6 @@ db_disasm(db_addr_t loc, boolean_t altfmt) void be_x86_64_disasm_one_insn(ADDRESS64 *addr, int display) { - db_printf = display ? dbg_printf : no_printf; + db_debug = display; addr->Offset = db_disasm(addr->Offset, TRUE); }

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 5ca6d9b5be30b359a401c74dd2bce368f2f82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca6d9b5be30b359a401c74dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:55:34 2010 +0100 oleaut32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8a8766a..a5d8e4a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1099,7 +1099,7 @@ static void test_CreateTypeLib(void) { funcdesc.invkind = INVOKE_PROPERTYGET; funcdesc.callconv = CC_STDCALL; funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; - funcdesc.elemdescFunc.idldesc.wIDLFlags = IDLFLAG_NONE; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); @@ -1122,8 +1122,8 @@ static void test_CreateTypeLib(void) { ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_BSTR; - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_PROPERTYPUT; @@ -1158,40 +1158,40 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_PTR; - elemdesc[0].tdesc.lptdesc = &typedesc1; + U(elemdesc[0].tdesc).lptdesc = &typedesc1; typedesc1.vt = VT_BSTR; funcdesc.cParams = 1; funcdesc.lprgelemdescParam = elemdesc; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].tdesc.lptdesc = &typedesc2; + U(elemdesc[0].tdesc).lptdesc = &typedesc2; typedesc2.vt = VT_PTR; - typedesc2.lptdesc = &typedesc1; + U(typedesc2).lptdesc = &typedesc1; hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); elemdesc[0].tdesc.vt = VT_INT; - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0x123; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].idldesc.dwReserved = 0; - elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN; + U(elemdesc[0]).idldesc.dwReserved = 0; + U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN; elemdesc[1].tdesc.vt = VT_UI2; - elemdesc[1].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[1].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[1]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[1]).paramdesc.pparamdescex = &paramdescex; V_VT(&paramdescex.varDefaultValue) = VT_UI2; V_UI2(&paramdescex.varDefaultValue) = 0xffff; funcdesc.cParams = 2; hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); - elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; - elemdesc[0].paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; elemdesc[1].tdesc.vt = VT_INT; V_VT(&paramdescex.varDefaultValue) = VT_INT; V_INT(&paramdescex.varDefaultValue) = 0xffffffff;

1 0

Nikolay Sivov : shlwapi: Fix some memory, handle and reference count leaks in RegisterDefaultAcceptHeaders.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 076676d448fe973b0b3da31af61b1ce0cd4fda3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=076676d448fe973b0b3da31af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 02:53:02 2010 +0300 shlwapi: Fix some memory, handle and reference count leaks in RegisterDefaultAcceptHeaders. --- dlls/shlwapi/ordinal.c | 63 +++++++++++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 6c3c1d0..7c2d87c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -309,24 +309,22 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) BSTR property; IEnumFORMATETC* pIEnumFormatEtc = NULL; VARIANTARG var; - HRESULT hRet; - IWebBrowserApp* pBrowser = NULL; + HRESULT hr; + IWebBrowserApp* pBrowser; TRACE("(%p, %p)\n", lpBC, lpUnknown); - /* Get An IWebBrowserApp interface from lpUnknown */ - hRet = IUnknown_QueryService(lpUnknown, &IID_IWebBrowserApp, &IID_IWebBrowserApp, (PVOID)&pBrowser); - if (FAILED(hRet) || !pBrowser) - return E_NOINTERFACE; + hr = IUnknown_QueryService(lpUnknown, &IID_IWebBrowserApp, &IID_IWebBrowserApp, (void**)&pBrowser); + if (FAILED(hr)) + return hr; V_VT(&var) = VT_EMPTY; /* The property we get is the browsers clipboard enumerator */ property = SysAllocString(szProperty); - hRet = IWebBrowserApp_GetProperty(pBrowser, property, &var); + hr = IWebBrowserApp_GetProperty(pBrowser, property, &var); SysFreeString(property); - if (FAILED(hRet)) - return hRet; + if (FAILED(hr)) goto exit; if (V_VT(&var) == VT_EMPTY) { @@ -340,7 +338,10 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\Current" "Version\\Internet Settings\\Accepted Documents", &hDocs)) - return E_FAIL; + { + hr = E_FAIL; + goto exit; + } /* Get count of values in key */ while (!dwRet) @@ -355,7 +356,11 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) /* Note: dwCount = number of items + 1; The extra item is the end node */ format = formatList = HeapAlloc(GetProcessHeap(), 0, dwCount * sizeof(FORMATETC)); if (!formatList) - return E_OUTOFMEMORY; + { + RegCloseKey(hDocs); + hr = E_OUTOFMEMORY; + goto exit; + } if (dwNumValues > 1) { @@ -372,7 +377,12 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) dwRet = RegEnumValueA(hDocs, dwCount, szKeyBuff, &dwKeySize, 0, &dwType, (PBYTE)szValueBuff, &dwValueSize); if (!dwRet) - return E_FAIL; + { + HeapFree(GetProcessHeap(), 0, formatList); + RegCloseKey(hDocs); + hr = E_FAIL; + goto exit; + } format->cfFormat = RegisterClipboardFormatA(szValueBuff); format->ptd = NULL; @@ -385,6 +395,8 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) } } + RegCloseKey(hDocs); + /* Terminate the (maybe empty) list, last entry has a cfFormat of 0 */ format->cfFormat = 0; format->ptd = NULL; @@ -393,22 +405,21 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) format->tymed = -1; /* Create a clipboard enumerator */ - hRet = CreateFormatEnumerator(dwNumValues, formatList, &pIEnumFormatEtc); - - if (FAILED(hRet) || !pIEnumFormatEtc) - return hRet; + hr = CreateFormatEnumerator(dwNumValues, formatList, &pIEnumFormatEtc); + HeapFree(GetProcessHeap(), 0, formatList); + if (FAILED(hr)) goto exit; /* Set our enumerator as the browsers property */ V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)pIEnumFormatEtc; property = SysAllocString(szProperty); - hRet = IWebBrowserApp_PutProperty(pBrowser, property, var); + hr = IWebBrowserApp_PutProperty(pBrowser, property, var); SysFreeString(property); - if (FAILED(hRet)) + if (FAILED(hr)) { IEnumFORMATETC_Release(pIEnumFormatEtc); - goto RegisterDefaultAcceptHeaders_Exit; + goto exit; } } @@ -422,28 +433,26 @@ HRESULT WINAPI RegisterDefaultAcceptHeaders(LPBC lpBC, IUnknown *lpUnknown) /* Get an IEnumFormatEtc interface from the variants value */ pIEnumFormatEtc = NULL; - hRet = IUnknown_QueryInterface(pIUnknown, &IID_IEnumFORMATETC, - (PVOID)&pIEnumFormatEtc); - if (hRet == S_OK && pIEnumFormatEtc) + hr = IUnknown_QueryInterface(pIUnknown, &IID_IEnumFORMATETC, (void**)&pIEnumFormatEtc); + if (hr == S_OK && pIEnumFormatEtc) { /* Clone and register the enumerator */ - hRet = IEnumFORMATETC_Clone(pIEnumFormatEtc, &pClone); - if (hRet == S_OK && pClone) + hr = IEnumFORMATETC_Clone(pIEnumFormatEtc, &pClone); + if (hr == S_OK && pClone) { RegisterFormatEnumerator(lpBC, pClone, 0); IEnumFORMATETC_Release(pClone); } - /* Release the IEnumFormatEtc interface */ IEnumFORMATETC_Release(pIUnknown); } IUnknown_Release(V_UNKNOWN(&var)); } -RegisterDefaultAcceptHeaders_Exit: +exit: IWebBrowserApp_Release(pBrowser); - return hRet; + return hr; } /*************************************************************************

1 0