April 2007 - Wine-Commits - list.winehq.org

Felix Nawothnig : taskmgr: Use default font for proc listview.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: 425d87464e9e733f161b77b97547d514a13f1545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425d87464e9e733f161b77b97… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Apr 6 02:38:14 2007 +0200 taskmgr: Use default font for proc listview. --- programs/taskmgr/procpage.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 04921c0..3450f83 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -461,9 +461,8 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) hProcessPageShowAllProcessesButton = GetDlgItem(hDlg, IDC_SHOWALLPROCESSES); /* - * Set the font, title, and extended window styles for the list control + * Set the title and extended window styles for the list control */ - SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); SetWindowText(hProcessPageListCtrl, _T("Processes")); SendMessage(hProcessPageListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);

1 0

Felix Nawothnig : comctl32: Fix item rect calculation.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: a4d3e46e65d0e61c71789073b00099383c4fc99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d3e46e65d0e61c71789073b… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Thu Apr 5 23:44:23 2007 +0200 comctl32: Fix item rect calculation. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a1ddb..6861504 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1980,7 +1980,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) || ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK))) Icon.right += infoPtr->iconSize.cx; - Icon.bottom = Icon.top + infoPtr->nItemHeight; + Icon.bottom = Icon.top + infoPtr->iconSize.cy; } if(lprcIcon) *lprcIcon = Icon; TRACE(" - icon=%s\n", wine_dbgstr_rect(&Icon));

1 0

Michael Stefaniuc : msvcrt: Demangle a C++ mangled string that is only a name with it' s template argument list.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: 590bf1be88fc8516f5eb84051cea8ad9452b052d URL: http://source.winehq.org/git/wine.git/?a=commit;h=590bf1be88fc8516f5eb84051… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 6 00:50:06 2007 +0200 msvcrt: Demangle a C++ mangled string that is only a name with it's template argument list. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 1d43502..370a348 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -975,6 +975,9 @@ static void test_demangle(void) {"??0aa$_3a@@QAE(a)XZ", "public: __thiscall aa$_3a::aa$_3a(void)"}, {"??2?$aaa(a)AAUbbb@@AAUccc@@AAU2@@ddd(a)1eee@2(a)QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"}, {"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK(a)ZP6GPAX0K@ZP6GK0K(a)ZP6GK00PAU_tagADDRESS@@@Z(a)ZA", "int (__stdcall* pSW)(unsigned long,void *,void *,struct _tagSTACKFRAME *,void *,int (__stdcall*)(void *,unsigned long,void *,unsigned long,unsigned long *),void * (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,void *,struct _tagADDRESS *))"}, +{"?$_aaa(a)Vbbb@@", "_aaa<class bbb>"}, +{"??$_aaa(a)Vbbb@@", "??$_aaa(a)Vbbb@@"}, +{"?$aaa(a)Vbbb@ccc@@Vddd(a)2@", "aaa<class ccc::bbb,class ccc::ddd>"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index da4aeb0..a16d3d8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1156,6 +1156,15 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) } sym->stack.start = 1; } + else if (*sym->current == '$') + { + /* Strange construct, it's a name with a template argument list + and that's all. */ + sym->current++; + sym->result = get_template_name(sym); + ret = TRUE; + goto done; + } /* Either a class name, or '@' if the symbol is not a class member */ if (*sym->current != '@')

1 0

