[Libreoffice-commits] .: sal/qa

Fridrich Strba fridrich at kemper.freedesktop.org
Sun Mar 20 01:51:14 PDT 2011


 sal/qa/osl/security/osl_Security.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit edaaca1390b5d95243b12c541986fd89518cb0f5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Mar 20 09:51:07 2011 +0100

    Fix Windows build of sal

diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index ef928bc..9ef5626 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -460,7 +460,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
     LPCWSTR wszAccName = ( LPWSTR ) strUserName.getStr( );
 
     // Create buffers for the SID and the domain name.
-    PSID pSid = (PSID) new WIN_BYTE[dwSidBufferSize];
+    PSID pSid = (PSID) new BYTE[dwSidBufferSize];
     CPPUNIT_ASSERT_MESSAGE("# creating SID buffer failed.\n", pSid!= NULL );
     memset( pSid, 0, dwSidBufferSize);
 
@@ -498,7 +498,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
                 // Reallocate memory for the SID buffer.
                 wprintf(L"# The SID buffer was too small. It will be reallocated.\n");
                 FreeSid( pSid);
-                pSid = (PSID) new WIN_BYTE[cbSid];
+                pSid = (PSID) new BYTE[cbSid];
                 CPPUNIT_ASSERT_MESSAGE("# re-creating SID buffer failed.\n",  pSid!= NULL );
                 memset( pSid, 0, cbSid);
                 dwSidBufferSize = cbSid;
@@ -579,7 +579,7 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
     /// check if logged in user is administrator:
 
-    WIN_BOOL b;
+    BOOL b;
     SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
     PSID AdministratorsGroup;
     b = AllocateAndInitializeSid(


More information about the Libreoffice-commits mailing list