GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 14:25:38 +03:00
Code Issues Projects Releases Wiki Activity

Add MF_SetAmxStringUTF8Char and MF_SetAmxStringUTF8Cell.

Browse Source
This commit is contained in:
Arkshine 2014-08-02 13:42:14 +02:00
parent 0bfcaa85b6
commit b5fe5d29c9
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/amxmodx.h
View File

@ -302,6 +302,8 @@ int load_amxscript(AMX* amx, void** program, const char* path, char error[64], i
int set_amxnatives(AMX* amx, char error[64]); int set_amxnatives(AMX* amx, char error[64]);
int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max); int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max);
template <typename T> int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcelen, size_t maxlen); template <typename T> int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcelen, size_t maxlen);
int set_amxstring_utf8_char(AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen);
int set_amxstring_utf8_cell(AMX *amx, cell amx_addr, const cell *source, size_t sourcelen, size_t maxlen);
int unload_amxscript(AMX* amx, void** program); int unload_amxscript(AMX* amx, void** program);
void copy_amxmemory(cell* dest, cell* src, int len); void copy_amxmemory(cell* dest, cell* src, int len);

2
amxmodx/modules.cpp
View File

@ -1867,6 +1867,8 @@ void Module_CacheFunctions()
// String / mem in amx scripts support // String / mem in amx scripts support
REGISTER_FUNC("SetAmxString", set_amxstring) REGISTER_FUNC("SetAmxString", set_amxstring)
REGISTER_FUNC("SetAmxStringUTF8Char", set_amxstring_utf8_char)
REGISTER_FUNC("SetAmxStringUTF8Cell", set_amxstring_utf8_cell)
REGISTER_FUNC("GetAmxString", MNF_GetAmxString) REGISTER_FUNC("GetAmxString", MNF_GetAmxString)
REGISTER_FUNC("GetAmxStringLen", MNF_GetAmxStringLen) REGISTER_FUNC("GetAmxStringLen", MNF_GetAmxStringLen)
REGISTER_FUNC("FormatAmxString", MNF_FormatAmxString) REGISTER_FUNC("FormatAmxString", MNF_FormatAmxString)

6
amxmodx/sdk/amxxmodule.cpp
View File

@ -2448,6 +2448,8 @@ PFN_GET_AMXSCRIPT g_fn_GetAmxScript;
PFN_FIND_AMXSCRIPT_BYAMX g_fn_FindAmxScriptByAmx; PFN_FIND_AMXSCRIPT_BYAMX g_fn_FindAmxScriptByAmx;
PFN_FIND_AMXSCRIPT_BYNAME g_fn_FindAmxScriptByName; PFN_FIND_AMXSCRIPT_BYNAME g_fn_FindAmxScriptByName;
PFN_SET_AMXSTRING g_fn_SetAmxString; PFN_SET_AMXSTRING g_fn_SetAmxString;
PFN_SET_AMXSTRING_UTF8_CHAR g_fn_SetAmxStringUTF8Char;
PFN_SET_AMXSTRING_UTF8_CELL g_fn_SetAmxStringUTF8Cell;
PFN_GET_AMXSTRING g_fn_GetAmxString; PFN_GET_AMXSTRING g_fn_GetAmxString;
PFN_GET_AMXSTRINGLEN g_fn_GetAmxStringLen; PFN_GET_AMXSTRINGLEN g_fn_GetAmxStringLen;
PFN_FORMAT_AMXSTRING g_fn_FormatAmxString; PFN_FORMAT_AMXSTRING g_fn_FormatAmxString;
@ -2587,6 +2589,8 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
// String / mem in amx scripts support // String / mem in amx scripts support
REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING); REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING);
REQFUNC("SetAmxStringUTF8Char", g_fn_SetAmxStringUTF8Char, PFN_SET_AMXSTRING_UTF8_CHAR);
REQFUNC("SetAmxStringUTF8Cell", g_fn_SetAmxStringUTF8Cell, PFN_SET_AMXSTRING_UTF8_CELL);
REQFUNC("GetAmxString", g_fn_GetAmxString, PFN_GET_AMXSTRING); REQFUNC("GetAmxString", g_fn_GetAmxString, PFN_GET_AMXSTRING);
REQFUNC("GetAmxStringLen", g_fn_GetAmxStringLen, PFN_GET_AMXSTRINGLEN); REQFUNC("GetAmxStringLen", g_fn_GetAmxStringLen, PFN_GET_AMXSTRINGLEN);
REQFUNC("FormatAmxString", g_fn_FormatAmxString, PFN_FORMAT_AMXSTRING); REQFUNC("FormatAmxString", g_fn_FormatAmxString, PFN_FORMAT_AMXSTRING);
@ -2739,6 +2743,8 @@ void ValidateMacros_DontCallThis_Smiley()
MF_FindScriptByAmx(NULL); MF_FindScriptByAmx(NULL);
MF_FindScriptByName("str"); MF_FindScriptByName("str");
MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxString(NULL, 0, "str", 0);
MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0);
MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0);
MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxString(NULL, 0, 0, 0);
MF_GetAmxStringLen(NULL); MF_GetAmxStringLen(NULL);
MF_CopyAmxMemory(NULL, NULL, 0); MF_CopyAmxMemory(NULL, NULL, 0);

