wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

appdb/include monitor.php
by WineHQ 10 Mar '07

10 Mar '07

ChangeSet ID: 30947 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/09 21:36:28 Modified files: include : monitor.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Don't allow duplicate monitors, check for duplicates in monitor::create() Patch: http://cvs.winehq.org/patch.py?id=30947 Old revision New revision Changes Path 1.12 1.13 +6 -0 appdb/include/monitor.php Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.12 appdb/include/monitor.php:1.13 --- appdb/include/monitor.php:1.12 10 Mar 2007 3:36:28 -0000 +++ appdb/include/monitor.php 10 Mar 2007 3:36:28 -0000 @@ -60,6 +60,12 @@ class Monitor { */ function create($iUserId, $iAppId=0, $iVersionId=0) { + /* Check for duplicate entries */ + $oMonitor = new monitor(); + $oMonitor->find($iUserId, $iVersionId); + if($oMonitor->iVersionId) + return FALSE; + $hResult = query_parameters("INSERT INTO appMonitors (versionId, appId, userId) ". "VALUES ('?', '?', '?')", $iVersionId, $iAppId, $iUserId);

1 0

appdb/include maintainer.php version.php
by WineHQ 10 Mar '07

10 Mar '07

ChangeSet ID: 30946 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/09 21:35:06 Modified files: include : maintainer.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Include supermaintainers in getMaintainersForAppIdVersionId() Patch: http://cvs.winehq.org/patch.py?id=30946 Old revision New revision Changes Path 1.26 1.27 +4 -2 appdb/include/maintainer.php 1.103 1.104 +2 -5 appdb/include/version.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.26 appdb/include/maintainer.php:1.27 --- appdb/include/maintainer.php:1.26 10 Mar 2007 3:35: 6 -0000 +++ appdb/include/maintainer.php 10 Mar 2007 3:35: 6 -0000 @@ -353,8 +353,10 @@ class maintainer if($iVersionId) { - $hResult = query_parameters("SELECT userId from appMaintainers WHERE appMaintainers.queued = 'false' AND ". - "appMaintainers.versionId = '?'", $iVersionId); + $hResult = query_parameters("SELECT userId from appMaintainers, appVersion + WHERE appMaintainers.queued = 'false' AND appVersion.versionId = '?' + AND ((appMaintainers.versionId = appVersion.versionId) OR + (appMaintainers.appId = appVersion.appId))", $iVersionId); } /* * If versionId was not supplied we fetch supermaintainers of application and maintainer of all versions. Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.103 appdb/include/version.php:1.104 --- appdb/include/version.php:1.103 10 Mar 2007 3:35: 6 -0000 +++ appdb/include/version.php 10 Mar 2007 3:35: 6 -0000 @@ -758,13 +758,10 @@ class Version { echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><b>Maintainers of this version:</b>\n"; echo "<table width=\"250\" border=\"0\">"; $aMaintainers = $this->getMaintainersUserIds(); - $aSupermaintainers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId); - $aAllMaintainers = array_merge($aMaintainers,$aSupermaintainers); - $aAllMaintainers = array_unique($aAllMaintainers); - if(sizeof($aAllMaintainers)>0) + if(sizeof($aMaintainers)>0) { echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><ul>"; - while(list($index, $userIdValue) = each($aAllMaintainers)) + while(list($index, $userIdValue) = each($aMaintainers)) { $oUser = new User($userIdValue); echo "<li>$oUser->sRealname (<a href=\"".BASE."contact.php?".

1 0

Alexandre Julliard : ntdll: Fixed a compiler warning for size_t/ unsigned int mismatch.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: f2181a533e15f0c49313ce34adb2696c4e60321d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2181a533e15f0c49313ce34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 22:17:55 2007 +0100 ntdll: Fixed a compiler warning for size_t/unsigned int mismatch. --- dlls/ntdll/string.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 731d918..92aa808 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -106,9 +106,10 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, * _lfind (NTDLL.@) */ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, - unsigned int size, int(*compar)(const void *, const void *) ) + size_t size, int(*compar)(const void *, const void *) ) { - return lfind( key, base, nmemb, size, compar ); + size_t n = *nmemb; + return lfind( key, base, &n, size, compar ); }

