Assorted spelling fixes.
This commit is contained in:
parent
ffbf92f5f2
commit
fa48cb042c
|
@ -313,7 +313,7 @@ static void test_SIPLoad(void)
|
||||||
|
|
||||||
/* The function addresses returned by CryptSIPLoad are actually the addresses of
|
/* The function addresses returned by CryptSIPLoad are actually the addresses of
|
||||||
* crypt32's own functions. A function calling these addresses will end up first
|
* crypt32's own functions. A function calling these addresses will end up first
|
||||||
* calling crypt32 functions which in it's turn call the equivalent in the SIP
|
* calling crypt32 functions which in its turn call the equivalent in the SIP
|
||||||
* as dictated by the given GUID.
|
* as dictated by the given GUID.
|
||||||
*/
|
*/
|
||||||
if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData &&
|
if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData &&
|
||||||
|
@ -337,7 +337,7 @@ static void test_SIPLoad(void)
|
||||||
todo_wine
|
todo_wine
|
||||||
{
|
{
|
||||||
ok ( ret, "Expected CryptSIPLoad to succeed\n");
|
ok ( ret, "Expected CryptSIPLoad to succeed\n");
|
||||||
/* This call on it's own would have resulted in a ERROR_PROC_NOT_FOUND, but the previous
|
/* This call on its own would have resulted in an ERROR_PROC_NOT_FOUND, but the previous
|
||||||
* call to CryptSIPLoad already loaded wintrust.dll. As this information is cached,
|
* call to CryptSIPLoad already loaded wintrust.dll. As this information is cached,
|
||||||
* CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow.
|
* CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -583,7 +583,7 @@ PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat)
|
||||||
{
|
{
|
||||||
return WINED3DFMT_R8G8_B8G8;
|
return WINED3DFMT_R8G8_B8G8;
|
||||||
}
|
}
|
||||||
return WINED3DFMT_UNKNOWN; /* Abuse this as a error value */
|
return WINED3DFMT_UNKNOWN; /* Abuse this as an error value */
|
||||||
}
|
}
|
||||||
else if(DDPixelFormat->dwFlags & DDPF_BUMPDUDV)
|
else if(DDPixelFormat->dwFlags & DDPF_BUMPDUDV)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1851,7 +1851,7 @@ static void test_Installer_InstallProduct(LPCWSTR szPath)
|
||||||
ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
|
ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
|
||||||
ok_exception(hr, szProductInfoException);
|
ok_exception(hr, szProductInfoException);
|
||||||
|
|
||||||
/* Non-existent attribute */
|
/* Nonexistent attribute */
|
||||||
memset(szString, 0, sizeof(szString));
|
memset(szString, 0, sizeof(szString));
|
||||||
hr = Installer_ProductInfo(szProductCode, szMsifile, szString);
|
hr = Installer_ProductInfo(szProductCode, szMsifile, szString);
|
||||||
ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
|
ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr);
|
||||||
|
|
|
@ -116,7 +116,7 @@ static void test_xmlelem(void)
|
||||||
hr = IXMLElement_removeAttribute(element, str);
|
hr = IXMLElement_removeAttribute(element, str);
|
||||||
ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
|
ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
|
||||||
|
|
||||||
/* remove now non-existent attribute */
|
/* remove now nonexistent attribute */
|
||||||
hr = IXMLElement_removeAttribute(element, str);
|
hr = IXMLElement_removeAttribute(element, str);
|
||||||
ok(hr == S_FALSE, "Expected S_FALSE, got %d\n", hr);
|
ok(hr == S_FALSE, "Expected S_FALSE, got %d\n", hr);
|
||||||
|
|
||||||
|
|
|
@ -1252,7 +1252,7 @@ static void test_VarParseNumFromStr(void)
|
||||||
EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,4,0,-1);
|
EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,4,0,-1);
|
||||||
EXPECT2(1,FAILDIG);
|
EXPECT2(1,FAILDIG);
|
||||||
|
|
||||||
/* As are positive exponents and leading exponent 0's */
|
/* As are positive exponents and leading exponent 0s */
|
||||||
CONVERT("1e+01", NUMPRS_EXPONENT);
|
CONVERT("1e+01", NUMPRS_EXPONENT);
|
||||||
EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,5,0,1);
|
EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,5,0,1);
|
||||||
EXPECT2(1,FAILDIG);
|
EXPECT2(1,FAILDIG);
|
||||||
|
@ -1304,12 +1304,12 @@ static void test_VarParseNumFromStr(void)
|
||||||
|
|
||||||
/** Combinations **/
|
/** Combinations **/
|
||||||
|
|
||||||
/* Leading whitepace and plus, doesn't consume trailing whitespace */
|
/* Leading whitespace and plus, doesn't consume trailing whitespace */
|
||||||
CONVERT("+ 0 ", NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE);
|
CONVERT("+ 0 ", NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE);
|
||||||
EXPECT(1,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,3,0,0);
|
EXPECT(1,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,3,0,0);
|
||||||
EXPECT2(0,FAILDIG);
|
EXPECT2(0,FAILDIG);
|
||||||
|
|
||||||
/* Order of whitepace and plus is unimportant */
|
/* Order of whitespace and plus is unimportant */
|
||||||
CONVERT(" +0", NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE);
|
CONVERT(" +0", NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE);
|
||||||
EXPECT(1,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,3,0,0);
|
EXPECT(1,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,NUMPRS_LEADING_PLUS|NUMPRS_LEADING_WHITE,3,0,0);
|
||||||
EXPECT2(0,FAILDIG);
|
EXPECT2(0,FAILDIG);
|
||||||
|
@ -5428,7 +5428,7 @@ static HRESULT (WINAPI *pVarAnd)(LPVARIANT,LPVARIANT,LPVARIANT);
|
||||||
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
||||||
test_var_call2( __LINE__, pVarAnd, &left, &right, &exp );
|
test_var_call2( __LINE__, pVarAnd, &left, &right, &exp );
|
||||||
|
|
||||||
/* Skip any type that is not defined or produces a error for every case */
|
/* Skip any type that is not defined or produces an error for every case */
|
||||||
#define SKIPTESTAND(a) \
|
#define SKIPTESTAND(a) \
|
||||||
if (a == VT_ERROR || a == VT_VARIANT || \
|
if (a == VT_ERROR || a == VT_VARIANT || \
|
||||||
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
||||||
|
@ -5474,7 +5474,7 @@ static void test_VarAnd(void)
|
||||||
if ((rightvt | ExtraFlags[i]) == VT_BSTR)
|
if ((rightvt | ExtraFlags[i]) == VT_BSTR)
|
||||||
V_BSTR(&right) = true_str;
|
V_BSTR(&right) = true_str;
|
||||||
|
|
||||||
/* Native VarAnd always returns a error when using any extra
|
/* Native VarAnd always returns an error when using extra
|
||||||
* flags or if the variant combination is I8 and INT.
|
* flags or if the variant combination is I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
@ -6372,7 +6372,7 @@ static HRESULT (WINAPI *pVarPow)(LPVARIANT,LPVARIANT,LPVARIANT);
|
||||||
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
||||||
test_var_call2( __LINE__, pVarPow, &left, &right, &exp );
|
test_var_call2( __LINE__, pVarPow, &left, &right, &exp );
|
||||||
|
|
||||||
/* Skip any type that is not defined or produces a error for every case */
|
/* Skip any type that is not defined or produces an error for every case */
|
||||||
#define SKIPTESTPOW(a) \
|
#define SKIPTESTPOW(a) \
|
||||||
if (a == VT_ERROR || a == VT_VARIANT || \
|
if (a == VT_ERROR || a == VT_VARIANT || \
|
||||||
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
||||||
|
@ -6424,7 +6424,7 @@ static void test_VarPow(void)
|
||||||
if (rightvt == VT_BSTR)
|
if (rightvt == VT_BSTR)
|
||||||
V_BSTR(&right) = num2_str;
|
V_BSTR(&right) = num2_str;
|
||||||
|
|
||||||
/* Native VarPow always returns a error when using any extra flags */
|
/* Native VarPow always returns an error when using extra flags */
|
||||||
if (ExtraFlags[i] != 0)
|
if (ExtraFlags[i] != 0)
|
||||||
bFail = TRUE;
|
bFail = TRUE;
|
||||||
|
|
||||||
|
@ -6876,7 +6876,7 @@ static HRESULT (WINAPI *pVarDiv)(LPVARIANT,LPVARIANT,LPVARIANT);
|
||||||
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
||||||
test_var_call2( __LINE__, pVarDiv, &left, &right, &exp );
|
test_var_call2( __LINE__, pVarDiv, &left, &right, &exp );
|
||||||
|
|
||||||
/* Skip any type that is not defined or produces a error for every case */
|
/* Skip any type that is not defined or produces an error for every case */
|
||||||
#define SKIPTESTDIV(a) \
|
#define SKIPTESTDIV(a) \
|
||||||
if (a == VT_ERROR || a == VT_VARIANT || \
|
if (a == VT_ERROR || a == VT_VARIANT || \
|
||||||
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
||||||
|
@ -6995,7 +6995,7 @@ static void test_VarDiv(void)
|
||||||
else
|
else
|
||||||
bFail = TRUE;
|
bFail = TRUE;
|
||||||
|
|
||||||
/* Native VarDiv always returns a error when using any extra flags */
|
/* Native VarDiv always returns an error when using extra flags */
|
||||||
if (ExtraFlags[i] != 0)
|
if (ExtraFlags[i] != 0)
|
||||||
bFail = TRUE;
|
bFail = TRUE;
|
||||||
|
|
||||||
|
@ -7216,7 +7216,7 @@ static HRESULT (WINAPI *pVarIdiv)(LPVARIANT,LPVARIANT,LPVARIANT);
|
||||||
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
||||||
test_var_call2( __LINE__, pVarIdiv, &left, &right, &exp );
|
test_var_call2( __LINE__, pVarIdiv, &left, &right, &exp );
|
||||||
|
|
||||||
/* Skip any type that is not defined or produces a error for every case */
|
/* Skip any type that is not defined or produces an error for every case */
|
||||||
#define SKIPTESTIDIV(a) \
|
#define SKIPTESTIDIV(a) \
|
||||||
if (a == VT_ERROR || a == VT_VARIANT || \
|
if (a == VT_ERROR || a == VT_VARIANT || \
|
||||||
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
||||||
|
@ -7304,7 +7304,7 @@ static void test_VarIdiv(void)
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Native VarIdiv always returns a error when using any extra
|
/* Native VarIdiv always returns an error when using extra
|
||||||
* flags or if the variant combination is I8 and INT.
|
* flags or if the variant combination is I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
@ -7720,7 +7720,7 @@ static HRESULT (WINAPI *pVarImp)(LPVARIANT,LPVARIANT,LPVARIANT);
|
||||||
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \
|
||||||
test_var_call2( __LINE__, pVarImp, &left, &right, &exp );
|
test_var_call2( __LINE__, pVarImp, &left, &right, &exp );
|
||||||
|
|
||||||
/* Skip any type that is not defined or produces a error for every case */
|
/* Skip any type that is not defined or produces an error for every case */
|
||||||
#define SKIPTESTIMP(a) \
|
#define SKIPTESTIMP(a) \
|
||||||
if (a == VT_ERROR || a == VT_VARIANT || \
|
if (a == VT_ERROR || a == VT_VARIANT || \
|
||||||
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
a == VT_DISPATCH || a == VT_UNKNOWN || \
|
||||||
|
@ -7806,7 +7806,7 @@ static void test_VarImp(void)
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Native VarImp always returns a error when using any extra
|
/* Native VarImp always returns an error when using extra
|
||||||
* flags or if the variants are I8 and INT.
|
* flags or if the variants are I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
|
|
@ -2929,7 +2929,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
|
||||||
}
|
}
|
||||||
ExtraFlags = leftExtraFlags;
|
ExtraFlags = leftExtraFlags;
|
||||||
|
|
||||||
/* Native VarAnd always returns a error when using any extra
|
/* Native VarAnd always returns an error when using extra
|
||||||
* flags or if the variant combination is I8 and INT.
|
* flags or if the variant combination is I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
@ -3563,7 +3563,7 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result)
|
||||||
}
|
}
|
||||||
ExtraFlags = leftExtraFlags;
|
ExtraFlags = leftExtraFlags;
|
||||||
|
|
||||||
/* Native VarDiv always returns a error when using any extra flags */
|
/* Native VarDiv always returns an error when using extra flags */
|
||||||
if (ExtraFlags != 0)
|
if (ExtraFlags != 0)
|
||||||
{
|
{
|
||||||
hres = DISP_E_BADVARTYPE;
|
hres = DISP_E_BADVARTYPE;
|
||||||
|
@ -5131,7 +5131,7 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, LPVARIANT right, LPVARIANT result)
|
||||||
}
|
}
|
||||||
ExtraFlags = leftExtraFlags;
|
ExtraFlags = leftExtraFlags;
|
||||||
|
|
||||||
/* Native VarIdiv always returns a error when using any extra
|
/* Native VarIdiv always returns an error when using extra
|
||||||
* flags or if the variant combination is I8 and INT.
|
* flags or if the variant combination is I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
@ -5543,7 +5543,7 @@ HRESULT WINAPI VarPow(LPVARIANT left, LPVARIANT right, LPVARIANT result)
|
||||||
}
|
}
|
||||||
ExtraFlags = leftExtraFlags;
|
ExtraFlags = leftExtraFlags;
|
||||||
|
|
||||||
/* Native VarPow always returns a error when using any extra flags */
|
/* Native VarPow always returns an error when using extra flags */
|
||||||
if (ExtraFlags != 0)
|
if (ExtraFlags != 0)
|
||||||
{
|
{
|
||||||
hr = DISP_E_BADVARTYPE;
|
hr = DISP_E_BADVARTYPE;
|
||||||
|
@ -5659,7 +5659,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
|
||||||
}
|
}
|
||||||
ExtraFlags = leftExtraFlags;
|
ExtraFlags = leftExtraFlags;
|
||||||
|
|
||||||
/* Native VarImp always returns a error when using any extra
|
/* Native VarImp always returns an error when using extra
|
||||||
* flags or if the variants are I8 and INT.
|
* flags or if the variants are I8 and INT.
|
||||||
*/
|
*/
|
||||||
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
if ((leftvt == VT_I8 && rightvt == VT_INT) ||
|
||||||
|
|
|
@ -886,7 +886,7 @@ static void test_EM_SETUNDOLIMIT(void)
|
||||||
|
|
||||||
static void test_ES_PASSWORD(void)
|
static void test_ES_PASSWORD(void)
|
||||||
{
|
{
|
||||||
/* This isn't hugely testable, so we're just going to run it through it's paces. */
|
/* This isn't hugely testable, so we're just going to run it through its paces */
|
||||||
|
|
||||||
HWND hwndRichEdit = new_richedit(NULL);
|
HWND hwndRichEdit = new_richedit(NULL);
|
||||||
WCHAR result;
|
WCHAR result;
|
||||||
|
|
Loading…
Reference in New Issue