diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-04-30 19:32:01 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-04-30 19:32:01 +0200 |
| commit | 1e9f6f4533ff3444ff22d37248df77a2aac43922 (patch) | |
| tree | a81145660accd8a1c91b6d5861ef3f3664ffe712 | |
| parent | 5b121a81aac8230749269b84ed5bcf0467935632 (diff) | |
| parent | 73b403be677ac5957ea38be4dcd5f443387e8d7e (diff) | |
CWS-TOOLING: integrate CWS fwk141ooo/OOO320_m18ooo/OOO320_m17
| -rw-r--r-- | extensions/source/activex/main/so_activex.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 4f109209f..c16cedac3 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -44,8 +44,10 @@ const REGSAM n32KeyAccess = KEY_ALL_ACCESS; #ifdef _AMD64_ const BOOL bX64 = TRUE; +#define REG_DELETE_KEY_A( key, aPath, nKeyAccess ) RegDeleteKeyExA( key, aPath, nKeyAccess, 0 ) #else const BOOL bX64 = FALSE; +#define REG_DELETE_KEY_A( key, aPath, nKeyAccess ) RegDeleteKeyA( key, aPath ) #endif // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. @@ -363,7 +365,7 @@ HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) RegCloseKey( hkey1 ),hkey1= NULL; // delete the key itself - return RegDeleteKeyExA( hkey, pPath, nKeyAccess & ( KEY_WOW64_64KEY | KEY_WOW64_32KEY ), 0 ); + return REG_DELETE_KEY_A( hkey, pPath, nKeyAccess & ( KEY_WOW64_64KEY | KEY_WOW64_32KEY ) ); } STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) |