1 0

Alexandre Julliard : shdocvw: Avoid a printf format warning.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 9aecf6ef14e7b74dd38d608c4b036485e82ad111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aecf6ef14e7b74dd38d608c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 21:52:58 2007 +0100 shdocvw: Avoid a printf format warning. --- dlls/shdocvw/tests/webbrowser.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index d9e9cf0..aa231c0 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -653,8 +653,7 @@ static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DO CHECK_EXPECT(GetHostInfo); ok(pInfo != NULL, "pInfo=NULL\n"); if(pInfo) { - ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u, expected %u\n", - pInfo->cbSize, sizeof(DOCHOSTUIINFO)); + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u\n", pInfo->cbSize); ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags); ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick); ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss);

1 0

Chris Robinson : quartz: Check allocation failure and clear memory in DSound Renderer.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: e44a0d6d4dd5237c739e1827d286be180c329d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44a0d6d4dd5237c739e1827d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Mar 9 05:47:37 2007 -0800 quartz: Check allocation failure and clear memory in DSound Renderer. --- dlls/quartz/dsoundrender.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fe6152f..67ab550 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -316,18 +316,23 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return CLASS_E_NOAGGREGATION; pDSoundRender = CoTaskMemAlloc(sizeof(DSoundRenderImpl)); + if (!pDSoundRender) + return E_OUTOFMEMORY; + ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl)); pDSoundRender->lpVtbl = &DSoundRender_Vtbl; pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; pDSoundRender->refCount = 1; InitializeCriticalSection(&pDSoundRender->csFilter); pDSoundRender->state = State_Stopped; - pDSoundRender->pClock = NULL; - pDSoundRender->init = FALSE; - pDSoundRender->started = FALSE; - ZeroMemory(&pDSoundRender->filterInfo, sizeof(FILTER_INFO)); pDSoundRender->ppPins = CoTaskMemAlloc(1 * sizeof(IPin *)); + if (!pDSoundRender->ppPins) + { + DeleteCriticalSection(&pDSoundRender->csFilter); + CoTaskMemFree(pDSoundRender); + return E_OUTOFMEMORY; + } /* construct input pin */ piInput.dir = PINDIR_INPUT;

1 0

Felix Nawothnig : comctl32: Remove clrTextBkDefault member from LISTVIEW_INFO and fix (clrTextBk == CLR_DEFAULT) handling for custom drawing.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 08670ee725d6d7ec9c4838f8b9ef60d55615b7bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08670ee725d6d7ec9c4838f8b… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Mar 9 19:19:24 2007 +0100 comctl32: Remove clrTextBkDefault member from LISTVIEW_INFO and fix (clrTextBk == CLR_DEFAULT) handling for custom drawing. --- dlls/comctl32/listview.c | 11 ++++------- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f590437..ae02cd6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -253,7 +253,6 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; - COLORREF clrTextBkDefault; HIMAGELIST himlNormal; HIMAGELIST himlSmall; HIMAGELIST himlState; @@ -966,9 +965,7 @@ static void prepaint_setup (LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpn if (lpnmlvcd->clrTextBk != CLR_NONE) { SetBkMode(hdc, OPAQUE); - if (lpnmlvcd->clrTextBk == CLR_DEFAULT) - SetBkColor(hdc, infoPtr->clrTextBkDefault); - else + if (lpnmlvcd->clrTextBk != CLR_DEFAULT) SetBkColor(hdc,lpnmlvcd->clrTextBk); } else @@ -4036,7 +4033,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; - COLORREF oldTextColor, oldClrTextBk, oldClrText; + COLORREF oldTextColor, oldBkColor, oldClrTextBk, oldClrText; NMLVCUSTOMDRAW nmlvcd; HFONT hOldFont; DWORD cdmode; @@ -4051,7 +4048,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc) /* save dc values we're gonna trash while drawing */ hOldFont = SelectObject(hdc, infoPtr->hFont); oldBkMode = GetBkMode(hdc); - infoPtr->clrTextBkDefault = GetBkColor(hdc); + oldBkColor = GetBkColor(hdc); oldTextColor = GetTextColor(hdc); oldClrTextBk = infoPtr->clrTextBk; @@ -4111,7 +4108,7 @@ enddraw: SelectObject(hdc, hOldFont); SetBkMode(hdc, oldBkMode); - SetBkColor(hdc, infoPtr->clrTextBkDefault); + SetBkColor(hdc, oldBkColor); SetTextColor(hdc, oldTextColor); infoPtr->bIsDrawing = FALSE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0468237..32b9646 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -624,11 +624,11 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_DODEFAULT; } return CDRF_DODEFAULT;