Alexandre Julliard : ntdll: Make test for heap boundaries more strict in HEAP_FindSubHeap.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: fd09846864d1ca5c0dec335ccc7c9ae1d801b9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd09846864d1ca5c0dec335cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 5 22:06:38 2007 +0200 ntdll: Make test for heap boundaries more strict in HEAP_FindSubHeap. --- dlls/ntdll/heap.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 80ddaf2..61b25db 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -395,7 +395,8 @@ static SUBHEAP *HEAP_FindSubHeap( while (sub) { if (((const char *)ptr >= (const char *)sub) && - ((const char *)ptr < (const char *)sub + sub->size)) return (SUBHEAP*)sub; + ((const char *)ptr < (const char *)sub + sub->size - sizeof(ARENA_INUSE))) + return (SUBHEAP *)sub; sub = sub->next; } return NULL; @@ -783,7 +784,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, * * Check that the pointer is inside the range possible for arenas. */ -static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const void *ptr ) +static BOOL HEAP_IsValidArenaPtr( const HEAP *heap, const ARENA_FREE *ptr ) { int i; const SUBHEAP *subheap = HEAP_FindSubHeap( heap, ptr ); @@ -1003,13 +1004,12 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); - if (block) + if (block) /* only check this single memory block */ { - /* Only check this single memory block */ + const ARENA_INUSE *arena = (const ARENA_INUSE *)block - 1; - if (!(subheap = HEAP_FindSubHeap( heapPtr, block )) || - ((const char *)block < (char *)subheap + subheap->headerSize - + sizeof(ARENA_INUSE))) + if (!(subheap = HEAP_FindSubHeap( heapPtr, arena )) || + ((const char *)arena < (char *)subheap + subheap->headerSize)) { if (quiet == NOISY) ERR("Heap %p: block %p is not inside heap\n", heapPtr, block ); @@ -1017,7 +1017,7 @@ static BOOL HEAP_IsRealArena( HEAP *heapPtr, /* [in] ptr to the heap */ WARN("Heap %p: block %p is not inside heap\n", heapPtr, block ); ret = FALSE; } else - ret = HEAP_ValidateInUseArena( subheap, (const ARENA_INUSE *)block - 1, quiet ); + ret = HEAP_ValidateInUseArena( subheap, arena, quiet ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );

1 0

Rob Shearman : ole32: Fix a hack which depended on the IID of the interface being marshaled
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: 1360357f92ac6bda3c1802870fbe9a45de2fe146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1360357f92ac6bda3c1802870… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 17:33:36 2007 +0100 ole32: Fix a hack which depended on the IID of the interface being marshaled to determine whether we were marshaling the remote unknown for the apartment or not. --- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/stubmanager.c | 4 ++-- dlls/ole32/tests/marshal.c | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 401224a..e877cce 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -45,6 +45,9 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); +/* signal to stub manager that this is a rem unknown object */ +#define MSHLFLAGSP_REMUNKNOWN 0x80000000 + /* Thread-safety Annotation Legend: * * RO - The value is read only. It never changes after creation, so no diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index b7d6ba7..76e07a2 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -471,7 +471,7 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s /* FIXME: find a cleaner way of identifying that we are creating an ifstub * for the remunknown interface */ - if (IsEqualIID(iid, &IID_IRemUnknown)) + if (flags & MSHLFLAGSP_REMUNKNOWN) stub->ipid = m->oxid_info.ipidRemUnknown; else generate_ipid(m, &stub->ipid); @@ -763,7 +763,7 @@ HRESULT start_apartment_remote_unknown(void) { STDOBJREF stdobjref; /* dummy - not used */ /* register it with the stub manager */ - hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHLFLAGS_NORMAL); + hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); /* release our reference to the object as the stub manager will manage the life cycle for us */ IRemUnknown_Release(pRemUnknown); if (hr == S_OK) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 41a2aec..7e3e82e 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2199,12 +2199,7 @@ static void test_client_security(void) CoTaskMemFree(pServerPrincName); IClassFactory_Release(pProxy); -#if 0 - /* FIXME: fix stub manager to not depend on the IID of the interface to - * determine whether it is really the rem unknown for the object before - * re-enabling this line */ IUnknown_Release(pProxy2); -#endif IUnknown_Release(pUnknown1); IUnknown_Release(pUnknown2); IMarshal_Release(pMarshal);

1 0

Hans Leidekker : wintrust: Improve a number of stubs.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: fbe37d1b68557ee244a0b35b9f44626fc4e122d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe37d1b68557ee244a0b35b9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Apr 5 16:16:56 2007 +0200 wintrust: Improve a number of stubs. --- dlls/wintrust/crypt.c | 39 ++++++++++++++++++++++++++++++--------- dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 1edf171..3dd127c 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -42,15 +42,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); * * RETURNS * Success: TRUE. catAdmin contains the context handle. - * Failure: FAIL. + * Failure: FALSE. * */ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, const GUID *sysSystem, DWORD dwFlags ) { FIXME("%p %s %x\n", catAdmin, debugstr_guid(sysSystem), dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (catAdmin) *catAdmin = (HCATADMIN)0xdeadbeef; + return TRUE; } /*********************************************************************** @@ -60,8 +61,9 @@ BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, BYTE* pbHash, DWORD dwFlags ) { FIXME("%p %p %p %x\n", hFile, pcbHash, pbHash, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (pbHash && pcbHash) memset(pbHash, 0, *pcbHash); + return TRUE; } /*********************************************************************** @@ -74,7 +76,6 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, HCATINFO* phPrevCatInfo ) { FIXME("%p %p %d %d %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } @@ -84,7 +85,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, * Release a catalog administrator context handle. * * PARAMS - * catAdmin [I] Pointer to the context handle. + * catAdmin [I] Context handle. * dwFlags [I] Reserved. * * RETURNS @@ -95,8 +96,28 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) { FIXME("%p %x\n", hCatAdmin, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; +} + +/*********************************************************************** + * CryptCATAdminRemoveCatalog (WINTRUST.@) + * + * Remove a catalog file. + * + * PARAMS + * catAdmin [I] Context handle. + * pwszCatalogFile [I] Catalog file. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + * + */ +BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogFile, DWORD dwFlags) +{ + FIXME("%p %s %x\n", hCatAdmin, debugstr_w(pwszCatalogFile), dwFlags); + return DeleteFileW(pwszCatalogFile); } /*********************************************************************** diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 49fb9c8..e44e6cc 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -7,7 +7,7 @@ @ stub CryptCATAdminPauseServiceForBackup @ stub CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) -@ stub CryptCATAdminRemoveCatalog +@ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) @ stub CryptCATAdminResolveCatalogPath @ stub CryptCATCDFClose @ stub CryptCATCDFEnumAttributes

1 0

Michael Stefaniuc : msvcrt: Move the code to demangle a name with its template argument list out of get_class () and into a separate function.
by Alexandre Julliard April 6, 2007

April 6, 2007

Module: wine Branch: master Commit: 4718261e9b78f1d16a94644003d0a01ae3b38f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4718261e9b78f1d16a9464400… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 6 00:49:18 2007 +0200 msvcrt: Move the code to demangle a name with its template argument list out of get_class() and into a separate function. --- dlls/msvcrt/undname.c | 52 ++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a775e72..da4aeb0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -427,6 +427,35 @@ static char* get_literal_string(struct parsed_symbol* sym) } /****************************************************************** + * get_template_name + * Parses a name with a template argument list and returns it as + * a string. + * In a template argument list the back reference to the names + * table is separately created. '0' points to the class component + * name with the template arguments. We use the same stack array + * to hold the names but save/restore the stack state before/after + * parsing the template argument list. + */ +static char* get_template_name(struct parsed_symbol* sym) +{ + char *name, *args; + unsigned num_mark = sym->names.num; + unsigned start_mark = sym->names.start; + unsigned stack_mark = sym->stack.num; + + sym->names.start = sym->names.num; + if (!(name = get_literal_string(sym))) + return FALSE; + args = get_args(sym, NULL, FALSE, '<', '>'); + if (args != NULL) + name = str_printf(sym, "%s%s", name, args); + sym->names.num = num_mark; + sym->names.start = start_mark; + sym->stack.num = stack_mark; + return name; +} + +/****************************************************************** * get_class * Parses class as a list of parent-classes, terminated by '@' and stores the * result in 'a' array. Each parent-classes, as well as the inner element @@ -457,29 +486,8 @@ static BOOL get_class(struct parsed_symbol* sym) case '?': if (*++sym->current == '$') { - /* In a template argument list the back reference to names - table is separately created. '0' points to the class - component name with the template arguments. We use the same - stack array to hold the names but save/restore the stack - state before/after parsing the template argument list. */ - char* args = NULL; - unsigned num_mark = sym->names.num; - unsigned start_mark = sym->names.start; - unsigned stack_mark = sym->stack.num; - - sym->names.start = sym->names.num; sym->current++; - if (!(name = get_literal_string(sym))) - return FALSE; - args = get_args(sym, NULL, FALSE, '<', '>'); - if (args != NULL) - name = str_printf(sym, "%s%s", name, args); - sym->names.num = num_mark; - sym->names.start = start_mark; - sym->stack.num = stack_mark; - /* Now that we are back to the standard name scope push - the class component with all its template arguments - to the names array for back reference. */ + name = get_template_name(sym); str_array_push(sym, name, -1, &sym->names); } break;

