Fixes for the client side Windows desktop action application. part of ETHREEOH-401.

Open parent folder for read-only access, added more client side debugging.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2009-06-10 11:29:01 +00:00
parent 896bfd8986
commit a67740910c
3 changed files with 33 additions and 57 deletions

Binary file not shown.

View File

@@ -1,26 +1,18 @@
/* /*
* Copyright (C) 2005-2007 Alfresco Software Limited. * Copyright (C) 2005-2006 Alfresco, Inc.
* *
* This program is free software; you can redistribute it and/or * Licensed under the Mozilla Public License version 1.1
* modify it under the terms of the GNU General Public License * with a permitted attribution clause. You may obtain a
* as published by the Free Software Foundation; either version 2 * copy of the License at
* of the License, or (at your option) any later version. *
* http://www.alfresco.org/legal/license.txt
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * Unless required by applicable law or agreed to in writing,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * software distributed under the License is distributed on an
* GNU General Public License for more details. * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific
* You should have received a copy of the GNU General Public License * language governing permissions and limitations under the
* along with this program; if not, write to the Free Software * License.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/ */
#include "stdafx.h" #include "stdafx.h"
@@ -179,6 +171,11 @@ BOOL CAlfrescoApp::InitInstance()
DBGOUT_TS << "Using document path as working directory, " << folderPath << endl; DBGOUT_TS << "Using document path as working directory, " << folderPath << endl;
} }
// DEBUG
if ( HAS_DEBUG)
DBGOUT_TS << "Using folder path " << folderPath << " for Alfresco base dir" << endl;
// Create the Alfresco interface // Create the Alfresco interface
AlfrescoInterface alfresco(folderPath); AlfrescoInterface alfresco(folderPath);

View File

@@ -19,6 +19,7 @@
#include "util\DataBuffer.h" #include "util\DataBuffer.h"
#include "util\Exception.h" #include "util\Exception.h"
#include "util\Integer.h" #include "util\Integer.h"
#include "util\Debug.h"
#include <WinNetWk.h> #include <WinNetWk.h>
@@ -251,7 +252,7 @@ DesktopResponse AlfrescoInterface::runAction(AlfrescoActionInfo& action, Desktop
// Build the run action I/O control request // Build the run action I/O control request
DataBuffer reqbuf( 1024); DataBuffer reqbuf( 1024);
DataBuffer respbuf( 16384); DataBuffer respbuf( 16 * 1024);
reqbuf.putFixedString( IOSignature, IOSignatureLen); reqbuf.putFixedString( IOSignature, IOSignatureLen);
reqbuf.putString( action.getName()); reqbuf.putString( action.getName());
@@ -282,40 +283,6 @@ DesktopResponse AlfrescoInterface::runAction(AlfrescoActionInfo& action, Desktop
return response; return response;
} }
/**
* Get the authentication ticket for this session
*
* @return DesktopResponse
*/
DesktopResponse AlfrescoInterface::getAuthenticationTicket( void) {
// Check if the folder handle is valid
if ( m_handle == INVALID_HANDLE_VALUE)
throw BadInterfaceException();
// Build the run action I/O control request
DataBuffer reqbuf( 32);
DataBuffer respbuf( 256);
reqbuf.putFixedString( IOSignature, IOSignatureLen);
// Send the get auth ticket request
sendIOControl( FSCTL_ALFRESCO_GETAUTHTICKET, reqbuf, respbuf);
// Unpack the get auth ticket response
unsigned int actionSts = respbuf.getInt();
String actionMsg = respbuf.getString();
// Return the desktop response
DesktopResponse response(actionSts, actionMsg);
return response;
}
/** /**
* Send an I/O control request to the Alfresco CIFS server, receive and validate the response * Send an I/O control request to the Alfresco CIFS server, receive and validate the response
* *
@@ -411,7 +378,19 @@ bool AlfrescoInterface::setRootPath( const wchar_t* rootPath) {
// Open the path // Open the path
m_handle = CreateFile(m_uncPath, FILE_WRITE_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); m_handle = CreateFile(m_uncPath, FILE_READ_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
if ( m_handle == INVALID_HANDLE_VALUE) {
// DEBUG
if ( HAS_DEBUG)
DBGOUT_TS << "%% Error opening folder " << m_uncPath << ", error " << GetLastError() << endl;
// Error, failed to open folder on Alfresco CIFS share
return false;
}
} }
// Set the root path // Set the root path