[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[QbProg]

The following commit has been merged in the debian branch:
commit 1c637614d1bc7dc573ef53289f71651bfdef6d08
Author: QbProg <tholag at gmail.com>
Date:   Sun Nov 25 12:02:51 2012 +0100

    Fixes for WNT compilation:
    HANDLE should not be used in hxx files, since windows.h it's not included.
    Used specific data type for EnvironmentIterator
    LWAlign compilation fix

diff --git a/inc/OSD_DirectoryIterator.hxx b/inc/OSD_DirectoryIterator.hxx
index 45c3ba1..c9e49e2 100644
--- a/inc/OSD_DirectoryIterator.hxx
+++ b/inc/OSD_DirectoryIterator.hxx
@@ -102,7 +102,7 @@ Standard_Address myDescr;
 Standard_Address myEntry;
 Standard_Integer myInit;
 OSD_Error myError;
-Standard_Integer myHandle;
+Standard_Address myHandle;
 Standard_Address myData;
 Standard_Boolean myFirstCall;
 
diff --git a/inc/OSD_EnvironmentIterator.hxx b/inc/OSD_EnvironmentIterator.hxx
index 3199ba2..18dc2fb 100644
--- a/inc/OSD_EnvironmentIterator.hxx
+++ b/inc/OSD_EnvironmentIterator.hxx
@@ -80,7 +80,7 @@ private:
 
 Standard_Address myEnv;
 #ifdef WNT
-Standard_Address myCount;
+Standard_Character * myCount;
 #else
 Standard_Integer myCount;
 #endif
diff --git a/inc/OSD_FileIterator.hxx b/inc/OSD_FileIterator.hxx
index 173635a..6771386 100644
--- a/inc/OSD_FileIterator.hxx
+++ b/inc/OSD_FileIterator.hxx
@@ -102,7 +102,7 @@ Standard_Address myDescr;
 Standard_Address myEntry;
 Standard_Integer myInit;
 OSD_Error myError;
-Standard_Integer myHandle;
+Standard_Address myHandle;
 Standard_Address myData;
 Standard_Boolean myFirstCall;
 
diff --git a/inc/OSD_FileNode.hxx b/inc/OSD_FileNode.hxx
index cd4c4d5..57d74d1 100644
--- a/inc/OSD_FileNode.hxx
+++ b/inc/OSD_FileNode.hxx
@@ -100,7 +100,7 @@ protected:
 
 OSD_Path myPath;
 #ifdef WNT
-HANDLE myFileChannel;
+Standard_Address myFileChannel;
 #else
 Standard_Integer myFileChannel;
 #endif
diff --git a/inc/OSD_SharedMemory.hxx b/inc/OSD_SharedMemory.hxx
index 9b323c4..c85b279 100644
--- a/inc/OSD_SharedMemory.hxx
+++ b/inc/OSD_SharedMemory.hxx
@@ -96,7 +96,7 @@ private:
 
 
 #ifdef WNT
-HANDLE myId;
+Standard_Address myId;
 #else
 Standard_Integer myId;
 #endif
diff --git a/src/OSD/OSD_EnvironmentIterator.cxx b/src/OSD/OSD_EnvironmentIterator.cxx
index b399798..08ed95f 100644
--- a/src/OSD/OSD_EnvironmentIterator.cxx
+++ b/src/OSD/OSD_EnvironmentIterator.cxx
@@ -102,7 +102,7 @@ Standard_Integer OSD_EnvironmentIterator::Error()const{
 OSD_EnvironmentIterator :: OSD_EnvironmentIterator () {
 
  myEnv   = GetEnvironmentStrings ();
- myCount = myEnv;
+ myCount = reinterpret_cast<Standard_Character*>(myEnv);
 
 }  // end constructor
 
diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx
index cce9bcd..763032e 100644
--- a/src/OSD/OSD_File.cxx
+++ b/src/OSD/OSD_File.cxx
@@ -887,7 +887,7 @@ static OSD_SingleProtection __fastcall _get_protection_dir ( DWORD );
 
 typedef OSD_SingleProtection ( __fastcall *GET_PROT_FUNC ) ( DWORD );
 
-Standard_Integer __fastcall _get_file_type ( Standard_CString, Standard_Integer );
+Standard_Integer __fastcall _get_file_type ( Standard_CString, HANDLE );
 
 // ---------------------------------------------------------------------
 // Create an empty file object
diff --git a/src/OSD/OSD_WNT_1.cxx b/src/OSD/OSD_WNT_1.cxx
index 96425bb..2f9002f 100644
--- a/src/OSD/OSD_WNT_1.cxx
+++ b/src/OSD/OSD_WNT_1.cxx
@@ -240,7 +240,7 @@ static void __fastcall QuadWordToFileTime ( __int64 qw, PFILETIME pFt ) {
 ////////////////////////////////////////////////////////////////
 LPWORD lpwAlign (LPWORD lpIn)
 {
-  return (LPWORD) (((char*)lpIn+3) & ~0x3);
+  return (LPWORD) ((uintptr_t(lpIn)+3) & ~0x3);
 }
 
 int CopyAnsiToWideChar (LPWORD lpWCStr, LPSTR lpAnsiIn)
@@ -305,7 +305,7 @@ LONG GetTextParams ( HDC hdc, LPCTSTR lpText ) {
     _TCHAR* tok = _tcstok ( dummy, TEXT( "\n" ) );
 
     while ( tok ) {
-      if ( !GetTextExtentPoint32 (hdc, tok, _tcslen(tok), (LPSIZE)&size) ) { Ret = false; break; }
+      if ( !GetTextExtentPoint32 (hdc, tok, (int)_tcslen(tok), (LPSIZE)&size) ) { Ret = false; break; }
       txtH += (short)size.cy;
       if ( txtW < size.cx )
         txtW = (short)size.cx;
@@ -366,7 +366,7 @@ _TINT MsgBox ( HWND hParent,
   int             nchar;
   DWORD           lStyle;
   _TINT           scrW = 0, scrH = 0;
-  UINT            bufSize = 0;
+  size_t          bufSize = 0;
   HDC             hDisp = NULL;
 
   short           iconWidth = 0, iconHeight = 0;
@@ -448,10 +448,10 @@ _TINT MsgBox ( HWND hParent,
         iconHeight  =  MapY (  GetSystemMetrics ( SM_CYICON )  );
       }
       if ( lpChildren[i].itemType == MBT_BUTTON ) {
-        _TINT len = _tcslen (lpChildren[i].buttonLabel);
+        size_t len = _tcslen (lpChildren[i].buttonLabel);
         SIZE aTxtSize;
         GetTextExtentPoint32 ( hDisp, lpChildren[i].buttonLabel,
-                               len, (LPSIZE)&aTxtSize );
+                               (int)len, (LPSIZE)&aTxtSize );
         if ( butMaxWidth < aTxtSize.cx )
           butMaxWidth = (short)aTxtSize.cx;
         if ( butMaxHeight < aTxtSize.cy )
@@ -529,7 +529,7 @@ _TINT MsgBox ( HWND hParent,
   /*----------------------------------------------------------------------*/
   
   {
-    int res = -1;
+    INT_PTR res = -1;
     if ( pDlgTemplate )
       res = DialogBoxIndirect (
               GetModuleHandle(NULL),

-- 
OCE packaging