another 64-bit issues in h++

git-svn-id: http://svn.miranda-ng.org/main/trunk@2711 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 13 insertions, 13 deletions

diff --git a/plugins/HistoryPlusPlus/EventDetailForm.pas b/plugins/HistoryPlusPlus/EventDetailForm.pas
index de49670700..eedae3bc66 100644
--- a/plugins/HistoryPlusPlus/EventDetailForm.pas
+++ b/plugins/HistoryPlusPlus/EventDetailForm.pas
@@ -171,7 +171,7 @@ var
 implementation

 

 uses

-  HistoryGrid, hpp_messages, hpp_contacts, hpp_events, hpp_forms, 

+  HistoryGrid, hpp_messages, hpp_contacts, hpp_events, hpp_forms,

   {hpp_database,} hpp_options, hpp_services;

 

 {$R *.DFM}

@@ -598,7 +598,7 @@ end;
 

 procedure TEventDetailsFrm.HMEventDeleted(var Message: TMessage);

 begin

-  if Cardinal(Message.WParam) = ParentForm.History[ParentForm.GridIndexToHistory(FItem)] then

+  if uint_ptr(Message.WParam) = ParentForm.History[ParentForm.GridIndexToHistory(FItem)] then

     Close;

 end;

 

diff --git a/plugins/HistoryPlusPlus/HistoryGrid.pas b/plugins/HistoryPlusPlus/HistoryGrid.pas
index b6fd436690..9eb53aa851 100644
--- a/plugins/HistoryPlusPlus/HistoryGrid.pas
+++ b/plugins/HistoryPlusPlus/HistoryGrid.pas
@@ -5192,7 +5192,7 @@ end;
 procedure THistoryGrid.SetRichRTL(RTL: Boolean; RichEdit: THPPRichEdit; ProcessTag: Boolean = True);

 var

   pf: PARAFORMAT2;

-  ExStyle: DWord;

+  ExStyle: uint_ptr;

 begin

   // we use RichEdit.Tag here to save previous RTL state to prevent from

   // reapplying same state, because SetRichRTL is called VERY OFTEN

@@ -5202,7 +5202,7 @@ begin
   ZeroMemory(@pf, SizeOf(pf));

   pf.cbSize := SizeOf(pf);

   pf.dwMask := PFM_RTLPARA;

-  ExStyle := DWord(GetWindowLongPtr(RichEdit.Handle, GWL_EXSTYLE)) and

+  ExStyle := uint_ptr(GetWindowLongPtr(RichEdit.Handle, GWL_EXSTYLE)) and

     not(WS_EX_RTLREADING or WS_EX_LEFTSCROLLBAR or WS_EX_RIGHT or WS_EX_LEFT);

   if RTL then

   begin

@@ -5864,15 +5864,15 @@ end;
 

 procedure THistoryGrid.SetBorderStyle(Value: TBorderStyle);

 var

-  Style, ExStyle: DWord;

+  Style, ExStyle: uint_ptr;

 begin

   if FBorderStyle = Value then

     exit;

   FBorderStyle := Value;

   if HandleAllocated then

   begin

-    Style   := DWord(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER;

-    ExStyle := DWord(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE;

+    Style   := uint_ptr(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER;

+    ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE;

     if Ctl3D and NewStyleControls and (FBorderStyle = bsSingle) then

     begin

       Style := Style and not WS_BORDER;

@@ -5885,12 +5885,12 @@ end;
 

 procedure THistoryGrid.CMBiDiModeChanged(var Message: TMessage);

 var

-  ExStyle: Cardinal;

+  ExStyle: uint_ptr;

 begin

   // inherited;

   if HandleAllocated then

   begin

-    ExStyle := DWord(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and

+    ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and

       not(WS_EX_RTLREADING or WS_EX_LEFTSCROLLBAR or WS_EX_RIGHT or WS_EX_LEFT);

     AddBiDiModeExStyle(ExStyle);

     SetWindowLongPtr(Handle, GWL_EXSTYLE, ExStyle);

@@ -5899,12 +5899,12 @@ end;
 

 procedure THistoryGrid.CMCtl3DChanged(var Message: TMessage);

 var

-  Style, ExStyle: DWord;

+  Style, ExStyle: uint_ptr;

 begin

   if HandleAllocated then

   begin

-    Style   := DWord(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER;

-    ExStyle := DWord(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE;

+    Style   := uint_ptr(GetWindowLongPtr(Handle, GWL_STYLE)) and WS_BORDER;

+    ExStyle := uint_ptr(GetWindowLongPtr(Handle, GWL_EXSTYLE)) and not WS_EX_CLIENTEDGE;

     if Ctl3D and NewStyleControls and (FBorderStyle = bsSingle) then

     begin

       Style := Style and not WS_BORDER;

diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
index eedf8920eb..932b968219 100644
--- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas
+++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
@@ -1086,7 +1086,7 @@ begin
     exit;

   for i := 0 to Grid.Count - 1 do

   begin

-    if (Items[i].hDBEvent = Cardinal(M.LParam)) then

+    if (Items[i].hDBEvent = uint_ptr(M.LParam)) then

     begin

       Grid.Delete(i);

       exit;