inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-23 18:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12197: Fixes to the NT IOCTL call used by desktop actions. ETHREEOH-401, ACT-6025.
  12198: Fixes to the desktop action client side EXE and server side handler. Increased receive buffer size in the client side app. ETHREEOH-401, ACT-6025.
  12256: Fix to asynchronous CIFS receive that causes a Winsock error 0x0 and closes the session. JLAN-59.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka 2008-12-19 18:04:44 +00:00
parent 08676ac665
commit e534978b95
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/alfresco/desktop/Alfresco.exe
View File

Binary file not shown.

4
source/cpp/CAlfrescoApp/source/alfresco/Alfresco.cpp
View File

@ -251,7 +251,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( 4096); DataBuffer respbuf( 16384);
reqbuf.putFixedString( IOSignature, IOSignatureLen); reqbuf.putFixedString( IOSignature, IOSignatureLen);
reqbuf.putString( action.getName()); reqbuf.putString( action.getName());
@ -411,7 +411,7 @@ 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, 0, NULL); m_handle = CreateFile(m_uncPath, FILE_WRITE_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
} }
// Set the root path // Set the root path

36
source/cpp/CAlfrescoApp/source/util/DataBuffer.cpp
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 "util\DataBuffer.h" #include "util\DataBuffer.h"
@ -190,7 +182,7 @@ LONG64 DataBuffer::getLong( void) {
* @return String * @return String
*/ */
String DataBuffer::getString( bool uni) { String DataBuffer::getString( bool uni) {
return getString( 255, uni); return getString( getAvailableLength(), uni);
} }
/** /**

2
source/java/org/alfresco/filesys/repo/ContentIOControlHandler.java
View File

@ -204,7 +204,7 @@ public class ContentIOControlHandler implements IOControlHandler
if ( dataBuf.getLength() < IOControl.Signature.length()) if ( dataBuf.getLength() < IOControl.Signature.length())
throw new IOControlNotImplementedException("Bad request length"); throw new IOControlNotImplementedException("Bad request length");
String sig = dataBuf.getString(IOControl.Signature.length(), false); String sig = dataBuf.getFixedString(IOControl.Signature.length(), false);
if ( sig == null || sig.compareTo(IOControl.Signature) != 0) if ( sig == null || sig.compareTo(IOControl.Signature) != 0)
throw new IOControlNotImplementedException("Bad request signature"); throw new IOControlNotImplementedException("Bad request signature");