1 0

Rob Shearman : ole32: Move declaration for FileMonikerImpl_DecomposePath from compobj_private. h to moniker.h.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 74c04149be2c3e43065c832d2b90f1434f6fd047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c04149be2c3e43065c832d2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 11:34:59 2007 +0100 ole32: Move declaration for FileMonikerImpl_DecomposePath from compobj_private.h to moniker.h. --- dlls/ole32/compobj_private.h | 3 --- dlls/ole32/moniker.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 479cd76..401224a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -239,9 +239,6 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize(void); /* This function uninitialize the Running Object Table */ HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void); -/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ -int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); - /* Drag and drop */ void OLEDD_UnInitialize(void); diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 3398b0e..d3ce652 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -35,6 +35,9 @@ HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv); +/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ +int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); + HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten, LPMONIKER *ppmk); HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName,

1 0

Rob Shearman : ole32: Don' t release the registered drop targets in OleUninitialize.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 63ea015c65e517979b01c8de2e744517fe05c36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ea015c65e517979b01c8de2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 11:33:52 2007 +0100 ole32: Don't release the registered drop targets in OleUninitialize. Do it in DLL_PROCESS_DETACH instead. --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/ole2.c | 8 +------- dlls/ole32/tests/dragdrop.c | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 330b8e1..af43074 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3402,6 +3402,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_DETACH: if (TRACE_ON(ole)) CoRevokeMallocSpy(); + OLEDD_UnInitialize(); COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); OLE32_hInstance = 0; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4a81c91..479cd76 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -242,6 +242,8 @@ HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); +/* Drag and drop */ +void OLEDD_UnInitialize(void); /* Apartment Functions */ diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 1f2c301..908eb09 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -147,7 +147,6 @@ extern void OLEClipbrd_Initialize(void); * These are the prototypes of the utility methods used for OLE Drag n Drop */ static void OLEDD_Initialize(void); -static void OLEDD_UnInitialize(void); static DropTargetNode* OLEDD_FindDropTarget( HWND hwndOfTarget); static void OLEDD_FreeDropTarget(DropTargetNode*); @@ -254,11 +253,6 @@ void WINAPI OleUninitialize(void) OLEClipbrd_UnInitialize(); /* - * Drag and Drop - */ - OLEDD_UnInitialize(); - - /* * OLE shared menu */ OLEMenu_UnInitialize(); @@ -1915,7 +1909,7 @@ static void OLEDD_FreeDropTarget(DropTargetNode *dropTargetInfo) * * Releases the OLE drag and drop data structures. */ -static void OLEDD_UnInitialize(void) +void OLEDD_UnInitialize(void) { /* * Simply empty the list. diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 6401c11..48b308c 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -136,11 +136,9 @@ START_TEST(dragdrop) ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); OleUninitialize(); - todo_wine ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); hr = RevokeDragDrop(GetDesktopWindow()); - todo_wine ok_ole_success(hr, "RevokeDragDrop"); ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called);

1 0

Rob Shearman : ole32: Check the input hwnd is valid in RevokeDragDrop.
by Alexandre Julliard April 5, 2007

April 5, 2007

Module: wine Branch: master Commit: 47432cba4515098c1a18f039a46c944107de6eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=47432cba4515098c1a18f039a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 5 11:33:16 2007 +0100 ole32: Check the input hwnd is valid in RevokeDragDrop. --- dlls/ole32/ole2.c | 9 +++++++++ dlls/ole32/tests/dragdrop.c | 1 - 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c300f68..1f2c301 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -299,7 +299,10 @@ HRESULT WINAPI RegisterDragDrop( return E_INVALIDARG; if (!IsWindow(hwnd)) + { + ERR("invalid hwnd %p\n", hwnd); return DRAGDROP_E_INVALIDHWND; + } /* * First, check if the window is already registered. @@ -341,6 +344,12 @@ HRESULT WINAPI RevokeDragDrop( TRACE("(%p)\n", hwnd); + if (!IsWindow(hwnd)) + { + ERR("invalid hwnd %p\n", hwnd); + return DRAGDROP_E_INVALIDHWND; + } + /* * First, check if the window is already registered. */ diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 05d80d0..6401c11 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -145,6 +145,5 @@ START_TEST(dragdrop) ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); hr = RevokeDragDrop(NULL); - todo_wine ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); }

1 0