PageRenderTime 34ms CodeModel.GetById 16ms RepoModel.GetById 0ms app.codeStats 1ms

/patches/db_mmap_sa_64bit.patch

http://miranda-dev.googlecode.com/
Patch | 644 lines | 572 code | 72 blank | 0 comment | 0 complexity | a1d379ef250a9164258cb73d953a7ea7 MD5 | raw file
Possible License(s): GPL-2.0, MPL-2.0-no-copyleft-exception, LGPL-3.0, AGPL-1.0, BSD-3-Clause, LGPL-2.1 
    

  1. Index: trunk/backup.c

    2. 

  2. ===================================================================

    3. 

  3. --- trunk/backup.c	(Revision 116)

    4. 

  4. +++ trunk/backup.c	(Arbeitskopie)

    5. 

  5. @@ -6,7 +6,7 @@

    6. 

  6.  extern BOOL gl_bUnicodeAwareCore;

    7. 

  7.  struct DBHeader dbHeader;

    8. 

  8.  

    9. 

  9. -int BackupService(WPARAM wParam, LPARAM lParam);

    10. 

  10. +INT_PTR BackupService(WPARAM wParam, LPARAM lParam);

    11. 

  11.  

    12. 

  12.  static HANDLE hEventBackup;

    13. 

  13.  

    14. 

  14. @@ -19,15 +19,13 @@

    15. 

  15.  

    16. 

  16.  int Backup(char* backup_filename, HWND progress_dialog)

    17. 

  17.  {

    18. 

  18. -	HANDLE hBackupFile;

    19. 

  19.  	char buff[8192];

    20. 

  20.  	DWORD bytes_read, bytes_written, file_size, total_bytes_copied = 0;

    21. 

  21. -	HWND prog;

    22. 

  22.  	MSG msg;

    23. 

  23.  	DWORD start_time = GetTickCount();

    24. 

  24. -	prog = GetDlgItem(progress_dialog, 0xDEAD);

    25. 

  25. +	HWND prog = GetDlgItem(progress_dialog, 0xDEAD);

    26. 

  26.  	

    27. 

  27. -	hBackupFile = CreateFileA(backup_filename, GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);

    28. 

  28. +	HANDLE hBackupFile = CreateFileA(backup_filename, GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);

    29. 

  29.  	

    30. 

  30.  	if(hBackupFile != INVALID_HANDLE_VALUE) {

    31. 

  31.  		if(progress_dialog) {

    32. 

  32. @@ -66,7 +64,7 @@

    33. 

  33.  		}

    34. 

  34.  

    35. 

  35.  		while(ReadFile(hDbFile, buff, sizeof(buff), &bytes_read, 0) == TRUE && bytes_read > 0

    36. 

  36. -			&& GetWindowLong(progress_dialog, GWL_USERDATA) == 0)

    37. 

  37. +			&& GetWindowLongPtr(progress_dialog, GWLP_USERDATA) == 0)

    38. 

  38.  		{

    39. 

  39.  			if(!WriteFile(hBackupFile, buff, bytes_read, &bytes_written, 0)) {

    40. 

  40.  				LeaveCriticalSection(&csDbAccess);

    41. 

  41. @@ -95,7 +93,7 @@

    42. 

  42.  

    43. 

  43.  		CloseHandle(hBackupFile);

    44. 

  44.  

    45. 

  45. -		if(progress_dialog && GetWindowLong(progress_dialog, GWL_USERDATA) != 0)

    46. 

  46. +		if(progress_dialog && GetWindowLongPtr(progress_dialog, GWLP_USERDATA) != 0)

    47. 

  47.  			DeleteFileA(backup_filename);

    48. 

  48.  		else

    49. 

  49.  			NotifyEventHooks(hEventBackup, (WPARAM)backup_filename, 0);

    50. 

  50. @@ -106,7 +104,7 @@

    51. 

  51.  	return 1;

    52. 

  52.  }

    53. 

  53.  

    54. 

  54. -int BackupService(WPARAM wParam,LPARAM lParam)

    55. 

  55. +INT_PTR BackupService(WPARAM wParam,LPARAM lParam)

    56. 

  56.  {

    57. 

  57.  	return Backup((char*)wParam, (HWND)lParam);	

    58. 

  58.  }

    59. 

  59. \ No newline at end of file

    60. 

  60. Index: trunk/dbcontacts.c

    61. 

  61. ===================================================================

    62. 

  62. --- trunk/dbcontacts.c	(Revision 116)

    63. 

  63. +++ trunk/dbcontacts.c	(Arbeitskopie)

    64. 

  64. @@ -30,12 +30,12 @@

    65. 

  65.  int GetContactSettingStatic(WPARAM wParam,LPARAM lParam);

    66. 

  66.  void FreeCachedVariant( DBVARIANT* V );

    67. 

  67.  

    68. 

  68. -static int GetContactCount(WPARAM wParam,LPARAM lParam);

    69. 

  69. -static int FindFirstContact(WPARAM wParam,LPARAM lParam);

    70. 

  70. -static int FindNextContact(WPARAM wParam,LPARAM lParam);

    71. 

  71. -static int DeleteContact(WPARAM wParam,LPARAM lParam);

    72. 

  72. -static int AddContact(WPARAM wParam,LPARAM lParam);

    73. 

  73. -static int IsDbContact(WPARAM wParam,LPARAM lParam);

    74. 

  74. +static INT_PTR GetContactCount(WPARAM wParam,LPARAM lParam);

    75. 

  75. +static INT_PTR FindFirstContact(WPARAM wParam,LPARAM lParam);

    76. 

  76. +static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam);

    77. 

  77. +static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam);

    78. 

  78. +static INT_PTR AddContact(WPARAM wParam,LPARAM lParam);

    79. 

  79. +static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam);

    80. 

  80.  

    81. 

  81.  static HANDLE hContactDeletedEvent,hContactAddedEvent;

    82. 

  82.  

    83. 

  83. @@ -67,7 +67,7 @@

    84. 

  84.  	return VL;

    85. 

  85.  }

    86. 

  86.  

    87. 

  87. -static int GetContactCount(WPARAM wParam,LPARAM lParam)

    88. 

  88. +static INT_PTR GetContactCount(WPARAM wParam,LPARAM lParam)

    89. 

  89.  {

    90. 

  90.  	int ret;

    91. 

  91.  

    92. 

  92. @@ -96,7 +96,7 @@

    93. 

  93.  	return !strcmp(protobuf,proto);

    94. 

  94.  }

    95. 

  95.  

    96. 

  96. -static int FindFirstContact(WPARAM wParam,LPARAM lParam)

    97. 

  97. +static INT_PTR FindFirstContact(WPARAM wParam,LPARAM lParam)

    98. 

  98.  {

    99. 

  99.  	int ret = 0;

    100. 

  100.  	EnterCriticalSection(&csDbAccess);

    101. 

  101. @@ -107,7 +107,7 @@

    102. 

  102.  	return ret;

    103. 

  103.  }

    104. 

  104.  

    105. 

  105. -static int FindNextContact(WPARAM wParam,LPARAM lParam)

    106. 

  106. +static INT_PTR FindNextContact(WPARAM wParam,LPARAM lParam)

    107. 

  107.  {

    108. 

  108.  	int index;

    109. 

  109.  	struct DBContact *dbc;

    110. 

  110. @@ -145,7 +145,7 @@

    111. 

  111.  	return 0;

    112. 

  112.  }

    113. 

  113.  

    114. 

  114. -static int DeleteContact(WPARAM wParam,LPARAM lParam)

    115. 

  115. +static INT_PTR DeleteContact(WPARAM wParam,LPARAM lParam)

    116. 

  116.  {

    117. 

  117.  	struct DBContact *dbc,*dbcPrev;

    118. 

  118.  	DWORD ofsThis,ofsNext,ofsFirstEvent;

    119. 

  119. @@ -246,7 +246,7 @@

    120. 

  120.  	return 0;

    121. 

  121.  }

    122. 

  122.  

    123. 

  123. -static int AddContact(WPARAM wParam,LPARAM lParam)

    124. 

  124. +static INT_PTR AddContact(WPARAM wParam,LPARAM lParam)

    125. 

  125.  {

    126. 

  126.  	struct DBContact dbc;

    127. 

  127.  	DWORD ofsNew;

    128. 

  128. @@ -274,7 +274,7 @@

    129. 

  129.  	return (int)ofsNew;

    130. 

  130.  }

    131. 

  131.  

    132. 

  132. -static int IsDbContact(WPARAM wParam,LPARAM lParam)

    133. 

  133. +static INT_PTR IsDbContact(WPARAM wParam,LPARAM lParam)

    134. 

  134.  {

    135. 

  135.  	struct DBContact *dbc;

    136. 

  136.  	DWORD ofsContact=(DWORD)wParam;

    137. 

  137. Index: trunk/dbsettings.c

    138. 

  138. ===================================================================

    139. 

  139. --- trunk/dbsettings.c	(Revision 116)

    140. 

  140. +++ trunk/dbsettings.c	(Arbeitskopie)

    141. 

  141. @@ -397,7 +397,7 @@

    142. 

  142.  	return 1;

    143. 

  143.  }

    144. 

  144.  

    145. 

  145. -static int GetContactSetting(WPARAM wParam,LPARAM lParam)

    146. 

  146. +static INT_PTR GetContactSetting(WPARAM wParam,LPARAM lParam)

    147. 

  147.  {

    148. 

  148.  	DBCONTACTGETSETTING* dgs = ( DBCONTACTGETSETTING* )lParam;

    149. 

  149.  	dgs->pValue->type = 0;

    150. 

  150. @@ -431,7 +431,7 @@

    151. 

  151.  	return 0;

    152. 

  152.  }

    153. 

  153.  

    154. 

  154. -static int GetContactSettingStr(WPARAM wParam,LPARAM lParam)

    155. 

  155. +static INT_PTR GetContactSettingStr(WPARAM wParam,LPARAM lParam)

    156. 

  156.  {

    157. 

  157.  	DBCONTACTGETSETTING* dgs = (DBCONTACTGETSETTING*)lParam;

    158. 

  158.  	int iSaveType = dgs->pValue->type;

    159. 

  159. @@ -479,7 +479,7 @@

    160. 

  160.  	return 0;

    161. 

  161.  }

    162. 

  162.  

    163. 

  163. -int GetContactSettingStatic(WPARAM wParam,LPARAM lParam)

    164. 

  164. +INT_PTR GetContactSettingStatic(WPARAM wParam,LPARAM lParam)

    165. 

  165.  {

    166. 

  166.  	DBCONTACTGETSETTING* dgs = (DBCONTACTGETSETTING*)lParam;

    167. 

  167.  	if ( GetContactSettingWorker(( HANDLE )wParam, dgs, 1 ))

    168. 

  168. @@ -493,7 +493,7 @@

    169. 

  169.  	return 0;

    170. 

  170.  }

    171. 

  171.  

    172. 

  172. -static int FreeVariant(WPARAM wParam,LPARAM lParam)

    173. 

  173. +static INT_PTR FreeVariant(WPARAM wParam,LPARAM lParam)

    174. 

  174.  {

    175. 

  175.  	DBVARIANT *dbv=(DBVARIANT*)lParam;

    176. 

  176.  	if ( dbv == 0 ) return 1;

    177. 

  177. @@ -517,7 +517,7 @@

    178. 

  178.  	return 0;

    179. 

  179.  }

    180. 

  180.  

    181. 

  181. -static int SetSettingResident(WPARAM wParam,LPARAM lParam)

    182. 

  182. +static INT_PTR SetSettingResident(WPARAM wParam,LPARAM lParam)

    183. 

  183.  {

    184. 

  184.  	size_t cbSettingNameLen = strlen(( char* )lParam) + 2;

    185. 

  185.  	if (cbSettingNameLen  < 512)

    186. 

  186. @@ -548,7 +548,7 @@

    187. 

  187.  	return 0;

    188. 

  188.  }

    189. 

  189.  

    190. 

  190. -static int WriteContactSetting(WPARAM wParam,LPARAM lParam)

    191. 

  191. +static INT_PTR WriteContactSetting(WPARAM wParam,LPARAM lParam)

    192. 

  192.  {

    193. 

  193.  	DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam;

    194. 

  194.  	DBCONTACTWRITESETTING tmp;

    195. 

  195. @@ -833,7 +833,7 @@

    196. 

  196.  	return 0;

    197. 

  197.  }

    198. 

  198.  

    199. 

  199. -static int DeleteContactSetting(WPARAM wParam,LPARAM lParam)

    200. 

  200. +static INT_PTR DeleteContactSetting(WPARAM wParam,LPARAM lParam)

    201. 

  201.  {

    202. 

  202.  	DBCONTACTGETSETTING *dbcgs=(DBCONTACTGETSETTING*)lParam;

    203. 

  203.  	struct DBContact *dbc;

    204. 

  204. @@ -930,7 +930,7 @@

    205. 

  205.  	return 0;

    206. 

  206.  }

    207. 

  207.  

    208. 

  208. -static int EnumContactSettings(WPARAM wParam,LPARAM lParam)

    209. 

  209. +static INT_PTR EnumContactSettings(WPARAM wParam,LPARAM lParam)

    210. 

  210.  {

    211. 

  211.  	DBCONTACTENUMSETTINGS *dbces=(DBCONTACTENUMSETTINGS*)lParam;

    212. 

  212.  	struct DBContact *dbc;

    213. 

  213. @@ -978,7 +978,7 @@

    214. 

  214.  	return result;

    215. 

  215.  }

    216. 

  216.  

    217. 

  217. -static int EnumResidentSettings(WPARAM wParam,LPARAM lParam)

    218. 

  218. +static INT_PTR EnumResidentSettings(WPARAM wParam,LPARAM lParam)

    219. 

  219.  {

    220. 

  220.  	int i;

    221. 

  221.  	int ret;

    222. 

  222. Index: trunk/dbtool/dbtool.h

    223. 

  223. ===================================================================

    224. 

  224. --- trunk/dbtool/dbtool.h	(Revision 116)

    225. 

  225. +++ trunk/dbtool/dbtool.h	(Arbeitskopie)

    226. 

  226. @@ -71,7 +71,7 @@

    227. 

  227.  BOOL CALLBACK CleaningDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    228. 

  228.  BOOL CALLBACK ProgressDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    229. 

  229.  BOOL CALLBACK FileAccessDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    230. 

  230. -BOOL CALLBACK WizardDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    231. 

  231. +INT_PTR CALLBACK WizardDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    232. 

  232.  BOOL CALLBACK FinishedDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    233. 

  233.  BOOL CALLBACK WelcomeDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    234. 

  234.  BOOL CALLBACK OpenErrorDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam);

    235. 

  235. Index: trunk/dbtool/encryption.cpp

    236. 

  236. ===================================================================

    237. 

  237. --- trunk/dbtool/encryption.cpp	(Revision 116)

    238. 

  238. +++ trunk/dbtool/encryption.cpp	(Arbeitskopie)

    239. 

  239. @@ -277,7 +277,7 @@

    240. 

  240.  			UINT uid = LOWORD(wParam);

    241. 

  241.  

    242. 

  242.  			if(uid == IDOK){

    243. 

  243. -				if(!GetWindowLong(hDlg,GWL_USERDATA))

    244. 

  244. +				if(!GetWindowLongPtr(hDlg,GWLP_USERDATA))

    245. 

  245.  				{

    246. 

  246.  					encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254);

    247. 

  247.  					EndDialog(hDlg,IDOK);

    248. 

  248. Index: trunk/dbtool/progress.cpp

    249. 

  249. ===================================================================

    250. 

  250. --- trunk/dbtool/progress.cpp	(Revision 116)

    251. 

  251. +++ trunk/dbtool/progress.cpp	(Arbeitskopie)

    252. 

  252. @@ -169,7 +169,7 @@

    253. 

  253.  				SetEvent(hEventAbort);

    254. 

  254.  			}

    255. 

  255.  			SetEvent(hEventRun);

    256. 

  256. -			SetWindowLong(hdlg,DWL_MSGRESULT,TRUE);

    257. 

  257. +			SetWindowLongPtr(hdlg,DWLP_MSGRESULT,TRUE);

    258. 

  258.  			return TRUE;

    259. 

  259.  		case WM_COMMAND:

    260. 

  260.  			switch(LOWORD(wParam)) {

    261. 

  261. Index: trunk/dbtool/wizard.cpp

    262. 

  262. ===================================================================

    263. 

  263. --- trunk/dbtool/wizard.cpp	(Revision 116)

    264. 

  264. +++ trunk/dbtool/wizard.cpp	(Arbeitskopie)

    265. 

  265. @@ -86,7 +86,7 @@

    266. 

  266.  	return FALSE;

    267. 

  267.  }

    268. 

  268.  

    269. 

  269. -BOOL CALLBACK WizardDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

    270. 

  270. +INT_PTR CALLBACK WizardDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

    271. 

  271.  {

    272. 

  272.  	static HWND hdlgPage;

    273. 

  273.  

    274. 

  274. Index: trunk/dialogs.c

    275. 

  275. ===================================================================

    276. 

  276. --- trunk/dialogs.c	(Revision 116)

    277. 

  277. +++ trunk/dialogs.c	(Arbeitskopie)

    278. 

  278. @@ -10,7 +10,7 @@

    279. 

  279.  

    280. 

  280.  extern char encryptKey[255];

    281. 

  281.  extern size_t encryptKeyLength;

    282. 

  282. -extern HANDLE g_hInst;

    283. 

  283. +extern HINSTANCE g_hInst;

    284. 

  284.  HANDLE hSetPwdMenu;

    285. 

  285.  

    286. 

  286.  extern BOOL gl_bUnicodeAwareCore;

    287. 

  287. @@ -18,7 +18,7 @@

    288. 

  288.  int Backup(void);

    289. 

  289.  int BackupService(WPARAM wParam, LPARAM lParam);

    290. 

  290.  

    291. 

  291. -BOOL CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

    292. 

  292. +INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

    293. 

  293.  BOOL ShowDlgItem(HWND hwndDlg, int iIDCtrl, BOOL bShow)

    294. 

  294.  {

    295. 

  295.  	HWND hwndCtrl = GetDlgItem(hwndDlg, iIDCtrl);

    296. 

  296. @@ -62,14 +62,14 @@

    297. 

  297.  	odp.flags						= ODPF_BOLDGROUPS;

    298. 

  298.  	if (gl_bUnicodeAwareCore)

    299. 

  299.  	{

    300. 

  300. -		odp.ptszTitle				= TranslateT("Database Features");

    301. 

  301. -		odp.ptszGroup				= TranslateT("Services");

    302. 

  302. +		odp.ptszTitle				= LPGENT("Database Features");

    303. 

  303. +		odp.ptszGroup				= LPGENT("Services");

    304. 

  304.  		odp.flags				   |= ODPF_UNICODE;

    305. 

  305.  	}

    306. 

  306.  	else

    307. 

  307.  	{

    308. 

  308. -		odp.pszTitle				= Translate("Database Features");

    309. 

  309. -		odp.pszGroup				= Translate("Services");

    310. 

  310. +		odp.pszTitle				= LPGEN("Database Features");

    311. 

  311. +		odp.pszGroup				= LPGEN("Services");

    312. 

  312.  	}

    313. 

  313.  	

    314. 

  314.  	odp.nIDBottomSimpleControl		= 0;

    315. 

  315. @@ -79,7 +79,7 @@

    316. 

  316.  	return 0;

    317. 

  317.  }

    318. 

  318.  

    319. 

  319. -static int ChangePassword(WPARAM wParam, LPARAM lParam)

    320. 

  320. +static INT_PTR ChangePassword(WPARAM wParam, LPARAM lParam)

    321. 

  321.  {

    322. 

  322.  	if(bEncoding){

    323. 

  323.  		ChangePwd();

    324. 

  324. @@ -117,7 +117,7 @@

    325. 

  325.  	menu.cbSize=sizeof(menu);

    326. 

  326.  	menu.flags = CMIM_ALL;

    327. 

  327.  

    328. 

  328. -	menu.hIcon=LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ICON2));

    329. 

  329. +	menu.hIcon=LoadIcon((HANDLE)g_hInst, MAKEINTRESOURCE(IDI_ICON2));

    330. 

  330.  

    331. 

  331.  	// main menu item

    332. 

  332.  	if (gl_bUnicodeAwareCore)

    333. 

  333. @@ -178,7 +178,7 @@

    334. 

  334.  	return res;

    335. 

  335.  }

    336. 

  336.  

    337. 

  337. -BOOL CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

    338. 

  338. +INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

    339. 

  339.  {

    340. 

  340.  	HWND hwndList = GetDlgItem(hwndDlg, IDC_MODULES);

    341. 

  341.  	LVCOLUMN col;

    342. 

  342. @@ -420,7 +420,7 @@

    343. 

  343.  			UINT uid = LOWORD(wParam);

    344. 

  344.  

    345. 

  345.  			if(uid == IDOK){

    346. 

  346. -				if(!GetWindowLong(hDlg,GWL_USERDATA))

    347. 

  347. +				if(!GetWindowLongPtr(hDlg,GWLP_USERDATA))

    348. 

  348.  				{

    349. 

  349.  					encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254);

    350. 

  350.  					EndDialog(hDlg,IDOK);

    351. 

  351. @@ -479,7 +479,7 @@

    352. 

  352.  			UINT uid = LOWORD(wParam);

    353. 

  353.  

    354. 

  354.  			if(uid == IDOK){

    355. 

  355. -				if(!GetWindowLong(hDlg,GWL_USERDATA))

    356. 

  356. +				if(!GetWindowLongPtr(hDlg,GWLP_USERDATA))

    357. 

  357.  				{

    358. 

  358.  					char pass1[255], pass2[255];

    359. 

  359.  					if(GetDlgItemTextA(hDlg, IDC_USERPASS1, pass1, 254) < 3){

    360. 

  360. Index: trunk/import_sa/encryption.c

    361. 

  361. ===================================================================

    362. 

  362. --- trunk/import_sa/encryption.c	(Revision 116)

    363. 

  363. +++ trunk/import_sa/encryption.c	(Arbeitskopie)

    364. 

  364. @@ -282,7 +282,7 @@

    365. 

  365.  			UINT uid = LOWORD(wParam);

    366. 

  366.  

    367. 

  367.  			if(uid == IDOK){

    368. 

  368. -				if(!GetWindowLong(hDlg,GWL_USERDATA))

    369. 

  369. +				if(!GetWindowLongPtr(hDlg,GWLP_USERDATA))

    370. 

  370.  				{

    371. 

  371.  					encryptKeyLength = GetDlgItemTextA(hDlg, IDC_USERPASS, encryptKey, 254);

    372. 

  372.  					EndDialog(hDlg,IDOK);

    373. 

  373. Index: trunk/init.c

    374. 

  374. ===================================================================

    375. 

  375. --- trunk/init.c	(Revision 116)

    376. 

  376. +++ trunk/init.c	(Arbeitskopie)

    377. 

  377. @@ -106,7 +106,7 @@

    378. 

  378.  // returns 0 if all the APIs are injected otherwise, 1

    379. 

  379.  static int LoadDatabase( char * profile, void * plink )

    380. 

  380.  {

    381. 

  381. -	PLUGINLINK *link = plink;

    382. 

  382. +	PLUGINLINK *link = (PLUGINLINK*) plink;

    383. 

  383.  #ifdef _DEBUG

    384. 

  384.  	_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);

    385. 

  385.  #endif

    386. 

  386. @@ -206,7 +206,7 @@

    387. 

  387.  	if ((GetVersion() & 0x80000000) == 0)

    388. 

  388.  	{

    389. 

  389.  		//Unicode Os - Unicode Aware

    390. 

  390. -		pluginInfo.flags = 1;

    391. 

  391. +		pluginInfo.flags = UNICODE_AWARE;

    392. 

  392.  	}

    393. 

  393.  	return &pluginInfo;

    394. 

  394.  }

    395. 

  395. Index: trunk/sdk/m_folders.h

    396. 

  396. ===================================================================

    397. 

  397. --- trunk/sdk/m_folders.h	(Revision 116)

    398. 

  398. +++ trunk/sdk/m_folders.h	(Arbeitskopie)

    399. 

  399. @@ -27,12 +27,14 @@

    400. 

  400.  #define CURRENT_PROFILE "%current_profile%"

    401. 

  401.  #define MIRANDA_PATH "%miranda_path%"

    402. 

  402.  #define PLUGINS_PATH "%miranda_path%" "\\plugins"

    403. 

  403. +#define MIRANDA_USERDATA "%miranda_userdata%"

    404. 

  404.  

    405. 

  405.  #define TO_WIDE(x)     L ## x

    406. 

  406.  

    407. 

  407.  #define PROFILE_PATHW    L"%profile_path%"

    408. 

  408.  #define CURRENT_PROFILEW L"%current_profile%"

    409. 

  409.  #define MIRANDA_PATHW    L"%miranda_path%"

    410. 

  410. +#define MIRANDA_USERDATAW L"%miranda_userdata%"

    411. 

  411.  

    412. 

  412.  #define FOLDER_AVATARS                 PROFILE_PATH "\\" CURRENT_PROFILE "\\avatars"

    413. 

  413.  #define FOLDER_VCARDS                  PROFILE_PATH "\\" CURRENT_PROFILE "\\vcards"

    414. 

  414. @@ -78,16 +80,16 @@

    415. 

  415.  

    416. 

  416.  /*Folders/Register/Path service

    417. 

  417.    wParam - not used, must be 0

    418. 

  418. -  lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with 

    419. 

  419. +  lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with

    420. 

  420.    the necessary information.

    421. 

  421. -  Returns a handle to the registered path or 0 on error. 

    422. 

  422. +  Returns a handle to the registered path or 0 on error.

    423. 

  423.    You need to use this to call the other services.

    424. 

  424.  */

    425. 

  425.  #define MS_FOLDERS_REGISTER_PATH "Folders/Register/Path"

    426. 

  426.  

    427. 

  427.  /*Folders/Get/PathSize service

    428. 

  428.    wParam - (WPARAM) (int) - handle to registered path

    429. 

  429. -  lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path 

    430. 

  430. +  lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path

    431. 

  431.    string (not including the null character). Depending on the flags set when creating the path

    432. 

  432.    it will either call strlen() or wcslen() to get the length of the string.

    433. 

  433.    Returns the size of the buffer.

    434. 

  434. @@ -172,10 +174,10 @@

    435. 

  435.  	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);

    436. 

  436.  }

    437. 

  437.  

    438. 

  438. -__inline static int FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, char *notFound)

    439. 

  439. +__inline static INT_PTR FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, const char *notFound)

    440. 

  440.  {

    441. 

  441.  	FOLDERSGETDATA fgd = {0};

    442. 

  442. -	int res;

    443. 

  443. +	INT_PTR res;

    444. 

  444.  	fgd.cbSize = sizeof(FOLDERSGETDATA);

    445. 

  445.  	fgd.nMaxPathSize = size;

    446. 

  446.  	fgd.szPath = path;

    447. 

  447. @@ -186,14 +188,14 @@

    448. 

  448.  		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);

    449. 

  449.  		mir_snprintf(path, size, "%s", buffer);

    450. 

  450.  	}

    451. 

  451. -		

    452. 

  452. +

    453. 

  453.  	return res;

    454. 

  454.  }

    455. 

  455.  

    456. 

  456. -__inline static int FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW)

    457. 

  457. +__inline static INT_PTR FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, const wchar_t *notFoundW)

    458. 

  458.  {

    459. 

  459.  	FOLDERSGETDATA fgd = {0};

    460. 

  460. -	int res;

    461. 

  461. +	INT_PTR res;

    462. 

  462.  	fgd.cbSize = sizeof(FOLDERSGETDATA);

    463. 

  463.  	fgd.nMaxPathSize = count;

    464. 

  464.  	fgd.szPathW = pathW;

    465. 

  465. @@ -203,14 +205,14 @@

    466. 

  466.  		wcsncpy(pathW, notFoundW, count);

    467. 

  467.  		pathW[count - 1] = '\0';

    468. 

  468.  	}

    469. 

  469. -		

    470. 

  470. +

    471. 

  471.  	return res;

    472. 

  472.  }

    473. 

  473.  

    474. 

  474. -__inline static int FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)

    475. 

  475. +__inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)

    476. 

  476.  {

    477. 

  477.  	FOLDERSGETDATA fgd = {0};

    478. 

  478. -	int res;

    479. 

  479. +	INT_PTR res;

    480. 

  480.  	fgd.cbSize = sizeof(FOLDERSGETDATA);

    481. 

  481.  	fgd.nMaxPathSize = size;

    482. 

  482.  	fgd.szPath = path;

    483. 

  483. @@ -228,19 +230,19 @@

    484. 

  484.  	else{

    485. 

  485.  		path[0] = '\0';

    486. 

  486.  	}

    487. 

  487. -	

    488. 

  488. +

    489. 

  489.  	if (fileName)

    490. 

  490.  	{

    491. 

  491.  		strcat(path, fileName);

    492. 

  492.  	}

    493. 

  493. -	

    494. 

  494. +

    495. 

  495.  	return res;

    496. 

  496.  }

    497. 

  497.  

    498. 

  498. -__inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)

    499. 

  499. +__inline static INT_PTR FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)

    500. 

  500.  {

    501. 

  501.  	FOLDERSGETDATA fgd = {0};

    502. 

  502. -	int res;

    503. 

  503. +	INT_PTR res;

    504. 

  504.  	fgd.cbSize = sizeof(FOLDERSGETDATA);

    505. 

  505.  	fgd.nMaxPathSize = count;

    506. 

  506.  	fgd.szPathW = pathW;

    507. 

  507. @@ -250,7 +252,7 @@

    508. 

  508.  		wcsncpy(pathW, notFoundW, count);

    509. 

  509.  		pathW[count - 1] = '\0';

    510. 

  510.  	}

    511. 

  511. -	

    512. 

  512. +

    513. 

  513.  	if (wcslen(pathW) > 0)

    514. 

  514.  	{

    515. 

  515.  		wcscat(pathW, L"\\");

    516. 

  516. @@ -258,12 +260,12 @@

    517. 

  517.  	else{

    518. 

  518.  		pathW[0] = L'\0';

    519. 

  519.  	}

    520. 

  520. -	

    521. 

  521. +

    522. 

  522.  	if (fileNameW)

    523. 

  523.  	{

    524. 

  524.  		wcscat(pathW, fileNameW);

    525. 

  525.  	}

    526. 

  526. -	

    527. 

  527. +

    528. 

  528.  	return res;

    529. 

  529.  }

    530. 

  530.  

    531. 

  531. @@ -279,4 +281,4 @@

    532. 

  532.  

    533. 

  533.  #endif

    534. 

  534.  

    535. 

  535. -#endif //M_CUSTOM_FOLDERS_H

    536. 

  536. +#endif //M_CUSTOM_FOLDERS_H

    537. 

  537. \ No newline at end of file

    538. 

  538. Index: trunk/security.c

    539. 

  539. ===================================================================

    540. 

  540. --- trunk/security.c	(Revision 116)

    541. 

  541. +++ trunk/security.c	(Arbeitskopie)

    542. 

  542. @@ -93,7 +93,7 @@

    543. 

  543.  	if(!bEncoding)

    544. 

  544.  		return;

    545. 

  545.  	

    546. 

  546. -	CryptoEngine->EncryptMem(dst, size, key);

    547. 

  547. +	CryptoEngine->EncryptMem((BYTE*)dst,(int) size, key);

    548. 

  548.  }

    549. 

  549.  

    550. 

  550.  void DecodeCopyMemory(void * dst, void * src, size_t size )

    551. 

  551. @@ -103,7 +103,7 @@

    552. 

  552.  	if(!bEncoding)

    553. 

  553.  		return;

    554. 

  554.  

    555. 

  555. -	CryptoEngine->DecryptMem(dst, size, key);

    556. 

  556. +	CryptoEngine->DecryptMem((BYTE*)dst, (int)size, key);

    557. 

  557.  }

    558. 

  558.  

    559. 

  559.  void EncodeDBWrite(DWORD ofs, void * src, size_t size)

    560. 

  560. @@ -114,12 +114,12 @@

    561. 

  561.  		

    562. 

  562.  		buf = (BYTE*)GlobalAlloc(GPTR, sizeof(BYTE)*size);

    563. 

  563.  		EncodeCopyMemory(buf, src, size);

    564. 

  564. -		DBWrite(ofs,buf,size);

    565. 

  565. +		DBWrite(ofs,buf,(int)size);

    566. 

  566.  		GlobalFree(buf);

    567. 

  567.  	}

    568. 

  568.  	else

    569. 

  569.  	{

    570. 

  570. -		DBWrite(ofs,src,size);

    571. 

  571. +		DBWrite(ofs,src,(int)size);

    572. 

  572.  	}

    573. 

  573.  }

    574. 

  574.  

    575. 

  575. @@ -128,16 +128,14 @@

    576. 

  576.  	

    577. 

  577.  	if(bEncoding)

    578. 

  578.  	{

    579. 

  579. -		BYTE * buf;

    580. 

  580. -

    581. 

  581. -		buf = (BYTE*)GlobalAlloc(GPTR, sizeof(BYTE)*size);

    582. 

  582. +		BYTE * buf = (BYTE*)GlobalAlloc(GPTR, sizeof(BYTE)*size);

    583. 

  583.  		DecodeCopyMemory(buf, src, size);

    584. 

  584. -		DBWrite(ofs,buf,size);

    585. 

  585. +		DBWrite(ofs,buf,(int)size);

    586. 

  586.  		GlobalFree(buf);

    587. 

  587.  	}

    588. 

  588.  	else

    589. 

  589.  	{

    590. 

  590. -		DBWrite(ofs,src,size);

    591. 

  591. +		DBWrite(ofs,src,(int)size);

    592. 

  592.  	}

    593. 

  593.  }

    594. 

  594.  

    595. 

  595. @@ -242,9 +240,7 @@

    596. 

  596.  

    597. 

  597.  void EncodeAll()

    598. 

  598.  {

    599. 

  599. -	HANDLE hContact;

    600. 

  600. -

    601. 

  601. -	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

    602. 

  602. +	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

    603. 

  603.  	if(hContact){

    604. 

  604.  		do{

    605. 

  605.  			EncodeContactEvents(hContact);

    606. 

  606. @@ -258,9 +254,7 @@

    607. 

  607.  

    608. 

  608.  void DecodeAll()

    609. 

  609.  {

    610. 

  610. -	HANDLE hContact;	

    611. 

  611. -	

    612. 

  612. -	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

    613. 

  613. +	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

    614. 

  614.  	if(hContact){

    615. 

  615.  		do{

    616. 

  616.  			DecodeContactEvents(hContact);

    617. 

  617. @@ -365,7 +359,7 @@

    618. 

  618.  

    619. 

  619.  	bEncoding = 0;

    620. 

  620.  

    621. 

  621. -	zero_fill(encryptKey, sizeof encryptKey);

    622. 

  622. +	zero_fill((BYTE*)encryptKey, sizeof encryptKey);

    623. 

  623.  

    624. 

  624.  	if (gl_bUnicodeAwareCore)

    625. 

  625.  		xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);

    626. 

  626. @@ -421,7 +415,7 @@

    627. 

  627.  		CryptoEngine = NULL;

    628. 

  628.  		DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", 0);

    629. 

  629.  

    630. 

  630. -		zero_fill(encryptKey, sizeof encryptKey);

    631. 

  631. +		zero_fill((BYTE*)encryptKey, sizeof encryptKey);

    632. 

  632.  

    633. 

  633.  		if (gl_bUnicodeAwareCore)

    634. 

  634.  			xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);

    635. 

  635. @@ -442,7 +436,7 @@

    636. 

  636.  		WriteCryptHeader();

    637. 

  637.  	}

    638. 

  638.  

    639. 

  639. -	zero_fill(newpass, sizeof newpass);

    640. 

  640. +	zero_fill((BYTE*)newpass, sizeof newpass);

    641. 

  641.  

    642. 

  642.  	LeaveCriticalSection(&csDbAccess);

    643. 

  643.  }

    644. 

  644. \ No newline at end of file

    645. 

    646.