strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS obo05 (1.5.2); FILE MERGED

Browse source 
2006/06/28 10:29:31 obo 1.5.2.1: #i53711# .net 2005 signed/unsigned warnings
This commit is contained in:
Vladimir Glazounov 2006-09-25 12:16:02 +00:00
parent f67c6dbb0b
commit 38485ae3eb
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sal/systools/win32/uwinapi/CopyFileExA.cpp
View file

@ -4,9 +4,9 @@
*
* $RCSfile: CopyFileExA.cpp,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: hr $ $Date: 2006-06-20 04:32:10 $
* last change: $Author: vg $ $Date: 2006-09-25 13:14:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -32,6 +32,9 @@
* MA 02111-1307 USA
*
************************************************************************/
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#pragma warning(disable:4740)
#endif
#define _WIN32_WINNT 0x0400
#include "macros.h"
@ -86,7 +89,7 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExisti
GENERIC_WRITE,
0,
NULL,
(dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS,
(DWORD) ((dwCopyFlags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS),
0,
NULL
);
@ -169,4 +172,4 @@ IMPLEMENT_THUNK( kernel32, WINDOWS, BOOL, WINAPI, CopyFileExA, ( LPCSTR lpExisti
}
return fSuccess;
}
}

7
sal/systools/win32/uwinapi/DllMain.cpp
View file

@ -4,9 +4,9 @@
*
* $RCSfile: DllMain.cpp,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: hr $ $Date: 2006-06-20 04:32:35 $
* last change: $Author: vg $ $Date: 2006-09-25 13:16:02 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -59,7 +59,7 @@ static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
if ( lpLastBkSlash )
{
size_t nParentDirSize = _tcsinc( lpLastBkSlash ) - szModulePath;
size_t nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
LPSTR lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
if ( lpUnicowsModulePath )
@ -145,4 +145,3 @@ extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )