- microkernel addded;

- version bumped to 0.92.2

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

9 files changed, 34 insertions, 34 deletions

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index d68ad5a9b8..8a50469245 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -99,7 +99,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam)
 			// something is being written to a protocol module

 			if ( !strcmp(szProto, cws->szModule)) {

 				// was a unique setting key written?

-				id = (char *) CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

+				id = (char *) CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

 				if ((INT_PTR) id != CALLSERVICE_NOTFOUND && id != NULL && !strcmp(id, cws->szSetting))

 					cli.pfnClcBroadcast(INTM_PROTOCHANGED, wParam, lParam);

 			}

@@ -129,7 +129,7 @@ static int ClcAccountsChanged(WPARAM, LPARAM)
 	for (i = 0, cnt = 0; i < accounts.getCount(); ++i) {

 		if (Proto_IsAccountEnabled(accounts[i])) {

 			cli.clcProto[cnt].szProto = accounts[i]->szModuleName;

-			cli.clcProto[cnt].dwStatus = CallProtoService(accounts[i]->szModuleName, PS_GETSTATUS, 0, 0);

+			cli.clcProto[cnt].dwStatus = CallProtoServiceInt(NULL,accounts[i]->szModuleName, PS_GETSTATUS, 0, 0);

 			++cnt;

 		}

 	}

diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index 8af901284b..5c64082215 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -82,7 +82,7 @@ static HANDLE HContactFromPoint(HWND hwnd, struct ClcData *dat, int x, int y, in
 	szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) contact->hContact, 0);

 	if (szProto == NULL)

 		return NULL;

-	protoCaps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

+	protoCaps = CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_1, 0);

 	if ( !(protoCaps & PF1_FILESEND))

 		return NULL;

 	if (ID_STATUS_OFFLINE == DBGetContactSettingWord(contact->hContact, szProto, "Status", ID_STATUS_OFFLINE))

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index f05f9c13ae..dc9c4a69e2 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -171,8 +171,8 @@ int GetAverageMode(int* pNetProtoCount = NULL)
 		netProtoCount++;

 

 		if (averageMode == 0)

-			averageMode = CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0);

-		else if (averageMode > 0 && averageMode != CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0)) {

+			averageMode = CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0);

+		else if (averageMode > 0 && averageMode != CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0)) {

 			averageMode = -1;

             if (pNetProtoCount == NULL) break;

 	    }	

@@ -449,12 +449,12 @@ INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM)
 	StatusMenuExecParam *smep = (StatusMenuExecParam*)pcpp->MenuItemOwnerData;

 	if (smep && !smep->status && smep->custom) {

 		if (wildcmp(smep->svc, "*XStatus*")) {

-			int XStatus = CallProtoService(smep->proto, "/GetXStatus", 0, 0);

+			int XStatus = CallProtoServiceInt(NULL,smep->proto, "/GetXStatus", 0, 0);

 			char buf[255];

 			mir_snprintf(buf, sizeof(buf), "*XStatus%d", XStatus);

 

-			bool check = wildcmp(smep->svc, buf);

-			bool reset = wildcmp(smep->svc, "*XStatus0");

+			bool check = wildcmp(smep->svc, buf) != 0;

+			bool reset = wildcmp(smep->svc, "*XStatus0") != 0;

 

 			if (check)

 				timi->mi.flags |= CMIF_CHECKED;

@@ -467,7 +467,7 @@ INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM)
 					CLISTMENUITEM mi2 = {0};

 					mi2.cbSize = sizeof(mi2);

 					mi2.flags = CMIM_NAME | CMIF_TCHAR;

-					mi2.ptszName = LangPackTranslateStringT(timi->mi.hLangpack, timi->mi.hIcon ? timi->mi.ptszName : LPGENT("Custom status"));

+					mi2.ptszName = TranslateTH(timi->mi.hLangpack, timi->mi.hIcon ? timi->mi.ptszName : LPGENT("Custom status"));

 

 					timiParent = MO_GetIntMenuItem(timi->mi.root);

 

@@ -510,7 +510,7 @@ INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM)
 		}	}	}

 	}

 	else if (smep && smep->status && !smep->custom) {

-		int curProtoStatus = (smep->proto) ? CallProtoService(smep->proto, PS_GETSTATUS, 0, 0) : GetAverageMode();

+		int curProtoStatus = (smep->proto) ? CallProtoServiceInt(NULL,smep->proto, PS_GETSTATUS, 0, 0) : GetAverageMode();

 		if (smep->status == curProtoStatus)

 			timi->mi.flags |= CMIF_CHECKED;

 		else

@@ -531,13 +531,13 @@ INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM)
 		if (Proto_GetAccount(prot) == NULL)

 			return TRUE;

 

