wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Jacek Caban : jscript: Use host global object as default 'this' if available and global object otherwise.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d833314c7008afcf5d90ab038d18935196591e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d833314c7008afcf5d90ab038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 27 20:59:28 2009 +0200 jscript: Use host global object as default 'this' if available and global object otherwise. --- dlls/jscript/engine.c | 22 +++++----- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 47 +++++------------------ dlls/jscript/jscript.c | 27 ++++++------- dlls/jscript/jscript.h | 3 +- dlls/jscript/tests/jscript.c | 19 +++++++++ dlls/jscript/tests/run.c | 85 +++++++++++++++++++++++++++++++++++++++--- 7 files changed, 136 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d833314c7008afcf5d90a…

1 0

Andrey Turkin : user32: Accept SPI_GET/ SETMOUSEVANISH parameters in SystemParametersInfo.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: aa347e07211ecd6e5499dc60822a7d6f75603b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa347e07211ecd6e5499dc608… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Sep 27 21:28:23 2009 +0400 user32: Accept SPI_GET/SETMOUSEVANISH parameters in SystemParametersInfo. --- dlls/user32/sysparams.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 59276df..8d81404 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2317,8 +2317,15 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCK); /* 0x101F _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_GETMOUSEVANISH); /* 0x1020 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSEVANISH); /* 0x1021 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ + + case SPI_GETMOUSEVANISH: + ret = get_user_pref_param( 2, 0x01, pvParam ); + break; + + case SPI_SETMOUSEVANISH: + ret = set_user_pref_param( 2, 0x01, PtrToUlong(pvParam), fWinIni ); + break; + case SPI_GETFLATMENU: ret = get_user_pref_param( 2, 0x02, pvParam ); break;

1 0

Andrey Turkin : user32: Accept SPI_GET/ SETDROPSHADOW parameters in SystemParametersInfo.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 1a80add0e3ec96aaaa9f0643a1857c7a412c3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a80add0e3ec96aaaa9f0643a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Sep 27 19:50:29 2009 +0400 user32: Accept SPI_GET/SETDROPSHADOW parameters in SystemParametersInfo. --- dlls/user32/sysparams.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 94757a3..59276df 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2327,8 +2327,14 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_user_pref_param( 2, 0x02, PtrToUlong(pvParam), fWinIni ); break; - WINE_SPI_FIXME(SPI_GETDROPSHADOW); /* 0x1024 _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_SETDROPSHADOW); /* 0x1025 _WIN32_WINNT >= 0x510 */ + case SPI_GETDROPSHADOW: + ret = get_user_pref_param( 2, 0x04, pvParam ); + break; + + case SPI_SETDROPSHADOW: + ret = set_user_pref_param( 2, 0x04, PtrToUlong(pvParam), fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETBLOCKSENDINPUTRESETS); WINE_SPI_FIXME(SPI_SETBLOCKSENDINPUTRESETS); case SPI_GETUIEFFECTS:

1 0