1 0

Felix Nawothnig : comctl32: Add a failing custom draw related test.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 8677069c262f506b5d28cf8888a711f927f9979a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8677069c262f506b5d28cf888… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Fri Mar 9 18:45:21 2007 +0100 comctl32: Add a failing custom draw related test. --- dlls/comctl32/tests/listview.c | 99 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 90 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 17d50dc..0468237 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -32,6 +32,8 @@ #define LISTVIEW_ID 0 #define HEADER_ID 1 +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) + HWND hwndparent; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -416,14 +418,43 @@ static void test_checkboxes(void) DestroyWindow(hwnd); } +static void insert_column(HWND hwnd, int idx) +{ + LVCOLUMN column; + DWORD rc; + + memset(&column, 0xaa, sizeof(column)); + column.mask = LVCF_SUBITEM; + column.iSubItem = idx; + + rc = ListView_InsertColumn(hwnd, idx, &column); + expect(idx, rc); +} + +static void insert_item(HWND hwnd, int idx) +{ + static CHAR text[] = "foo"; + + LVITEMA item; + DWORD rc; + + memset(&item, 0xaa, sizeof (item)); + item.mask = LVIF_TEXT; + item.iItem = idx; + item.iSubItem = 0; + item.pszText = text; + + rc = ListView_InsertItemA(hwnd, &item); + expect(idx, rc); +} + static void test_items(void) { const LPARAM lparamTest = 0x42; HWND hwnd; LVITEMA item; - LVCOLUMNA column; DWORD r; - static CHAR text[] = "Text"; + static CHAR text[] = "Text"; hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -434,13 +465,8 @@ static void test_items(void) */ /* Set up two columns */ - column.mask = LVCF_SUBITEM; - column.iSubItem = 0; - r = SendMessage(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&column); - ok(r == 0, "ret %d\n", r); - column.iSubItem = 1; - r = SendMessage(hwnd, LVM_INSERTCOLUMNA, 1, (LPARAM)&column); - ok(r == 1, "ret %d\n", r); + insert_column(hwnd, 0); + insert_column(hwnd, 1); /* Insert an item with just a param */ memset (&item, 0xaa, sizeof (item)); @@ -580,6 +606,60 @@ static void test_redraw(void) DestroyWindow(hwnd); } +static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + COLORREF clr, c0ffee = RGB(0xc0, 0xff, 0xee); + + if(msg == WM_NOTIFY) { + NMHDR *nmhdr = (PVOID)lp; + if(nmhdr->code == NM_CUSTOMDRAW) { + NMLVCUSTOMDRAW *nmlvcd = (PVOID)nmhdr; + trace("NMCUSTOMDRAW (0x%.8x)\n", nmlvcd->nmcd.dwDrawStage); + switch(nmlvcd->nmcd.dwDrawStage) { + case CDDS_PREPAINT: + SetBkColor(nmlvcd->nmcd.hdc, c0ffee); + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + nmlvcd->clrTextBk = CLR_DEFAULT; + return CDRF_NOTIFYSUBITEMDRAW; + case CDDS_ITEMPREPAINT | CDDS_SUBITEM: + clr = GetBkColor(nmlvcd->nmcd.hdc); + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + return CDRF_NOTIFYPOSTPAINT; + case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: + clr = GetBkColor(nmlvcd->nmcd.hdc); + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + return CDRF_DODEFAULT; + } + return CDRF_DODEFAULT; + } + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static void test_customdraw(void) +{ + HWND hwnd; + WNDPROC oldwndproc; + + hwnd = create_listview_control(); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + oldwndproc = (WNDPROC)SetWindowLongPtr(hwndparent, GWL_WNDPROC, + (INT_PTR)cd_wndproc); + + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + + SetWindowLongPtr(hwndparent, GWL_WNDPROC, (INT_PTR)oldwndproc); + + DestroyWindow(hwnd); +} + START_TEST(listview) { INITCOMMONCONTROLSEX icc; @@ -597,4 +677,5 @@ START_TEST(listview) test_items(); test_create(); test_redraw(); + test_customdraw(); }