-		if ((curProtoStatus = CallProtoService(prot, PS_GETSTATUS, 0, 0)) == CALLSERVICE_NOTFOUND)

+		if ((curProtoStatus = CallProtoServiceInt(NULL,prot, PS_GETSTATUS, 0, 0)) == CALLSERVICE_NOTFOUND)

 			curProtoStatus = 0;

 

 		if (curProtoStatus >= ID_STATUS_OFFLINE && curProtoStatus < ID_STATUS_IDLE)

 			timi->mi.hIcon = LoadSkinProtoIcon(prot, curProtoStatus);

 		else {

-			timi->mi.hIcon=(HICON)CallProtoService(prot, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

+			timi->mi.hIcon=(HICON)CallProtoServiceInt(NULL,prot, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

 			if (timi->mi.hIcon == (HICON)CALLSERVICE_NOTFOUND)

 				timi->mi.hIcon = NULL;

 			else

@@ -574,7 +574,7 @@ INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM)
 				int i=(DBGetContactSettingByte(NULL, prot, "LockMainStatus", 0)?0:1);

 				DBWriteContactSettingByte(NULL, prot, "LockMainStatus", (BYTE)i);

 

-				CallProtoService(smep->proto, PS_GETNAME, (WPARAM)SIZEOF(szHumanName), (LPARAM)szHumanName);

+				CallProtoServiceInt(NULL,smep->proto, PS_GETNAME, (WPARAM)SIZEOF(szHumanName), (LPARAM)szHumanName);

 				pimi = MO_GetIntMenuItem((HGENMENU)smep->protoindex);

 				PMO_IntMenuItem root = (PMO_IntMenuItem)pimi->mi.root;

 				mir_free(pimi->mi.pszName);

@@ -874,7 +874,7 @@ void RebuildMenuOrder(void)
 		tmi.cbSize = sizeof(tmi);

 		tmi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE | CMIF_KEEPUNTRANSLATED;

 		tmi.position = pos++;

-		tmi.hIcon = ic = (HICON)CallProtoService(pa->szModuleName, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0);

+		tmi.hIcon = ic = (HICON)CallProtoServiceInt(NULL,pa->szModuleName, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0);

 

 		if (Proto_IsAccountLocked(pa) && cli.bDisplayLocked) {

 			mir_sntprintf(tbuf, SIZEOF(tbuf), LPGENT("%s (locked)"), pa->tszAccountName);

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 26ad72ae7c..84d587db97 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -146,7 +146,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 

 	if ((int) ack->hProcess < ID_STATUS_ONLINE && ack->lParam >= ID_STATUS_ONLINE) {

 		DWORD caps;

-		caps = (DWORD) CallProtoService(ack->szModule, PS_GETCAPS, PFLAGNUM_1, 0);

+		caps = (DWORD) CallProtoServiceInt(NULL,ack->szModule, PS_GETCAPS, PFLAGNUM_1, 0);

 		if (caps & PF1_SERVERCLIST) {

 			HANDLE hContact;

 			char *szProto;

diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 608f692028..013a639168 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -53,13 +53,13 @@ static TCHAR* sttGetXStatus(const char* szProto)
 {

 	TCHAR* result = NULL;

 

-	if (CallProtoService(szProto, PS_GETSTATUS, 0, 0) > ID_STATUS_OFFLINE) {

+	if (CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0) > ID_STATUS_OFFLINE) {

 		char str[MAXMODULELABELLENGTH];

 		mir_snprintf(str, sizeof(str), "%s/GetXStatus", szProto);

 		if (ServiceExists(str)) {

 			char* dbTitle = "XStatusName";

 			char* dbTitle2 = NULL;

-			int xstatus = CallProtoService(szProto, "/GetXStatus", (WPARAM)&dbTitle, (LPARAM)&dbTitle2);

+			int xstatus = CallProtoServiceInt(NULL,szProto, "/GetXStatus", (WPARAM)&dbTitle, (LPARAM)&dbTitle2);

 			if (dbTitle && xstatus) {

 				DBVARIANT dbv={0};

 				if ( !DBGetContactSettingTString(NULL, szProto, dbTitle, &dbv)) {

@@ -123,7 +123,7 @@ TCHAR* fnTrayIconMakeTooltip(const TCHAR *szPrefix, const char *szProto)
 			if ( !cli.pfnGetProtocolVisibility(pa->szModuleName))

 				continue;

 

-			szStatus = cli.pfnGetStatusModeDescription(CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0), 0);

+			szStatus = cli.pfnGetStatusModeDescription(CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0), 0);

 			if ( !szStatus)

 				continue;

 

@@ -156,7 +156,7 @@ TCHAR* fnTrayIconMakeTooltip(const TCHAR *szPrefix, const char *szProto)
 	else {

 		if ((pa = Proto_GetAccount(szProto)) != NULL) {

 			ProtoXStatus = sttGetXStatus(szProto);

-			szStatus = cli.pfnGetStatusModeDescription(CallProtoService(szProto, PS_GETSTATUS, 0, 0), 0);

+			szStatus = cli.pfnGetStatusModeDescription(CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0), 0);

 			if (szPrefix && szPrefix[0]) {

 				if (DBGetContactSettingByte(NULL, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT)) {

 					if (mToolTipTrayTips) {

@@ -281,7 +281,7 @@ int fnTrayIconInit(HWND hwnd)
 		    else

 			    szProto = NULL;

 

-		    cli.pfnTrayIconAdd(hwnd, NULL, szProto, szProto ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0));

+		    cli.pfnTrayIconAdd(hwnd, NULL, szProto, szProto ? CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0));

 		    DBFreeVariant(&dbv);

 	    }

 	    else if (trayIconSetting == SETTING_TRAYICON_MULTI &&

@@ -295,7 +295,7 @@ int fnTrayIconInit(HWND hwnd)
                 {

 				    PROTOACCOUNT* pa = accounts[j];

 				    if (cli.pfnGetProtocolVisibility(pa->szModuleName))

-					    cli.pfnTrayIconAdd(hwnd, pa->szModuleName, NULL, CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0));

+					    cli.pfnTrayIconAdd(hwnd, pa->szModuleName, NULL, CallProtoServiceInt(NULL,pa->szModuleName, PS_GETSTATUS, 0, 0));

 		        }	

             }

 	    }	

@@ -498,7 +498,7 @@ VOID CALLBACK fnTrayCycleTimerProc(HWND, UINT, UINT_PTR, DWORD)
     {

         DestroyIcon(cli.trayIcon[0].hBaseIcon);

         cli.trayIcon[0].hBaseIcon = cli.pfnGetIconFromStatusMode(NULL, accounts[cycleStep]->szModuleName, 

-	        CallProtoService(accounts[cycleStep]->szModuleName, PS_GETSTATUS, 0, 0));

+	        CallProtoServiceInt(NULL,accounts[cycleStep]->szModuleName, PS_GETSTATUS, 0, 0));

         if (cli.trayIcon[0].isBase)

 	        cli.pfnTrayIconUpdate(cli.trayIcon[0].hBaseIcon, NULL, NULL, 1);

     }

@@ -534,7 +534,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 			if (trayIconSetting == SETTING_TRAYICON_MULTI) {

 				if (DBGetContactSettingByte(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT))

 					//changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode((char*)szChangedProto, NULL, averageMode), (char*)szChangedProto);

-					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0)), (char*)szChangedProto);

+					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szChangedProto, CallProtoServiceInt(NULL,szChangedProto, PS_GETSTATUS, 0, 0)), (char*)szChangedProto);

 				else if (cli.trayIcon && cli.trayIcon[0].szProto != NULL) {

 					cli.pfnTrayIconDestroy(hwnd);

 					cli.pfnTrayIconInit(hwnd);

@@ -555,7 +555,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 						szProto = NULL;

 					else

 						szProto = dbv.pszVal;

-					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szProto, szProto ? CallProtoService(szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0)), szProto);

+					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szProto, szProto ? CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0) : CallService(MS_CLIST_GETSTATUSMODE, 0, 0)), szProto);

 					DBFreeVariant(&dbv);

 					break;

 				}

