Partydeck/IAP-Extension
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed pcall

Browse Source
This commit is contained in:
Alexey Gulev 2019-09-20 20:06:35 +02:00
parent b68550e6ef
commit af80e05796
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extension-iap/src/iap_android.cpp
View File

@ -14,15 +14,11 @@ struct IAP;
#define CMD_PRODUCT_RESULT (0) #define CMD_PRODUCT_RESULT (0)
#define CMD_PURCHASE_RESULT (1) #define CMD_PURCHASE_RESULT (1)
struct DM_ALIGNED(16) Command struct Command
{ {
Command()
{
memset(this, 0, sizeof(*this));
}
uint32_t m_Command; uint32_t m_Command;
int32_t m_ResponseCode; int32_t m_ResponseCode;
void* m_Data1; char* m_Data1;
}; };
static dmArray<Command> m_commandsQueue; static dmArray<Command> m_commandsQueue;
@ -71,7 +67,7 @@ struct IAP
jmethodID m_FinishTransaction; jmethodID m_FinishTransaction;
}; };
IAP g_IAP; static IAP g_IAP;
static void add_to_queue(Command cmd) static void add_to_queue(Command cmd)
{ {
@ -269,6 +265,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_
Command cmd; Command cmd;
cmd.m_Command = CMD_PRODUCT_RESULT; cmd.m_Command = CMD_PRODUCT_RESULT;
cmd.m_ResponseCode = responseCode; cmd.m_ResponseCode = responseCode;
cmd.m_Data1 = 0;
if (pl) if (pl)
{ {
cmd.m_Data1 = strdup(pl); cmd.m_Data1 = strdup(pl);
@ -288,7 +285,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
Command cmd; Command cmd;
cmd.m_Command = CMD_PURCHASE_RESULT; cmd.m_Command = CMD_PURCHASE_RESULT;
cmd.m_ResponseCode = responseCode; cmd.m_ResponseCode = responseCode;
cmd.m_Data1 = 0;
if (pd) if (pd)
{ {
cmd.m_Data1 = strdup(pd); cmd.m_Data1 = strdup(pd);
@ -352,7 +349,7 @@ static void HandleProductResult(const Command* cmd)
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }
@ -425,7 +422,7 @@ static void HandlePurchaseResult(const Command* cmd)
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }

4
extension-iap/src/iap_emscripten.cpp
View File

@ -101,7 +101,7 @@ void IAPList_Callback(void* Lv, const char* result_json)
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }
assert(top == lua_gettop(L)); assert(top == lua_gettop(L));
@ -199,7 +199,7 @@ void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
} }
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }
assert(top == lua_gettop(L)); assert(top == lua_gettop(L));

6
extension-iap/src/iap_ios.mm
View File

@ -123,7 +123,7 @@ IAP g_IAP;
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }
@ -166,7 +166,7 @@ IAP g_IAP;
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }
@ -262,7 +262,7 @@ void RunTransactionCallback(lua_State* L, int cb, int self, SKPaymentTransaction
int ret = lua_pcall(L, 3, 0, 0); int ret = lua_pcall(L, 3, 0, 0);
if (ret != 0) { if (ret != 0) {
dmLogError("Error running iap callback"); dmLogError("Error running callback: %s", lua_tostring(L, -1));
lua_pop(L, 1); lua_pop(L, 1);
} }