diff options
Diffstat (limited to 'plugins/Variables/src/parse_logic.cpp')
| -rw-r--r-- | plugins/Variables/src/parse_logic.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/plugins/Variables/src/parse_logic.cpp b/plugins/Variables/src/parse_logic.cpp index 2c234b9890..7a48c01931 100644 --- a/plugins/Variables/src/parse_logic.cpp +++ b/plugins/Variables/src/parse_logic.cpp @@ -27,7 +27,7 @@ static wchar_t *parseAnd(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
for (unsigned i = 1; i < ai->argc; i++) {
- fi.tszFormat = ai->targv[i];
+ fi.szFormat.w = ai->argv.w[i];
mir_free(formatString(&fi));
if (fi.eCount > 0) {
@@ -56,10 +56,10 @@ static wchar_t *parseIf(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
fi.eCount = fi.pCount = 0;
- fi.tszFormat = ai->targv[1];
+ fi.szFormat.w = ai->argv.w[1];
mir_free(formatString(&fi));
- return mir_wstrdup((fi.eCount == 0) ? ai->targv[2] : ai->targv[3]);
+ return mir_wstrdup((fi.eCount == 0) ? ai->argv.w[2] : ai->argv.w[3]);
}
static wchar_t *parseIf2(ARGUMENTSINFO *ai)
@@ -70,13 +70,13 @@ static wchar_t *parseIf2(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
fi.eCount = fi.pCount = 0;
- fi.tszFormat = ai->targv[1];
+ fi.szFormat.w = ai->argv.w[1];
wchar_t *szCondition = formatString(&fi);
if (fi.eCount == 0)
return szCondition;
mir_free(szCondition);
- return mir_wstrdup(ai->targv[2]);
+ return mir_wstrdup(ai->argv.w[2]);
}
static wchar_t *parseIf3(ARGUMENTSINFO *ai)
@@ -85,7 +85,7 @@ static wchar_t *parseIf3(ARGUMENTSINFO *ai) memcpy(&fi, ai->fi, sizeof(fi));
for (unsigned i = 1; i < ai->argc; i++) {
fi.eCount = fi.pCount = 0;
- fi.tszFormat = ai->targv[i];
+ fi.szFormat.w = ai->argv.w[i];
wchar_t *szCondition = formatString(&fi);
if (fi.eCount == 0)
return szCondition;
@@ -103,17 +103,17 @@ static wchar_t *parseIfequal(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
- fi.szFormat = ai->argv[1];
+ fi.szFormat.w = ai->argv.w[1];
ptrW tszFirst(formatString(&fi));
- fi.szFormat = ai->argv[2];
+ fi.szFormat.w = ai->argv.w[2];
ptrW tszSecond(formatString(&fi));
if (tszFirst == NULL || tszSecond == NULL)
return nullptr;
if (ttoi(tszFirst) == ttoi(tszSecond))
- return mir_wstrdup(ai->targv[3]);
+ return mir_wstrdup(ai->argv.w[3]);
- return mir_wstrdup(ai->targv[4]);
+ return mir_wstrdup(ai->argv.w[4]);
}
static wchar_t *parseIfgreater(ARGUMENTSINFO *ai)
@@ -123,17 +123,17 @@ static wchar_t *parseIfgreater(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
- fi.szFormat = ai->argv[1];
+ fi.szFormat.w = ai->argv.w[1];
ptrW tszFirst(formatString(&fi));
- fi.szFormat = ai->argv[2];
+ fi.szFormat.w = ai->argv.w[2];
ptrW tszSecond(formatString(&fi));
if (tszFirst == NULL || tszSecond == NULL)
return nullptr;
if (ttoi(tszFirst) > ttoi(tszSecond))
- return mir_wstrdup(ai->targv[3]);
+ return mir_wstrdup(ai->argv.w[3]);
- return mir_wstrdup(ai->targv[4]);
+ return mir_wstrdup(ai->argv.w[4]);
}
static wchar_t *parseIflonger(ARGUMENTSINFO *ai)
@@ -143,17 +143,17 @@ static wchar_t *parseIflonger(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
- fi.szFormat = ai->argv[1];
+ fi.szFormat.w = ai->argv.w[1];
ptrW tszFirst(formatString(&fi));
- fi.szFormat = ai->argv[2];
+ fi.szFormat.w = ai->argv.w[2];
ptrW tszSecond(formatString(&fi));
if (tszFirst == NULL || tszSecond == NULL)
return nullptr;
if (mir_wstrlen(tszFirst) > mir_wstrlen(tszSecond))
- return mir_wstrdup(ai->targv[3]);
+ return mir_wstrdup(ai->argv.w[3]);
- return mir_wstrdup(ai->targv[4]);
+ return mir_wstrdup(ai->argv.w[4]);
}
/*
@@ -171,12 +171,12 @@ static wchar_t *parseFor(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
fi.eCount = fi.pCount = 0;
- fi.tszFormat = ai->targv[1];
+ fi.szFormat.w = ai->argv.w[1];
mir_free(formatString(&fi));
- fi.tszFormat = ai->targv[2];
+ fi.szFormat.w = ai->argv.w[2];
mir_free(formatString(&fi));
while (fi.eCount == 0) {
- fi.tszFormat = ai->targv[4];
+ fi.szFormat.w = ai->argv.w[4];
wchar_t *parsed = formatString(&fi);
if (parsed != nullptr) {
if (res == nullptr) {
@@ -191,10 +191,10 @@ static wchar_t *parseFor(ARGUMENTSINFO *ai) mir_wstrcat(res, parsed);
mir_free(parsed);
}
- fi.tszFormat = ai->targv[3];
+ fi.szFormat.w = ai->argv.w[3];
mir_free(formatString(&fi));
fi.eCount = 0;
- fi.tszFormat = ai->targv[2];
+ fi.szFormat.w = ai->argv.w[2];
mir_free(formatString(&fi));
}
@@ -206,7 +206,7 @@ static wchar_t *parseEqual(ARGUMENTSINFO *ai) if (ai->argc != 3)
return nullptr;
- if (ttoi(ai->targv[1]) != ttoi(ai->targv[2]))
+ if (ttoi(ai->argv.w[1]) != ttoi(ai->argv.w[2]))
ai->flags |= AIF_FALSE;
return mir_wstrdup(L"");
@@ -217,7 +217,7 @@ static wchar_t *parseGreater(ARGUMENTSINFO *ai) if (ai->argc != 3)
return nullptr;
- if (ttoi(ai->targv[1]) <= ttoi(ai->targv[2]))
+ if (ttoi(ai->argv.w[1]) <= ttoi(ai->argv.w[2]))
ai->flags |= AIF_FALSE;
return mir_wstrdup(L"");
@@ -228,7 +228,7 @@ static wchar_t *parseLonger(ARGUMENTSINFO *ai) if (ai->argc != 3)
return nullptr;
- if (mir_wstrlen(ai->targv[1]) <= mir_wstrlen(ai->targv[2]))
+ if (mir_wstrlen(ai->argv.w[1]) <= mir_wstrlen(ai->argv.w[2]))
ai->flags |= AIF_FALSE;
return mir_wstrdup(L"");
@@ -242,7 +242,7 @@ static wchar_t *parseNot(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
- fi.tszFormat = ai->targv[1];
+ fi.szFormat.w = ai->argv.w[1];
mir_free(formatString(&fi));
if (fi.eCount == 0)
@@ -260,7 +260,7 @@ static wchar_t *parseOr(ARGUMENTSINFO *ai) memcpy(&fi, ai->fi, sizeof(fi));
ai->flags |= AIF_FALSE;
for (unsigned i = 1; (i < ai->argc) && (ai->flags&AIF_FALSE); i++) {
- fi.tszFormat = ai->targv[i];
+ fi.szFormat.w = ai->argv.w[i];
fi.eCount = 0;
mir_free(formatString(&fi));
@@ -284,11 +284,11 @@ static wchar_t *parseXor(ARGUMENTSINFO *ai) FORMATINFO fi;
memcpy(&fi, ai->fi, sizeof(fi));
ai->flags = AIF_FALSE;
- fi.tszFormat = ai->targv[0];
+ fi.szFormat.w = ai->argv.w[0];
mir_free(formatString(&fi));
int val1 = fi.eCount == 0;
- fi.tszFormat = ai->targv[1];
+ fi.szFormat.w = ai->argv.w[1];
mir_free(formatString(&fi));
int val2 = fi.eCount == 0;
|