10
amxmodx/sdk/amxxmodule.h
View File

@ -2128,6 +2128,8 @@ typedef AMX * (*PFN_GET_AMXSCRIPT) (int /*id*/);
typedef int (*PFN_FIND_AMXSCRIPT_BYAMX) (const AMX * /*amx*/); typedef int (*PFN_FIND_AMXSCRIPT_BYAMX) (const AMX * /*amx*/);
typedef int (*PFN_FIND_AMXSCRIPT_BYNAME) (const char * /*name*/); typedef int (*PFN_FIND_AMXSCRIPT_BYNAME) (const char * /*name*/);
typedef int (*PFN_SET_AMXSTRING) (AMX * /*amx*/, cell /*amx_addr*/, const char * /* source */, int /* max */); typedef int (*PFN_SET_AMXSTRING) (AMX * /*amx*/, cell /*amx_addr*/, const char * /* source */, int /* max */);
typedef int (*PFN_SET_AMXSTRING_UTF8_CHAR) (AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen);
typedef int (*PFN_SET_AMXSTRING_UTF8_CELL) (AMX *amx, cell amx_addr, const cell *source, size_t sourcelen, size_t maxlen) { }
typedef char * (*PFN_GET_AMXSTRING) (AMX * /*amx*/, cell /*amx_addr*/, int /*bufferId*/, int * /*pLen*/); typedef char * (*PFN_GET_AMXSTRING) (AMX * /*amx*/, cell /*amx_addr*/, int /*bufferId*/, int * /*pLen*/);
typedef int (*PFN_GET_AMXSTRINGLEN) (const cell *ptr); typedef int (*PFN_GET_AMXSTRINGLEN) (const cell *ptr);
typedef char * (*PFN_FORMAT_AMXSTRING) (AMX * /*amx*/, cell * /*params*/, int /*startParam*/, int * /*pLen*/); typedef char * (*PFN_FORMAT_AMXSTRING) (AMX * /*amx*/, cell * /*params*/, int /*startParam*/, int * /*pLen*/);
@ -2217,6 +2219,8 @@ extern PFN_GET_AMXSCRIPT g_fn_GetAmxScript;
extern PFN_FIND_AMXSCRIPT_BYAMX g_fn_FindAmxScriptByAmx; extern PFN_FIND_AMXSCRIPT_BYAMX g_fn_FindAmxScriptByAmx;
extern PFN_FIND_AMXSCRIPT_BYNAME g_fn_FindAmxScriptByName; extern PFN_FIND_AMXSCRIPT_BYNAME g_fn_FindAmxScriptByName;
extern PFN_SET_AMXSTRING g_fn_SetAmxString; extern PFN_SET_AMXSTRING g_fn_SetAmxString;
extern PFN_SET_AMXSTRING_UTF8_CHAR g_fn_SetAmxStringUTF8Char;
extern PFN_SET_AMXSTRING_UTF8_CELL g_fn_SetAmxStringUTF8Cell;
extern PFN_GET_AMXSTRING g_fn_GetAmxString; extern PFN_GET_AMXSTRING g_fn_GetAmxString;
extern PFN_GET_AMXSTRINGLEN g_fn_GetAmxStringLen; extern PFN_GET_AMXSTRINGLEN g_fn_GetAmxStringLen;
extern PFN_FORMAT_AMXSTRING g_fn_FormatAmxString; extern PFN_FORMAT_AMXSTRING g_fn_FormatAmxString;
@ -2280,7 +2284,7 @@ extern PFN_GETLOCALINFO g_fn_GetLocalInfo;
extern PFN_AMX_REREGISTER g_fn_AmxReRegister; extern PFN_AMX_REREGISTER g_fn_AmxReRegister;
extern PFN_REGISTERFUNCTIONEX g_fn_RegisterFunctionEx; extern PFN_REGISTERFUNCTIONEX g_fn_RegisterFunctionEx;
extern PFN_MESSAGE_BLOCK g_fn_MessageBlock; extern PFN_MESSAGE_BLOCK g_fn_MessageBlock;
template <typename T> int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcelen, size_t maxlen);
#ifdef MAY_NEVER_BE_DEFINED #ifdef MAY_NEVER_BE_DEFINED
// Function prototypes for intellisense and similar systems // Function prototypes for intellisense and similar systems
// They understand #if 0 so we use #ifdef MAY_NEVER_BE_DEFINED // They understand #if 0 so we use #ifdef MAY_NEVER_BE_DEFINED
@ -2296,6 +2300,8 @@ AMX * MF_GetScriptAmx (int id) { }
int MF_FindScriptByAmx (const AMX * amx) { } int MF_FindScriptByAmx (const AMX * amx) { }
int MF_FindScriptByAmx (const char * name) { } int MF_FindScriptByAmx (const char * name) { }
int MF_SetAmxString (AMX * amx, cell amx_addr, const char * source , int max ) { } int MF_SetAmxString (AMX * amx, cell amx_addr, const char * source , int max ) { }
int MF_SetAmxStringUTF8Char (AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen) { }
int MF_SetAmxStringUTF8Cell (AMX *amx, cell amx_addr, const cell *source, size_t sourcelen, size_t maxlen) { }
char * MF_GetAmxString (AMX * amx, cell amx_addr, int bufferId, int * pLen) { } char * MF_GetAmxString (AMX * amx, cell amx_addr, int bufferId, int * pLen) { }
int MF_GetAmxStringLen (const cell *ptr) { } int MF_GetAmxStringLen (const cell *ptr) { }
char * MF_FormatAmxString (AMX * amx, cell * params, int startParam, int * pLen) { } char * MF_FormatAmxString (AMX * amx, cell * params, int startParam, int * pLen) { }
@ -2368,6 +2374,8 @@ void * MF_MessageBlock (int mode, int msg, int *opt) { }
#define MF_FindScriptByAmx g_fn_FindAmxScriptByAmx #define MF_FindScriptByAmx g_fn_FindAmxScriptByAmx
#define MF_FindScriptByName g_fn_FindAmxScriptByName #define MF_FindScriptByName g_fn_FindAmxScriptByName
#define MF_SetAmxString g_fn_SetAmxString #define MF_SetAmxString g_fn_SetAmxString
#define MF_SetAmxStringUTF8Char g_fn_SetAmxStringUTF8Char
#define MF_SetAmxStringUTF8Cell g_fn_SetAmxStringUTF8Cell
#define MF_GetAmxString g_fn_GetAmxString #define MF_GetAmxString g_fn_GetAmxString
#define MF_GetAmxStringLen g_fn_GetAmxStringLen #define MF_GetAmxStringLen g_fn_GetAmxStringLen
#define MF_CopyAmxMemory g_fn_CopyAmxMemory #define MF_CopyAmxMemory g_fn_CopyAmxMemory

10
amxmodx/string.cpp
View File

@ -144,6 +144,16 @@ int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcele
return len; return len;
} }
int set_amxstring_utf8_char(AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen)
{
return set_amxstring_utf8(amx, amx_addr, source, sourcelen, maxlen);
}
int set_amxstring_utf8_cell(AMX *amx, cell amx_addr, const cell *source, size_t sourcelen, size_t maxlen)
{
return set_amxstring_utf8(amx, amx_addr, source, sourcelen, maxlen);
}
extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, int maxlen) extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, int maxlen)
{ {
register cell *source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr)); register cell *source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));