@@ -564,7 +564,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 					SetTimer(NULL, 0, DBGetContactSettingWord(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT) * 1000, cli.pfnTrayCycleTimerProc);

 				changed =

 					cli.pfnTrayIconSetBaseInfo(ImageList_GetIcon

-					(hCListImages, cli.pfnIconFromStatusMode(szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0), NULL), 

+					(hCListImages, cli.pfnIconFromStatusMode(szChangedProto, CallProtoServiceInt(NULL,szChangedProto, PS_GETSTATUS, 0, 0), NULL), 

 					ILD_NORMAL), NULL);

 				break;

 			case SETTING_TRAYICON_MULTI:

@@ -572,7 +572,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto)
 					cli.pfnTrayIconRemove(NULL, NULL);

 				}

 				else if ((cli.trayIconCount > 1 || netProtoCount == 1) || DBGetContactSettingByte(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT))

-					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szChangedProto, CallProtoService(szChangedProto, PS_GETSTATUS, 0, 0)), (char*)szChangedProto);

+					changed = cli.pfnTrayIconSetBaseInfo(cli.pfnGetIconFromStatusMode(NULL, szChangedProto, CallProtoServiceInt(NULL,szChangedProto, PS_GETSTATUS, 0, 0)), (char*)szChangedProto);

 				else {

 					cli.pfnTrayIconDestroy(hwnd);

 					cli.pfnTrayIconInit(hwnd);

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 78ed09174d..8524a4cf3a 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -76,7 +76,7 @@ static void DisconnectAll()
 {

 	int nProto;

 	for (nProto = 0; nProto < accounts.getCount(); nProto++)

-		CallProtoService(accounts[nProto]->szModuleName, PS_SETSTATUS, ID_STATUS_OFFLINE, 0);

+		CallProtoServiceInt(NULL,accounts[nProto]->szModuleName, PS_SETSTATUS, ID_STATUS_OFFLINE, 0);

 }

 

 static int CluiIconsChanged(WPARAM, LPARAM)

@@ -183,7 +183,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 	if (DBGetContactSettingByte(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) &&

 		!(GetKeyState(VK_SHIFT)&0x8000))

 		// Ask user for confirmation, and if the contact should be archived (hidden, not deleted)

-		action = DialogBoxParam(hMirandaInst, MAKEINTRESOURCE(IDD_DELETECONTACT), (HWND) lParam, AskForConfirmationDlgProc, wParam);

+		action = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DELETECONTACT), (HWND) lParam, AskForConfirmationDlgProc, wParam);

 	else

 		action = IDYES;

 