1 0

Rob Shearman : ole32: Implement CoAddRefServerProcess and CoReleaseServerProcess.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: f0189b8789280f2255bb2c2bf32e1ce018477c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0189b8789280f2255bb2c2bf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 18:55:13 2007 +0000 ole32: Implement CoAddRefServerProcess and CoReleaseServerProcess. --- dlls/ole32/compobj.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d0ef89c..a5a3220 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -106,6 +106,8 @@ struct registered_psclsid * libraries are freed */ static LONG s_COMLockCount = 0; +/* Reference count used by CoAddRefServerProcess/CoReleaseServerProcess */ +static LONG s_COMServerProcessReferences = 0; /* * This linked list contains the list of registered class objects. These @@ -2771,11 +2773,23 @@ HRESULT WINAPI CoSuspendClassObjects(void) * * RETURNS * New reference count. + * + * SEE ALSO + * CoReleaseServerProcess(). */ ULONG WINAPI CoAddRefServerProcess(void) { - FIXME("\n"); - return 2; + ULONG refs; + + TRACE("\n"); + + EnterCriticalSection(&csRegisteredClassList); + refs = ++s_COMServerProcessReferences; + LeaveCriticalSection(&csRegisteredClassList); + + TRACE("refs before: %d\n", refs - 1); + + return refs; } /*********************************************************************** @@ -2786,11 +2800,30 @@ ULONG WINAPI CoAddRefServerProcess(void) * * RETURNS * New reference count. + * + * NOTES + * When reference count reaches 0, this function suspends all registered + * classes so no new connections are accepted. + * + * SEE ALSO + * CoAddRefServerProcess(), CoSuspendClassObjects(). */ ULONG WINAPI CoReleaseServerProcess(void) { - FIXME("\n"); - return 1; + ULONG refs; + + TRACE("\n"); + + EnterCriticalSection(&csRegisteredClassList); + + refs = --s_COMServerProcessReferences; + /* FIXME: if (!refs) COM_SuspendClassObjects(); */ + + LeaveCriticalSection(&csRegisteredClassList); + + TRACE("refs after: %d\n", refs); + + return refs; } /*********************************************************************** diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 12ab39b..0c0dff7 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2303,7 +2303,7 @@ static void test_local_server(void) /* wait for shutdown signal */ ret = WaitForSingleObject(heventShutdown, 0); - todo_wine { ok(ret != WAIT_TIMEOUT, "Server didn't shut down\n"); } + ok(ret != WAIT_TIMEOUT, "Server didn't shut down\n"); /* try to connect again after SCM has suspended registered class objects */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL,

1 0

