View Issue Details

IDProjectCategoryView StatusLast Update
0001856Far ManagerPlugins APIpublic2011-08-30 14:15
Reportersamlyukov Assigned Tovskirdin  
PrioritynormalSeverityminorReproducibilityhave not tried
Status closedResolutionfixed 
Fixed in Version3.0 
Summary0001856: приведение к общему UserData
Descriptionсабж.
TagsNo tags attached.
Build2181

Activities

samlyukov

2011-08-19 15:05

reporter  

!work.diff (1,899 bytes)   
Index: dialog.cpp
===================================================================
--- dialog.cpp	(revision 6577)
+++ dialog.cpp	(working copy)
@@ -6101,14 +6101,14 @@
 			/*****************************************************************/
 		case DM_SETITEMDATA:
 		{
-			void* PrewDataDialog=CurItem->UserData;
-			CurItem->UserData=Param2;
-			return reinterpret_cast<INT_PTR>(PrewDataDialog);
+			DWORD_PTR PrewDataDialog=CurItem->UserData;
+			CurItem->UserData=(DWORD_PTR)Param2;
+			return PrewDataDialog;
 		}
 		/*****************************************************************/
 		case DM_GETITEMDATA:
 		{
-			return reinterpret_cast<INT_PTR>(CurItem->UserData);
+			return CurItem->UserData;
 		}
 		/*****************************************************************/
 		case DM_EDITUNCHANGEDFLAG: // -1 Get, 0 - Skip, 1 - Set; �������� ����� ��������.
Index: viewer.cpp
===================================================================
--- viewer.cpp	(revision 6577)
+++ viewer.cpp	(working copy)
@@ -3088,7 +3088,7 @@
 		my.hex_mode = (LastSearchHex != 0);
 		my.recursive = false;
 		//
-		SearchDlg[SD_EDIT_TEXT].UserData = &my;
+		SearchDlg[SD_EDIT_TEXT].UserData = (DWORD_PTR)&my;
 
 		Dialog Dlg(SearchDlg,ARRAYSIZE(SearchDlg),ViewerSearchDlgProc);
 		Dlg.SetPosition(-1,-1,76,13);
Index: plugin.hpp
===================================================================
--- plugin.hpp	(revision 6577)
+++ plugin.hpp	(working copy)
@@ -494,7 +494,7 @@
 	FARDIALOGITEMFLAGS Flags;
 	const wchar_t *Data;
 	size_t MaxLength; // terminate 0 not included (if == 0 string size is unlimited)
-	void* UserData;
+	DWORD_PTR UserData;
 };
 
 struct FarDialogItemData
@@ -2413,7 +2413,7 @@
 	HANDLE hPanel;
 	const wchar_t *Dir;
 	OPERATION_MODES OpMode;
-	INT_PTR UserData;
+	DWORD_PTR UserData;
 };
 
 struct SetFindListInfo
!work.diff (1,899 bytes)   

vskirdin

2011-08-29 12:48

administrator   bugnote:0007565

build 2181

samlyukov

2011-08-30 12:36

reporter   bugnote:0007575

ok

Issue History

Date Modified Username Field Change
2011-08-19 15:05 samlyukov New Issue
2011-08-19 15:05 samlyukov File Added: !work.diff
2011-08-29 12:48 vskirdin Note Added: 0007565
2011-08-29 12:48 vskirdin Assigned To => vskirdin
2011-08-29 12:48 vskirdin Status new => feedback
2011-08-30 12:36 samlyukov Note Added: 0007575
2011-08-30 12:36 samlyukov Status feedback => assigned
2011-08-30 12:36 samlyukov Status assigned => resolved
2011-08-30 14:15 vskirdin Build => 2181
2011-08-30 14:15 vskirdin Status resolved => closed
2011-08-30 14:15 vskirdin Resolution open => fixed
2011-08-30 14:15 vskirdin Fixed in Version => 3.0