@@ -197,11 +197,11 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 				// Check if protocol uses server side lists

 				DWORD caps;

 

-				caps = (DWORD) CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

+				caps = (DWORD) CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_1, 0);

 				if (caps & PF1_SERVERCLIST) {

 					int status;

 

-					status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);

+					status = CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0);

 					if (status == ID_STATUS_OFFLINE || (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {

 						// Set a flag so we remember to delete the contact when the protocol goes online the next time

 						DBWriteContactSettingByte((HANDLE) wParam, "CList", "Delete", 1);

@@ -1042,7 +1042,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				int status, x;

 				SIZE textSize;

 				BYTE showOpts = DBGetContactSettingByte(NULL, "CLUI", "SBarShow", 1);

-				status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);

+				status = CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0);

 				SetBkMode(dis->hDC, TRANSPARENT);

 				x = dis->rcItem.left;

 				if (showOpts & 1) {

diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp
index e1123ecd05..30f1a55322 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/modules/clist/cluiservices.cpp
@@ -199,7 +199,7 @@ void fnCluiProtocolStatusChanged(int, const char*)
 				x += GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

 			if (showOpts & 4) {

-				TCHAR* modeDescr = cli.pfnGetStatusModeDescription(CallProtoService(cli.menuProtos[i].szProto, PS_GETSTATUS, 0, 0), 0);

+				TCHAR* modeDescr = cli.pfnGetStatusModeDescription(CallProtoServiceInt(NULL,cli.menuProtos[i].szProto, PS_GETSTATUS, 0, 0), 0);

 				GetTextExtentPoint32(hdc, modeDescr, lstrlen(modeDescr), &textSize);

 				x += textSize.cx;

 				x += GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index b6f78c80ef..ff6ead1d75 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -77,7 +77,7 @@ LPTSTR GetMenuItemText(PMO_IntMenuItem pimi)
 	if (pimi->mi.flags & CMIF_KEEPUNTRANSLATED)

 		return pimi->mi.ptszName;

 		

-	return LangPackTranslateStringT(pimi->mi.hLangpack, pimi->mi.ptszName);

+	return TranslateTH(pimi->mi.hLangpack, pimi->mi.ptszName);

 }

 

 PMO_IntMenuItem MO_RecursiveWalkMenu(PMO_IntMenuItem parent, pfnWalkFunc func, void* param)

diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index e16fd49d18..c2ecc3f18b 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -849,7 +849,7 @@ int GenMenuOptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize=sizeof(odp);

-	odp.hInstance = hMirandaInst;

+	odp.hInstance = hInst;

 	odp.pszGroup = LPGEN("Customize");

 

 	odp.position = -1000000000;