wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Vincent Povirk : ole32: Cache the contents of one extended big block depot block.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: e883aeb3943ccf8b25b19ca582ea1d8b06561ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e883aeb3943ccf8b25b19ca58… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 19 16:55:49 2010 -0500 ole32: Cache the contents of one extended big block depot block. --- dlls/ole32/storage32.c | 29 +++++++++++++++++++++++++---- dlls/ole32/storage32.h | 3 +++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 311f2ae..b58e445 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2760,6 +2760,7 @@ static HRESULT StorageImpl_Construct( * There is no block depot cached yet. */ This->indexBlockDepotCached = 0xFFFFFFFF; + This->indexExtBlockDepotCached = 0xFFFFFFFF; /* * Start searching for free blocks with block 0. @@ -3134,17 +3135,32 @@ static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) ULONG extBlockOffset = numExtBlocks % depotBlocksPerExtBlock; ULONG blockIndex = BLOCK_UNUSED; ULONG extBlockIndex; + BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; + int index, num_blocks; assert(depotIndex >= COUNT_BBDEPOTINHEADER); if (extBlockCount >= This->extBigBlockDepotCount) return BLOCK_UNUSED; - extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; + if (This->indexExtBlockDepotCached != extBlockCount) + { + extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; - if (extBlockIndex != BLOCK_UNUSED) - StorageImpl_ReadDWordFromBigBlock(This, extBlockIndex, - extBlockOffset * sizeof(ULONG), &blockIndex); + StorageImpl_ReadBigBlock(This, extBlockIndex, depotBuffer); + + num_blocks = This->bigBlockSize / 4; + + for (index = 0; index < num_blocks; index++) + { + StorageUtl_ReadDWord(depotBuffer, index*sizeof(ULONG), &blockIndex); + This->extBlockDepotCached[index] = blockIndex; + } + + This->indexExtBlockDepotCached = extBlockCount; + } + + blockIndex = This->extBlockDepotCached[extBlockOffset]; return blockIndex; } @@ -3176,6 +3192,11 @@ static void Storage32Impl_SetExtDepotBlock(StorageImpl* This, ULONG depotIndex, extBlockOffset * sizeof(ULONG), blockIndex); } + + if (This->indexExtBlockDepotCached == extBlockCount) + { + This->extBlockDepotCached[extBlockOffset] = blockIndex; + } } /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 72a5fe7..0f8b3b4 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -358,6 +358,9 @@ struct StorageImpl ULONG extBigBlockDepotCount; ULONG bigBlockDepotStart[COUNT_BBDEPOTINHEADER]; + ULONG extBlockDepotCached[MAX_BIG_BLOCK_SIZE / 4]; + ULONG indexExtBlockDepotCached; + ULONG blockDepotCached[MAX_BIG_BLOCK_SIZE / 4]; ULONG indexBlockDepotCached; ULONG prevFreeBlock;

1 0

Alexandre Julliard : user32: Add a stub for IsGUIThread().
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 14a77db43f242c2acacc910a868fcc23bee49911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a77db43f242c2acacc910a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 21:01:08 2010 +0100 user32: Add a stub for IsGUIThread(). --- dlls/user32/message.c | 10 ++++++++++ dlls/user32/user32.spec | 2 +- include/winuser.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c6daf31..93a90ea 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4230,6 +4230,16 @@ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id ) /********************************************************************** + * IsGUIThread (USER32.@) + */ +BOOL WINAPI IsGUIThread( BOOL convert ) +{ + FIXME( "%u: stub\n", convert ); + return TRUE; +} + + +/********************************************************************** * GetGUIThreadInfo (USER32.@) */ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 072fed4..5eb7154 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -436,7 +436,7 @@ @ stdcall IsDialogMessageA(long ptr) @ stdcall IsDialogMessageW(long ptr) @ stdcall IsDlgButtonChecked(long long) -# @ stub IsGUIThread +@ stdcall IsGUIThread(long) @ stdcall IsHungAppWindow(long) # @ stub IsHungThread @ stdcall IsIconic(long) diff --git a/include/winuser.h b/include/winuser.h index 154c8da..83c99cb 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4814,6 +4814,7 @@ WINUSERAPI BOOL WINAPI IsDialogMessageA(HWND,LPMSG); WINUSERAPI BOOL WINAPI IsDialogMessageW(HWND,LPMSG); #define IsDialogMessage WINELIB_NAME_AW(IsDialogMessage) WINUSERAPI UINT WINAPI IsDlgButtonChecked(HWND,int); +WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU);

1 0

Alexandre Julliard : user32: Check structure size in GetGUIThreadInfo.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 30554d4ef12038e07961b16013c5dacb0fca3503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30554d4ef12038e07961b1601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 20:57:27 2010 +0100 user32: Check structure size in GetGUIThreadInfo. --- dlls/user32/focus.c | 1 + dlls/user32/message.c | 7 +++++++ dlls/user32/painting.c | 1 + dlls/user32/tests/win.c | 16 ++++++++++++++++ dlls/user32/win.c | 1 + dlls/winex11.drv/event.c | 1 + 6 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f086584..70a2a8a 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -160,6 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { GUITHREADINFO info; + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); /* Do not change focus if the window is no more active */ if (hwnd == info.hwndActive) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b073e1c..c6daf31 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2359,6 +2359,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* find the window to dispatch this mouse message to */ + info.cbSize = sizeof(info); GetGUIThreadInfo( GetCurrentThreadId(), &info ); if (info.hwndCapture) { @@ -4235,6 +4236,12 @@ BOOL WINAPI GetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) { BOOL ret; + if (info->cbSize != sizeof(*info)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + SERVER_START_REQ( get_thread_input ) { req->tid = id; diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index e7ce2ec..c3a25fb 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -801,6 +801,7 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, RECT rect, mapped_rcCaret; BOOL hide_caret = FALSE; + info.cbSize = sizeof(info); if (!GetGUIThreadInfo( GetCurrentThreadId(), &info )) return 0; if (!info.hwndCaret) return 0; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5a378de..ab06687 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -611,6 +611,22 @@ static DWORD CALLBACK enum_thread( void *arg ) BOOL ret; MSG msg; + if (pGetGUIThreadInfo) + { + GUITHREADINFO info; + info.cbSize = sizeof(info); + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( ret || broken(!ret), /* win9x */ + "GetGUIThreadInfo failed without message queue\n" ); + SetLastError( 0xdeadbeef ); + info.cbSize = sizeof(info) + 1; + ret = pGetGUIThreadInfo( GetCurrentThreadId(), &info ); + ok( !ret, "GetGUIThreadInfo succeeded with wrong size\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "wrong error %u\n", GetLastError() ); + } + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure we have a message queue */ count = 0; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f9b6be2..f1da48b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1587,6 +1587,7 @@ static void WIN_SendDestroyMsg( HWND hwnd ) { GUITHREADINFO info; + info.cbSize = sizeof(info); if (GetGUIThreadInfo( GetCurrentThreadId(), &info )) { if (hwnd == info.hwndCaret) DestroyCaret(); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ae0875b..5447a40 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -497,6 +497,7 @@ static void set_focus( Display *display, HWND hwnd, Time time ) TRACE( "setting foreground window to %p\n", hwnd ); SetForegroundWindow( hwnd ); + threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); focus = threadinfo.hwndFocus; if (!focus) focus = threadinfo.hwndActive;

1 0

Hans Leidekker : winspool.drv: Return success from the AddPrintProcessorW stub.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b8d0c0dcc70dc06674c9b0f42230357c736359f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d0c0dcc70dc06674c9b0f42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:50 2010 +0100 winspool.drv: Return success from the AddPrintProcessorW stub. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4ffe092..3076572 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4666,7 +4666,7 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathNa { FIXME("(%s,%s,%s,%s): stub\n", debugstr_w(pName), debugstr_w(pEnvironment), debugstr_w(pPathName), debugstr_w(pPrintProcessorName)); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Piotr Caban : shell32/tests: Added SHPropStg* tests.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b1c1ace81ac29260700b0f936d19b30a6584f6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c1ace81ac29260700b0f936… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 15:49:47 2010 +0100 shell32/tests: Added SHPropStg* tests. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/shellole.c | 437 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 438 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1c1ace81ac29260700b0…

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgWriteMultiple.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b490803b37c8e0ef781914ee2c448ae05ba20154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b490803b37c8e0ef781914ee2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:22 2010 +0100 shell32: Added partial implementation of SHPropStgWriteMultiple. --- dlls/shell32/shellole.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 5168e38..d678276 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -752,6 +752,37 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + UINT codepage; + HRESULT hres; + + FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return hres; + + if(uCodePage && *uCodePage) + codepage = *uCodePage; + else { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres)) + return hres; + if(ret.vt!=VT_I2 || !ret.u.iVal) + return E_FAIL; + + codepage = ret.u.iVal; + if(uCodePage) + *uCodePage = codepage; + } + + /* TODO: do something with codepage and stat */ + + hres = IPropertyStorage_WriteMultiple(pps, cpspec, rgpspec, rgvar, propidNameFirst); + return hres; }

1 0

Piotr Caban : shell32: Added partial implementation of SHPropStgReadMultiple.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: c148c0419d3acd481cb84172412a2226909c9f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c148c0419d3acd481cb841724… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:13 2010 +0100 shell32: Added partial implementation of SHPropStgReadMultiple. --- dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 0949647..5168e38 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -715,8 +715,35 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) { - FIXME("stub\n"); - return E_NOTIMPL; + STATPROPSETSTG stat; + HRESULT hres; + + FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); + + memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); + hres = IPropertyStorage_ReadMultiple(pps, cpspec, rgpspec, rgvar); + if(FAILED(hres)) + return hres; + + if(!uCodePage) { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(pps, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + return S_OK; + + uCodePage = ret.u.iVal; + } + + hres = IPropertyStorage_Stat(pps, &stat); + if(FAILED(hres)) + return S_OK; + + /* TODO: do something with codepage and stat */ + return S_OK; } /*************************************************************************

1 0

Piotr Caban : shell32: Added SHPropStgCreate implementation.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: bfaae9bf7da649033d2ff948910d9130c92faf5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaae9bf7da649033d2ff9489… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:58:03 2010 +0100 shell32: Added SHPropStgCreate implementation. --- dlls/shell32/shellole.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 1161ff4..0949647 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -26,6 +26,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -665,8 +666,47 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) { - FIXME("stub\n"); - return E_NOTIMPL; + PROPSPEC prop; + PROPVARIANT ret; + HRESULT hres; + + TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), + grfFlags, grfMode, dwDisposition, ppstg, puCodePage); + + hres = IPropertySetStorage_Open(psstg, fmtid, grfMode, ppstg); + + switch(dwDisposition) { + case CREATE_ALWAYS: + if(SUCCEEDED(hres)) { + IPropertyStorage_Release(*ppstg); + hres = IPropertySetStorage_Delete(psstg, fmtid); + if(FAILED(hres)) + return hres; + hres = E_FAIL; + } + + case OPEN_ALWAYS: + case CREATE_NEW: + if(FAILED(hres)) + hres = IPropertySetStorage_Create(psstg, fmtid, pclsid, + grfFlags, grfMode, ppstg); + + case OPEN_EXISTING: + if(FAILED(hres)) + return hres; + + if(puCodePage) { + prop.ulKind = PRSPEC_PROPID; + prop.u.propid = PID_CODEPAGE; + hres = IPropertyStorage_ReadMultiple(*ppstg, 1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + *puCodePage = 0; + else + *puCodePage = ret.u.iVal; + } + } + + return S_OK; } /*************************************************************************

1 0

Piotr Caban : shell32: Added SHPropStg* stubs.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 14b13f77afac82e6a6e5da99f1ba267c38e13944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b13f77afac82e6a6e5da99f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 16 14:57:52 2010 +0100 shell32: Added SHPropStg* stubs. --- dlls/shell32/shell32.spec | 4 ++++ dlls/shell32/shellole.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index d4f526f..b5debf1 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -253,6 +253,10 @@ 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() + 685 stdcall SHPropStgCreate(ptr ptr ptr long long long ptr ptr) + 688 stdcall SHPropStgReadMultiple(ptr long long ptr ptr) + 689 stdcall SHPropStgWriteMultiple(ptr ptr long ptr ptr long) + 704 stdcall -noname GUIDFromStringW(wstr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 6d284b5..1161ff4 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -657,3 +657,34 @@ end: GlobalUnlock(hDrop); return i; } + +/************************************************************************* + * SHPropStgCreate [SHELL32.685] + */ +HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, + const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, + DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgReadMultiple [SHELL32.688] + */ +HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/************************************************************************* + * SHPropStgWriteMultiple [SHELL32.689] + */ +HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, + ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) +{ + FIXME("stub\n"); + return E_NOTIMPL; +}

1 0

Jacek Caban : ole32: Skip more tests on win9x.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 0c6f2a6d2ab2c66138429a6665b814437f889562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6f2a6d2ab2c66138429a666… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 13:39:11 2010 +0100 ole32: Skip more tests on win9x. --- dlls/ole32/tests/marshal.c | 22 ++++++++-------------- dlls/ole32/tests/moniker.c | 5 +++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef101ae..3d0ab16 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1437,14 +1437,8 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); - /* this statement causes Win9x DCOM to crash during CoUninitialize of - * other apartment, so don't test this on Win9x (signified by NT-only - * export of CoRegisterSurrogateEx) */ - if (GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) - /* now be really bad and release the proxy from the wrong apartment */ - IUnknown_Release(cf); - else - skip("skipping test for releasing proxy from wrong apartment that will succeed, but cause a crash during CoUninitialize\n"); + /* now be really bad and release the proxy from the wrong apartment */ + IUnknown_Release(cf); CoUninitialize(); @@ -3060,7 +3054,12 @@ START_TEST(marshal) int argc; char **argv; - if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"))) goto no_test; + if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + + pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) @@ -3127,9 +3126,4 @@ START_TEST(marshal) test_channel_hook(); CoUninitialize(); - return; - -no_test: - trace("You need DCOM95 installed to run this test\n"); - return; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 876d034..33edde1 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1998,6 +1998,11 @@ static void test_save_load_filemoniker(void) START_TEST(moniker) { + if (!GetProcAddress(GetModuleHandleA("ole32.dll"), "CoRegisterSurrogateEx")) { + win_skip("skipping test on win9x\n"); + return; + } + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_ROT();

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
87
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 November 2010