Rob Shearman : ole32: Make RegisteredClass list into a standard Wine list.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 789f344c2b11c8508043de842b6601cec9ca941b URL: http://source.winehq.org/git/wine.git/?a=commit;h=789f344c2b11c8508043de842… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 18:54:07 2007 +0000 ole32: Make RegisteredClass list into a standard Wine list. --- dlls/ole32/compobj.c | 69 +++++++++++++------------------------------------- 1 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 900fc68..d0ef89c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -117,6 +117,7 @@ static LONG s_COMLockCount = 0; */ typedef struct tagRegisteredClass { + struct list entry; CLSID classIdentifier; LPUNKNOWN classObject; DWORD runContext; @@ -124,10 +125,9 @@ typedef struct tagRegisteredClass DWORD dwCookie; LPSTREAM pMarshaledData; /* FIXME: only really need to store OXID and IPID */ void *RpcRegistration; - struct tagRegisteredClass* nextClass; } RegisteredClass; -static RegisteredClass* firstRegisteredClass = NULL; +static struct list RegisteredClassList = LIST_INIT(RegisteredClassList); static CRITICAL_SECTION csRegisteredClassList; static CRITICAL_SECTION_DEBUG class_cs_debug = @@ -1445,21 +1445,16 @@ static HRESULT COM_GetRegisteredClassObject( LPUNKNOWN* ppUnk) { HRESULT hr = S_FALSE; - RegisteredClass* curClass; - - EnterCriticalSection( &csRegisteredClassList ); + RegisteredClass *curClass; /* * Sanity check */ assert(ppUnk!=0); - /* - * Iterate through the whole list and try to match the class ID. - */ - curClass = firstRegisteredClass; + EnterCriticalSection( &csRegisteredClassList ); - while (curClass != 0) + LIST_FOR_EACH_ENTRY(curClass, &RegisteredClassList, RegisteredClass, entry) { /* * Check if we have a match on the class ID and context. @@ -1475,20 +1470,12 @@ static HRESULT COM_GetRegisteredClassObject( IUnknown_AddRef(curClass->classObject); hr = S_OK; - goto end; + break; } - - /* - * Step to the next class in the list. - */ - curClass = curClass->nextClass; } -end: LeaveCriticalSection( &csRegisteredClassList ); - /* - * If we get to here, we haven't found our class. - */ + return hr; } @@ -1569,8 +1556,6 @@ HRESULT WINAPI CoRegisterClassObject( if ( newClass == NULL ) return E_OUTOFMEMORY; - EnterCriticalSection( &csRegisteredClassList ); - newClass->classIdentifier = *rclsid; newClass->runContext = dwClsContext; newClass->connectFlags = flags; @@ -1582,7 +1567,6 @@ HRESULT WINAPI CoRegisterClassObject( * unique. FIXME: not on 64-bit platforms. */ newClass->dwCookie = (DWORD)newClass; - newClass->nextClass = firstRegisteredClass; /* * Since we're making a copy of the object pointer, we have to increase its @@ -1591,7 +1575,8 @@ HRESULT WINAPI CoRegisterClassObject( newClass->classObject = pUnk; IUnknown_AddRef(newClass->classObject); - firstRegisteredClass = newClass; + EnterCriticalSection( &csRegisteredClassList ); + list_add_tail(&RegisteredClassList, &newClass->entry); LeaveCriticalSection( &csRegisteredClassList ); *lpdwRegister = newClass->dwCookie; @@ -1647,30 +1632,20 @@ HRESULT WINAPI CoRevokeClassObject( DWORD dwRegister) { HRESULT hr = E_INVALIDARG; - RegisteredClass** prevClassLink; - RegisteredClass* curClass; + RegisteredClass *curClass; TRACE("(%08x)\n",dwRegister); EnterCriticalSection( &csRegisteredClassList ); - /* - * Iterate through the whole list and try to match the cookie. - */ - curClass = firstRegisteredClass; - prevClassLink = &firstRegisteredClass; - - while (curClass != 0) + LIST_FOR_EACH_ENTRY(curClass, &RegisteredClassList, RegisteredClass, entry) { /* * Check if we have a match on the cookie. */ if (curClass->dwCookie == dwRegister) { - /* - * Remove the class from the chain. - */ - *prevClassLink = curClass->nextClass; + list_remove(&curClass->entry); if (curClass->runContext & CLSCTX_LOCAL_SERVER) RPC_StopLocalServer(curClass->RpcRegistration); @@ -1684,7 +1659,6 @@ HRESULT WINAPI CoRevokeClassObject( { LARGE_INTEGER zero; memset(&zero, 0, sizeof(zero)); - /* FIXME: stop local server thread */ IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL); CoReleaseMarshalData(curClass->pMarshaledData); } @@ -1695,21 +1669,12 @@ HRESULT WINAPI CoRevokeClassObject( HeapFree(GetProcessHeap(), 0, curClass); hr = S_OK; - goto end; + break; } - - /* - * Step to the next class in the list. - */ - prevClassLink = &(curClass->nextClass); - curClass = curClass->nextClass; } -end: LeaveCriticalSection( &csRegisteredClassList ); - /* - * If we get to here, we haven't found our class. - */ + return hr; } @@ -2384,9 +2349,11 @@ static void COM_RevokeAllClasses(void) { EnterCriticalSection( &csRegisteredClassList ); - while (firstRegisteredClass!=0) + while (list_head(&RegisteredClassList)) { - CoRevokeClassObject(firstRegisteredClass->dwCookie); + RegisteredClass *curClass = LIST_ENTRY(list_head(&RegisteredClassList), + RegisteredClass, entry); + CoRevokeClassObject(curClass->dwCookie); } LeaveCriticalSection( &csRegisteredClassList );

