diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:15:48 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:15:48 +0000 |
commit | f67c6dbb0b763d7f9d4aca0ed614bb48b4dfd4ad (patch) | |
tree | e8855f62f19d18987690477854d83b0fc2721f24 /sal/systools | |
parent | 080a1ccaa87a0b68d49d70cf5ab594ebfb8de208 (diff) |
INTEGRATION: CWS obo05 (1.4.2); FILE MERGED
2006/06/28 10:29:31 obo 1.4.2.1: #i53711# .net 2005 signed/unsigned warnings
Diffstat (limited to 'sal/systools')
-rw-r--r-- | sal/systools/win32/uwinapi/DllGetVersion.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp index 8584bf64e54a..2342e0dcceec 100644 --- a/sal/systools/win32/uwinapi/DllGetVersion.cpp +++ b/sal/systools/win32/uwinapi/DllGetVersion.cpp @@ -4,9 +4,9 @@ * * $RCSfile: DllGetVersion.cpp,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:32:24 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:15:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,7 @@ extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi ) pdvi->dwMajorVersion = HIWORD( lpBuffer->dwFileVersionMS ); pdvi->dwMinorVersion = LOWORD( lpBuffer->dwFileVersionMS ); pdvi->dwBuildNumber = HIWORD( lpBuffer->dwFileVersionLS ); - pdvi->dwPlatformID = (lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS; + pdvi->dwPlatformID = (DWORD) ((lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS); fSuccess = TRUE; } @@ -75,4 +75,3 @@ extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi ) return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR ); } - |