Stefan Leichter : kernel32: Check parameter of CheckRemoteDebuggerPresent with tests.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 2c576e88b481f579b6fd87ff80da526570318529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c576e88b481f579b6fd87ff8… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Sep 27 10:10:41 2009 +0200 kernel32: Check parameter of CheckRemoteDebuggerPresent with tests. --- dlls/kernel32/debugger.c | 5 +++++ dlls/kernel32/tests/debugger.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index b83647c..bb0b5fa 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -402,6 +402,11 @@ BOOL WINAPI IsDebuggerPresent(void) */ BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE process, PBOOL DebuggerPresent) { + if(!process || !DebuggerPresent) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } FIXME("(%p)->(%p): Stub!\n", process, DebuggerPresent); *DebuggerPresent = FALSE; return TRUE; diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2f32478..57d68ec 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -32,6 +32,7 @@ static int myARGC; static char** myARGV; +static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); @@ -431,11 +432,42 @@ static void test_ExitCode(void) } } +static void test_RemoteDebugger(void) +{ + BOOL bret, present; + if(!pCheckRemoteDebuggerPresent) + { + win_skip("CheckRemoteDebuggerPresent is not available\n"); + return; + } + present = TRUE; + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),&present); + ok(bret , "expected CheckRemoteDebuggerPresent to succeed\n"); + ok(0xdeadbeef == GetLastError(), + "expected error to be unchanged, got %d/%x\n",GetLastError(), GetLastError()); + + present = TRUE; + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(NULL,&present); + ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); + ok(present, "expected parameter to be unchanged\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); + + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),NULL); + ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); +} + START_TEST(debugger) { HMODULE hdll; hdll=GetModuleHandle("kernel32.dll"); + pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); @@ -451,5 +483,6 @@ START_TEST(debugger) else { test_ExitCode(); + test_RemoteDebugger(); } }

1 0

Vincent Povirk : user32: Invert y in DrawTextEx in GM_COMPATIBLE mode if y increases up.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d1099eb4d819494e2fcfe0a3d7a1a6cd6a4d766f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1099eb4d819494e2fcfe0a3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 25 16:55:45 2009 -0500 user32: Invert y in DrawTextEx in GM_COMPATIBLE mode if y increases up. --- dlls/user32/tests/text.c | 2 +- dlls/user32/text.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 080e5dd..88ea6b5 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -80,7 +80,7 @@ static void test_DrawTextCalcRect(void) ok( textheight, "DrawTextA error %u\n", GetLastError()); trace("MM_HIENGLISH rect.bottom %d\n", rect.bottom); - todo_wine ok(rect.bottom < 0, "In MM_HIENGLISH, DrawText with " + ok(rect.bottom < 0, "In MM_HIENGLISH, DrawText with " "DT_CALCRECT should return a negative rectangle bottom. " "(bot=%d)\n", rect.bottom); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index b8aad0b..e34877f 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -855,6 +855,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; + int invert_y=0; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -898,6 +899,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } } + if (GetGraphicsMode(hdc) == GM_COMPATIBLE) + { + SIZE window_ext, viewport_ext; + GetWindowExtEx(hdc, &window_ext); + GetViewportExtEx(hdc, &viewport_ext); + if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) + invert_y = 1; + } + if (dtp) { lmargin = dtp->iLeftMargin; @@ -932,7 +942,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, do { len = sizeof(line)/sizeof(line[0]); - last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); if (flags & DT_CENTER) x = (rect->left + rect->right - @@ -1001,7 +1014,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, else if (size.cx > max_width) max_width = size.cx; - y += lh; + if (invert_y) + y -= lh; + else + y += lh; if (dtp) dtp->uiLengthDrawn += len; }

1 0

Detlef Riekenberg : urlmon/tests: Fix sec_mgr tests on win98 (IE 4).
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 575ee0bb4efbca3db06753278957e3caea6e0c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=575ee0bb4efbca3db06753278… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 25 17:55:48 2009 +0200 urlmon/tests: Fix sec_mgr tests on win98 (IE 4). --- dlls/urlmon/tests/sec_mgr.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 9d9e19c..2df702c 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -213,13 +213,15 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag policy = 0xdeadbeef; hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, sizeof(WCHAR), NULL, 0, 0, 0); - ok(hres == E_FAIL, "ProcessUrlAction(%x) failed: %08x, expected E_FAIL\n", action, hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); policy = 0xdeadbeef; hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); return; } @@ -425,7 +427,8 @@ static void test_GetZoneActionPolicy(void) hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1fff, buf, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 13, action, buf, sizeof(DWORD), URLZONEREG_DEFAULT);

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: f7d8954befde93bb19b642858d5b9175f1cdab32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d8954befde93bb19b642858… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 25 21:25:36 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 39c6f68..c523b6d 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -46,4 +46,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "Objet JScript attendu" IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" + IDS_ARRAY_EXPECTED "Objet tableau attendu" }

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 5e030ac12657c21d9fc64bcc29ce8bab29a0af7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e030ac12657c21d9fc64bcc2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 25 17:54:59 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 39a229b..80a150e 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -40,5 +40,8 @@ STRINGTABLE DISCARDABLE IDS_ILLEGAL_ASSIGN "Unzulässige Zuweisung" IDS_UNDEFINED "'|' nicht definiert" IDS_NOT_BOOL "Boolisches Objekt erwartet" + IDS_JSCRIPT_EXPECTED "JScript Objekt erwartet" + IDS_REGEXP_SYNTAX_ERROR "Syntax Fehler in regulärem Ausdruck" IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" + IDS_ARRAY_EXPECTED "Array Objekt erwartet" }

1 0

Colin Fowler : libport: Add generic interlocked instruction support fallback.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: c741ad7dde3210843bb0d9eb07145e5f705bf355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c741ad7dde3210843bb0d9eb0… Author: Colin Fowler <elethiomel(a)gmail.com> Date: Fri Sep 25 16:53:17 2009 +0100 libport: Add generic interlocked instruction support fallback. --- libs/port/interlocked.c | 147 ++++++++++++++++++++++++----------------------- 1 files changed, 75 insertions(+), 72 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 51794d3..b2d4b52 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -268,77 +268,6 @@ void* interlocked_xchg_ptr( void** dest, void* val ) return ret; } -#elif defined(__sparc__) && defined(__sun__) - -/* - * As the earlier Sparc processors lack necessary atomic instructions, - * I'm simply falling back to the library-provided _lwp_mutex routines - * to ensure mutual exclusion in a way appropriate for the current - * architecture. - * - * FIXME: If we have the compare-and-swap instruction (Sparc v9 and above) - * we could use this to speed up the Interlocked operations ... - */ -#include <synch.h> -static lwp_mutex_t interlocked_mutex = DEFAULTMUTEX; - -int interlocked_cmpxchg( int *dest, int xchg, int compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) -{ - _lwp_mutex_lock( &interlocked_mutex ); - if (*dest == compare) *dest = xchg; - else compare = *dest; - _lwp_mutex_unlock( &interlocked_mutex ); - return compare; -} - -int interlocked_xchg( int *dest, int val ) -{ - int retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest = val; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - -void *interlocked_xchg_ptr( void **dest, void *val ) -{ - void *retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest = val; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - -int interlocked_xchg_add( int *dest, int incr ) -{ - int retv; - _lwp_mutex_lock( &interlocked_mutex ); - retv = *dest; - *dest += incr; - _lwp_mutex_unlock( &interlocked_mutex ); - return retv; -} - #elif defined(__ALPHA__) && defined(__GNUC__) __ASM_GLOBAL_FUNC(interlocked_cmpxchg, @@ -395,6 +324,80 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add, "beq $1,L0xchg_add\n\t" "mb") + #else -# error You must implement the interlocked* functions for your CPU + +#include <pthread.h> + +static pthread_mutex_t interlocked_mutex = PTHREAD_MUTEX_INITIALIZER; + +int interlocked_cmpxchg( int *dest, int xchg, int compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + pthread_mutex_lock( &interlocked_mutex ); + + if (*dest == compare) + *dest = xchg; + else + compare = *dest; + + pthread_mutex_unlock( &interlocked_mutex ); + return compare; +} + +int interlocked_xchg( int *dest, int val ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest = val; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + +void *interlocked_xchg_ptr( void **dest, void *val ) +{ + void *retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest = val; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + +int interlocked_xchg_add( int *dest, int incr ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + retv = *dest; + *dest += incr; + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} + #endif

1 0

Markus Stockhausen : ole32/storage32: Fix for reference counters in nested storage.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: abdebcdbbe61cfaf7c9198f279637ec69daa63d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdebcdbbe61cfaf7c9198f27… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Fri Sep 25 16:27:49 2009 +0200 ole32/storage32: Fix for reference counters in nested storage. --- dlls/ole32/storage32.c | 4 +--- dlls/ole32/tests/storage32.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6e3e1e1..9082334 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3713,7 +3713,6 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageBaseImpl_Release((IStorage*)This->base.ancestorStorage); HeapFree(GetProcessHeap(), 0, This); } @@ -4312,10 +4311,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /* - * Keep the ancestor storage pointer and nail a reference to it. + * Keep the ancestor storage pointer but do not nail a reference to it. */ newStorage->base.ancestorStorage = ancestorStorage; - StorageBaseImpl_AddRef((IStorage*)(newStorage->base.ancestorStorage)); /* * Keep the index of the root property set for this storage, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fec854e..620e6cb 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1470,6 +1470,45 @@ static void test_fmtusertypestg(void) } } +static void test_references(void) +{ + IStorage *stg,*stg2; + HRESULT hr; + unsigned c1,c2; + static const WCHAR StorName[] = { 'D','a','t','a','S','p','a','c','e','I','n','f','o',0 }; + + DeleteFileA(filenameA); + + hr = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfile failed\n"); + + if (SUCCEEDED(hr)) + { + IStorage_Release(stg); + + hr = StgOpenStorage( filename, NULL, STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg); + ok(hr==S_OK, "StgOpenStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStorage(stg,StorName,STGM_READWRITE | STGM_SHARE_EXCLUSIVE,0,0,&stg2); + ok(hr == S_OK, "IStorage_CreateStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + c1 = IStorage_AddRef(stg); + ok(c1 == 2, "creating internal storage added references to ancestor\n"); + c1 = IStorage_AddRef(stg); + IStorage_Release(stg2); + c2 = IStorage_AddRef(stg) - 1; + ok(c1 == c2, "releasing internal storage removed references to ancestor\n"); + } + c1 = IStorage_Release(stg); + while ( c1 ) c1 = IStorage_Release(stg); + } + } +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -1497,4 +1536,5 @@ START_TEST(storage32) test_readonly(); test_simple(); test_fmtusertypestg(); + test_references(); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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 September 2009