1 0

Rob Shearman : ole32: Don' t keep the local server named pipe open for a single-use object.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 15a0b7fad5eb3239cd058dde490918422db481a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a0b7fad5eb3239cd058dde4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 17:51:36 2007 +0000 ole32: Don't keep the local server named pipe open for a single-use object. --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 2 +- dlls/ole32/rpc.c | 12 ++++- dlls/ole32/tests/marshal.c | 114 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 121 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 98ec995..900fc68 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1622,6 +1622,7 @@ HRESULT WINAPI CoRegisterClassObject( hr = RPC_StartLocalServer(&newClass->classIdentifier, newClass->pMarshaledData, + flags & (REGCLS_MULTIPLEUSE|REGCLS_MULTI_SEPARATE), &newClass->RpcRegistration); } return S_OK; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4c96a3c..a85a72d 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -221,7 +221,7 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); void RPC_UnregisterInterface(REFIID riid); -HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, void **registration); +HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration); void RPC_StopLocalServer(void *registration); HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv); HRESULT RPC_RegisterChannelHook(REFGUID rguid, IChannelHook *hook); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 3320552..d6b1a66 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1732,6 +1732,7 @@ struct local_server_params CLSID clsid; IStream *stream; HANDLE ready_event; + BOOL multi_use; HANDLE pipe; }; @@ -1749,6 +1750,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) LARGE_INTEGER seekto; ULARGE_INTEGER newpos; ULONG res; + BOOL multi_use = lsp->multi_use; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1817,13 +1819,20 @@ static DWORD WINAPI local_server_thread(LPVOID param) DisconnectNamedPipe(hPipe); TRACE("done marshalling IClassFactory\n"); + + if (!multi_use) + { + TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); + CloseHandle(hPipe); + break; + } } IStream_Release(pStm); return 0; } /* starts listening for a local server */ -HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, void **registration) +HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) { DWORD tid; HANDLE thread, ready_event; @@ -1833,6 +1842,7 @@ HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, void **registratio lsp->stream = stream; IStream_AddRef(stream); lsp->ready_event = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + lsp->multi_use = multi_use; thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); if (!thread) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index f06475d..12ab39b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -23,6 +23,7 @@ #define CONST_VTABLE #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -50,6 +51,14 @@ static const IID IID_IWineTest = #define EXTENTID_WineTest IID_IWineTest #define CLSID_WineTest IID_IWineTest +static const CLSID CLSID_WineOOPTest = +{ + 0x5201163f, + 0x8164, + 0x4fd0, + {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} +}; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ + static void test_cocreateinstance_proxy(void) { IUnknown *pProxy; @@ -2152,6 +2161,11 @@ static HRESULT WINAPI TestOOP_IClassFactory_CreateInstance( REFIID riid, LPVOID *ppvObj) { + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObj = iface; + return S_OK; + } return CLASS_E_CLASSNOTAVAILABLE; } @@ -2177,19 +2191,72 @@ static const IClassFactoryVtbl TestClassFactoryOOP_Vtbl = static IClassFactory TestOOP_ClassFactory = { &TestClassFactoryOOP_Vtbl }; +static void test_register_local_server(void) +{ + DWORD cookie; + HRESULT hr; + HANDLE ready_event; + HANDLE quit_event; + DWORD wait; + + heventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&TestOOP_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); + ok_ole_success(hr, CoRegisterClassObject); + + ready_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); + SetEvent(ready_event); + + quit_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); + + do + { + wait = MsgWaitForMultipleObjects(1, &quit_event, FALSE, INFINITE, QS_ALLINPUT); + if (wait == WAIT_OBJECT_0+1) + { + MSG msg; + BOOL ret = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); + if (ret) + { + trace("Message 0x%x\n", msg.message); + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + } + while (wait == WAIT_OBJECT_0+1); + + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, CoRevokeClassObject); +} + +static HANDLE create_target_process(const char *arg) +{ + char **argv; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFO si = { 0 }; + si.cb = sizeof(si); + + winetest_get_mainargs( &argv ); + sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); + ok(CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, + &si, &pi) != 0, "error: %u\n", GetLastError()); + ok(CloseHandle(pi.hThread) != 0, "error %u\n", GetLastError()); + return pi.hProcess; +} + /* tests functions commonly used by out of process COM servers */ static void test_local_server(void) { - static const CLSID CLSID_WineOOPTest = { - 0x5201163f, - 0x8164, - 0x4fd0, - {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} - }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ DWORD cookie; HRESULT hr; IClassFactory * cf; DWORD ret; + HANDLE process; + HANDLE quit_event; + HANDLE ready_event; heventShutdown = CreateEvent(NULL, TRUE, FALSE, NULL); @@ -2249,6 +2316,28 @@ static void test_local_server(void) ok_ole_success(hr, CoRevokeClassObject); CloseHandle(heventShutdown); + + process = create_target_process("-Embedding"); + ok(process != NULL, "couldn't start local server process, error was %d\n", GetLastError()); + + ready_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); + WaitForSingleObject(ready_event, 1000); + CloseHandle(ready_event); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + ok_ole_success(hr, CoCreateInstance); + + IClassFactory_Release(cf); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + ok(hr == REGDB_E_CLASSNOTREG, "Second CoCreateInstance on REGCLS_SINGLEUSE object should have failed\n"); + + quit_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); + SetEvent(quit_event); + + WaitForSingleObject(process, INFINITE); + CloseHandle(quit_event); + CloseHandle(process); } struct git_params @@ -2532,8 +2621,21 @@ START_TEST(marshal) { WNDCLASS wndclass; HMODULE hOle32 = GetModuleHandle("ole32"); + int argc; + char **argv; + if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) goto no_test; + argc = winetest_get_mainargs( &argv ); + if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) + { + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + test_register_local_server(); + CoUninitialize(); + + return; + } + /* register a window class used in several tests */ memset(&wndclass, 0, sizeof(wndclass)); wndclass.lpfnWndProc = window_proc;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007