tests: Assorted spelling fixes.

This commit is contained in:
Frédéric Delanoy 2011-08-03 23:50:18 +02:00 committed by Alexandre Julliard
parent b94616864d
commit 760faf01a9
75 changed files with 150 additions and 150 deletions

View file

@ -255,7 +255,7 @@ static void test_LsaLookupNames2(void)
if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)
{ {
skip("Non-english locale (skipping LsaLookupNames2 tests)\n"); skip("Non-English locale (skipping LsaLookupNames2 tests)\n");
return; return;
} }

View file

@ -845,7 +845,7 @@ static void test_reg_open_key(void)
/* open same key twice */ /* open same key twice */
ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkResult); ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkResult);
ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);
ok(hkResult != hkPreserve, "epxected hkResult != hkPreserve\n"); ok(hkResult != hkPreserve, "expected hkResult != hkPreserve\n");
ok(hkResult != NULL, "hkResult != NULL\n"); ok(hkResult != NULL, "hkResult != NULL\n");
RegCloseKey(hkResult); RegCloseKey(hkResult);

View file

@ -239,8 +239,8 @@ static void test_sid(void)
ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n"); ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n");
pisid = psid; pisid = psid;
ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount); ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount);
ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expected 21, got %d\n", pisid->SubAuthority[0]);
ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expected 4576, got %d\n", pisid->SubAuthority[3]);
LocalFree(str); LocalFree(str);
LocalFree(psid); LocalFree(psid);
@ -2156,7 +2156,7 @@ static void test_LookupAccountName(void)
if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
{ {
skip("Non-english locale (test with hardcoded 'Everyone')\n"); skip("Non-English locale (test with hardcoded 'Everyone')\n");
} }
else else
{ {
@ -2294,7 +2294,7 @@ static void test_LookupAccountName(void)
if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
{ {
skip("Non-english locale (skipping well known name creation tests)\n"); skip("Non-English locale (skipping well known name creation tests)\n");
return; return;
} }
@ -2781,7 +2781,7 @@ static void test_SetEntriesInAclW(void)
if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
{ {
skip("Non-english locale (test with hardcoded 'Everyone')\n"); skip("Non-English locale (test with hardcoded 'Everyone')\n");
} }
else else
{ {
@ -2912,7 +2912,7 @@ static void test_SetEntriesInAclA(void)
if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH)
{ {
skip("Non-english locale (test with hardcoded 'Everyone')\n"); skip("Non-English locale (test with hardcoded 'Everyone')\n");
} }
else else
{ {

View file

@ -95,7 +95,7 @@ static void test_RunSetupCommand(void)
hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", systemdir, "Title", &hexe, 0, NULL); hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", systemdir, "Title", &hexe, 0, NULL);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND),
"Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr);
ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(hexe == NULL, "Expected hexe to be NULL\n");
ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n");
/* try a bad directory */ /* try a bad directory */
@ -103,7 +103,7 @@ static void test_RunSetupCommand(void)
hr = pRunSetupCommand(NULL, "winver.exe", "Install", "non\\existent\\directory", "Title", &hexe, 0, NULL); hr = pRunSetupCommand(NULL, "winver.exe", "Install", "non\\existent\\directory", "Title", &hexe, 0, NULL);
ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY),
"Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %d\n", hr); "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %d\n", hr);
ok(hexe == NULL, "Expcted hexe to be NULL\n"); ok(hexe == NULL, "Expected hexe to be NULL\n");
ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n");
/* try to run an exe with the RSC_FLAG_INF flag */ /* try to run an exe with the RSC_FLAG_INF flag */

View file

@ -1423,7 +1423,7 @@ static void test_TVS_SINGLEEXPAND(void)
hTree = create_treeview_control(0); hTree = create_treeview_control(0);
SetWindowLongA(hTree, GWL_STYLE, GetWindowLong(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); SetWindowLongA(hTree, GWL_STYLE, GetWindowLong(hTree, GWL_STYLE) | TVS_SINGLEEXPAND);
/* to avoid paiting related notifications */ /* to avoid painting related notifications */
ShowWindow(hTree, SW_HIDE); ShowWindow(hTree, SW_HIDE);
fill_tree(hTree); fill_tree(hTree);

View file

@ -1341,7 +1341,7 @@ static void test_scene(void)
goto cleanup; goto cleanup;
} }
/* Test an EndScene without beginscene. Should return an error */ /* Test an EndScene without BeginScene. Should return an error */
hr = IDirect3DDevice8_EndScene(pDevice); hr = IDirect3DDevice8_EndScene(pDevice);
ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_EndScene returned %#08x\n", hr); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_EndScene returned %#08x\n", hr);

View file

@ -300,7 +300,7 @@ static void test_swapchain(void)
/* Get the implicit swapchain */ /* Get the implicit swapchain */
hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &swapchain0); hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &swapchain0);
ok(SUCCEEDED(hr), "Failed to get the impicit swapchain (%08x)\n", hr); ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x)\n", hr);
if(swapchain0) IDirect3DSwapChain9_Release(swapchain0); if(swapchain0) IDirect3DSwapChain9_Release(swapchain0);
/* Check if there is a back buffer */ /* Check if there is a back buffer */
@ -1409,7 +1409,7 @@ static void test_scene(void)
ok(hr == D3D_OK, "IDirect3DDevice9_GetCaps failed with %08x\n", hr); ok(hr == D3D_OK, "IDirect3DDevice9_GetCaps failed with %08x\n", hr);
if(FAILED(hr)) goto cleanup; if(FAILED(hr)) goto cleanup;
/* Test an EndScene without beginscene. Should return an error */ /* Test an EndScene without BeginScene. Should return an error */
hr = IDirect3DDevice9_EndScene(pDevice); hr = IDirect3DDevice9_EndScene(pDevice);
ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_EndScene returned %08x\n", hr); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_EndScene returned %08x\n", hr);

View file

@ -98,12 +98,12 @@ static void MeshBuilderTest(void)
info.lpMemory = data_bad_version; info.lpMemory = data_bad_version;
info.dSize = strlen(data_bad_version); info.dSize = strlen(data_bad_version);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
ok(hr == D3DRMERR_BADFILE, "Sould have returned D3DRMERR_BADFILE (hr = %x)\n", hr); ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr);
info.lpMemory = data_no_mesh; info.lpMemory = data_no_mesh;
info.dSize = strlen(data_no_mesh); info.dSize = strlen(data_no_mesh);
hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL);
ok(hr == D3DRMERR_NOTFOUND, "Sould have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr);
info.lpMemory = data_ok; info.lpMemory = data_ok;
info.dSize = strlen(data_ok); info.dSize = strlen(data_ok);

View file

@ -687,7 +687,7 @@ static void SceneTest(void)
{ {
HRESULT hr; HRESULT hr;
/* Test an EndScene without beginscene. Should return an error */ /* Test an EndScene without BeginScene. Should return an error */
hr = IDirect3DDevice7_EndScene(lpD3DDevice); hr = IDirect3DDevice7_EndScene(lpD3DDevice);
ok(hr == D3DERR_SCENE_NOT_IN_SCENE, "IDirect3DDevice7_EndScene returned %08x\n", hr); ok(hr == D3DERR_SCENE_NOT_IN_SCENE, "IDirect3DDevice7_EndScene returned %08x\n", hr);

View file

@ -99,7 +99,7 @@ static LPCSTR Guid2str(const GUID *guid)
return "DPSPGUID_SERIAL"; return "DPSPGUID_SERIAL";
if (IsEqualGUID(guid, &DPSPGUID_MODEM)) if (IsEqualGUID(guid, &DPSPGUID_MODEM))
return "DPSPGUID_MODEM"; return "DPSPGUID_MODEM";
/* DirectPlay Address ID's */ /* DirectPlay Address IDs */
if (IsEqualGUID(guid, &DPAID_TotalSize)) if (IsEqualGUID(guid, &DPAID_TotalSize))
return "DPAID_TotalSize"; return "DPAID_TotalSize";
if (IsEqualGUID(guid, &DPAID_ServiceProvider)) if (IsEqualGUID(guid, &DPAID_ServiceProvider))
@ -1730,7 +1730,7 @@ static void test_SessionDesc(void)
hr = IDirectPlayX_SetSessionDesc( pDP[1], &dpsd, 0 ); hr = IDirectPlayX_SetSessionDesc( pDP[1], &dpsd, 0 );
checkHR( DPERR_ACCESSDENIED, hr ); checkHR( DPERR_ACCESSDENIED, hr );
/* Trying to change inmutable properties */ /* Trying to change immutable properties */
/* Flags */ /* Flags */
hr = IDirectPlayX_SetSessionDesc( pDP[0], &dpsd, 0 ); hr = IDirectPlayX_SetSessionDesc( pDP[0], &dpsd, 0 );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );
@ -5001,7 +5001,7 @@ static void test_Send(void)
(LPVOID) message, messageSize ); (LPVOID) message, messageSize );
checkHR( DPERR_INVALIDPARAMS, hr ); checkHR( DPERR_INVALIDPARAMS, hr );
/* - Corerct flags, secure session incorrectly opened (without flags) */ /* - Correct flags, secure session incorrectly opened (without flags) */
hr = IDirectPlayX_Close( pDP[0] ); hr = IDirectPlayX_Close( pDP[0] );
checkHR( DP_OK, hr ); checkHR( DP_OK, hr );

View file

@ -62,7 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound3d);
* Auxiliary functions * Auxiliary functions
*/ */
/* scalar product (i believe it's called dot product in english) */ /* scalar product (I believe it's called dot product in English) */
static inline D3DVALUE ScalarProduct (const D3DVECTOR *a, const D3DVECTOR *b) static inline D3DVALUE ScalarProduct (const D3DVECTOR *a, const D3DVECTOR *b)
{ {
D3DVALUE c; D3DVALUE c;
@ -72,7 +72,7 @@ static inline D3DVALUE ScalarProduct (const D3DVECTOR *a, const D3DVECTOR *b)
return c; return c;
} }
/* vector product (i believe it's called cross product in english */ /* vector product (I believe it's called cross product in English */
static inline D3DVECTOR VectorProduct (const D3DVECTOR *a, const D3DVECTOR *b) static inline D3DVECTOR VectorProduct (const D3DVECTOR *a, const D3DVECTOR *b)
{ {
D3DVECTOR c; D3DVECTOR c;

View file

@ -50,8 +50,8 @@ static LONG WINAPI (*_RegGetValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPD
* available on older operating systems. * available on older operating systems.
* *
* Returns: * Returns:
* TRUE procedures were loaded successfunnly * TRUE procedures were loaded successfully
* FALSE procedures were not loaded successfunnly * FALSE procedures were not loaded successfully
*/ */
static BOOL _loadDynamicRoutines(void) static BOOL _loadDynamicRoutines(void)
{ {

View file

@ -113,7 +113,7 @@ static HRESULT _unregisterGame(void) {
} }
/******************************************************************************* /*******************************************************************************
* _buildStatisticsFilePath * _buildStatisticsFilePath
* Creates path to file contaning statistics of game with given id. * Creates path to file containing statistics of game with given id.
* *
* Parameters: * Parameters:
* guidApplicationId [I] application id of game * guidApplicationId [I] application id of game
@ -340,7 +340,7 @@ static void test_gamestatisticsmgr( void )
hr = IGameStatistics_Release(gs); hr = IGameStatistics_Release(gs);
ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr); ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr);
/* try to read written statisticd */ /* try to read written statistics */
hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs);
ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%08x\n", hr); ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%08x\n", hr);
ok(dwOpenResult == GAMESTATS_OPEN_OPENED, "GetGameStatistics returned invalid open result: 0x%x\n", dwOpenResult); ok(dwOpenResult == GAMESTATS_OPEN_OPENED, "GetGameStatistics returned invalid open result: 0x%x\n", dwOpenResult);

View file

@ -595,7 +595,7 @@ static void test_dibsections(void)
ok(ret, "GetDIBits doesn't work with a BITMAPCOREHEADER\n"); ok(ret, "GetDIBits doesn't work with a BITMAPCOREHEADER\n");
ok((pbci->bmciHeader.bcWidth == 16) && (pbci->bmciHeader.bcHeight == 16) ok((pbci->bmciHeader.bcWidth == 16) && (pbci->bmciHeader.bcHeight == 16)
&& (pbci->bmciHeader.bcBitCount == 1) && (pbci->bmciHeader.bcPlanes == 1), && (pbci->bmciHeader.bcBitCount == 1) && (pbci->bmciHeader.bcPlanes == 1),
"GetDIBits did't fill in the BITMAPCOREHEADER structure properly\n"); "GetDIBits didn't fill in the BITMAPCOREHEADER structure properly\n");
ret = GetDIBits(hdc, hdib, 0, 16, &coreBits, (BITMAPINFO*) pbci, DIB_RGB_COLORS); ret = GetDIBits(hdc, hdib, 0, 16, &coreBits, (BITMAPINFO*) pbci, DIB_RGB_COLORS);
ok(ret, "GetDIBits doesn't work with a BITMAPCOREHEADER\n"); ok(ret, "GetDIBits doesn't work with a BITMAPCOREHEADER\n");

View file

@ -2314,7 +2314,7 @@ typedef struct
USHORT usFirstCharIndex; USHORT usFirstCharIndex;
USHORT usLastCharIndex; USHORT usLastCharIndex;
/* According to the Apple spec, original version didn't have the below fields, /* According to the Apple spec, original version didn't have the below fields,
* version numbers were taked from the OpenType spec. * version numbers were taken from the OpenType spec.
*/ */
/* version 0 (TrueType 1.5) */ /* version 0 (TrueType 1.5) */
USHORT sTypoAscender; USHORT sTypoAscender;

View file

@ -91,7 +91,7 @@ static void test_widenpath(void)
ret = WidenPath(hdc); ret = WidenPath(hdc);
ok(ret == TRUE, "WidenPath failed: %d\n", GetLastError()); ok(ret == TRUE, "WidenPath failed: %d\n", GetLastError());
nSize = GetPath(hdc, NULL, NULL, 0); nSize = GetPath(hdc, NULL, NULL, 0);
ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize); ok(nSize > 6, "WidenPath should compute a widened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize);
ReleaseDC(0, hdc); ReleaseDC(0, hdc);
return; return;

View file

@ -721,7 +721,7 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const
if(V_VARIANTREF(headers)) { if(V_VARIANTREF(headers)) {
ok(V_VT(V_VARIANTREF(headers)) == VT_BSTR, "V_VT(V_VARIANTREF(headers))=%d, expected VT_BSTR\n", ok(V_VT(V_VARIANTREF(headers)) == VT_BSTR, "V_VT(V_VARIANTREF(headers))=%d, expected VT_BSTR\n",
V_VT(V_VARIANTREF(headers))); V_VT(V_VARIANTREF(headers)));
ok(V_BSTR(V_VARIANTREF(headers)) == NULL, "V_BSTR(V_VARIANTREF(heders)) = %p, expected NULL\n", ok(V_BSTR(V_VARIANTREF(headers)) == NULL, "V_BSTR(V_VARIANTREF(headers)) = %p, expected NULL\n",
V_BSTR(V_VARIANTREF(headers))); V_BSTR(V_VARIANTREF(headers)));
} }
@ -729,7 +729,7 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const
V_VT(cancel)); V_VT(cancel));
ok(V_BOOLREF(cancel) != NULL, "V_BOOLREF(pDispParams->rgvarg[0] == NULL)\n"); ok(V_BOOLREF(cancel) != NULL, "V_BOOLREF(pDispParams->rgvarg[0] == NULL)\n");
if(V_BOOLREF(cancel)) if(V_BOOLREF(cancel))
ok(*V_BOOLREF(cancel) == VARIANT_FALSE, "*V_BOOLREF(calcel) = %x, expected VARIANT_FALSE\n", ok(*V_BOOLREF(cancel) == VARIANT_FALSE, "*V_BOOLREF(cancel) = %x, expected VARIANT_FALSE\n",
*V_BOOLREF(cancel)); *V_BOOLREF(cancel));
} }
@ -2258,9 +2258,9 @@ static void test_GetControlInfo(IUnknown *unk)
return; return;
hres = IOleControl_GetControlInfo(control, &info); hres = IOleControl_GetControlInfo(control, &info);
ok(hres == E_NOTIMPL, "GetControlInfo failed: %08x, exxpected E_NOTIMPL\n", hres); ok(hres == E_NOTIMPL, "GetControlInfo failed: %08x, expected E_NOTIMPL\n", hres);
hres = IOleControl_GetControlInfo(control, NULL); hres = IOleControl_GetControlInfo(control, NULL);
ok(hres == E_NOTIMPL, "GetControlInfo failed: %08x, exxpected E_NOTIMPL\n", hres); ok(hres == E_NOTIMPL, "GetControlInfo failed: %08x, expected E_NOTIMPL\n", hres);
IOleControl_Release(control); IOleControl_Release(control);
} }

View file

@ -773,7 +773,7 @@ static IDispatchEx *parse_procedure_a(IActiveScriptParse *parser, const char *sr
HRESULT hres; HRESULT hres;
hres = IUnknown_QueryInterface(parser, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); hres = IUnknown_QueryInterface(parser, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc);
ok(hres == S_OK, "Coult not get IActiveScriptParseProcedure2: %08x\n", hres); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2: %08x\n", hres);
str = a2bstr(src); str = a2bstr(src);
hres = IActiveScriptParseProcedure2_64_ParseProcedureText(parse_proc, str, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, &disp); hres = IActiveScriptParseProcedure2_64_ParseProcedureText(parse_proc, str, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, &disp);
@ -1073,7 +1073,7 @@ static BOOL register_activex(void)
hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&activex_cf, hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&activex_cf,
CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid);
ok(hres == S_OK, "Could not register screipt engine: %08x\n", hres); ok(hres == S_OK, "Could not register script engine: %08x\n", hres);
return TRUE; return TRUE;
} }

View file

@ -807,7 +807,7 @@ static void test_waittxempty(HANDLE hcom)
trace("WaitCommEvent for EV_TXEMPTY took %d ms\n", timediff); trace("WaitCommEvent for EV_TXEMPTY took %d ms\n", timediff);
/* 050604: This shows a difference between XP (tested with mingw compiled crosstest): /* 050604: This shows a difference between XP (tested with mingw compiled crosstest):
XP returns Writefile only after everything went out of the Serial port, XP returns Writefile only after everything went out of the Serial port,
while wine returns immedate. while wine returns immediately.
Thus on XP, WaintCommEvent after setting the CommMask for EV_TXEMPTY Thus on XP, WaintCommEvent after setting the CommMask for EV_TXEMPTY
nearly return immediate, nearly return immediate,
while on wine the most time is spent here while on wine the most time is spent here
@ -1341,7 +1341,7 @@ static void test_AbortWaitCts(HANDLE hcom)
trace("Success 0x%08x err %d evtmask 0x%08x diff1 %d, diff2 %d\n", trace("Success 0x%08x err %d evtmask 0x%08x diff1 %d, diff2 %d\n",
success, err, evtmask, after-before, after1-before); success, err, evtmask, after-before, after1-before);
ok(evtmask == 0, "Incorect EventMask 0x%08x returned on Wait aborted bu SetCommMask, expected 0x%08x\n", ok(evtmask == 0, "Incorrect EventMask 0x%08x returned on Wait aborted bu SetCommMask, expected 0x%08x\n",
evtmask, 0); evtmask, 0);
ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n");
diff = after1 - before; diff = after1 - before;

View file

@ -1360,7 +1360,7 @@ static void test_message_from_hmodule(void)
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);
ok(ret == 0, "FormatMessageA returned non-zero\n"); ok(ret == 0, "FormatMessageA returned non-zero\n");
/*Test nonexistent messageID with varying language ID's Note: FormatMessageW behaves the same*/ /*Test nonexistent messageID with varying language IDs Note: FormatMessageW behaves the same*/
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044,
MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL);

View file

@ -832,7 +832,7 @@ static void test_CommandLine(void)
startup.dwFlags = STARTF_USESHOWWINDOW; startup.dwFlags = STARTF_USESHOWWINDOW;
startup.wShowWindow = SW_SHOWNORMAL; startup.wShowWindow = SW_SHOWNORMAL;
/* from Frangois */ /* from François */
get_file_name(resfile); get_file_name(resfile);
sprintf(buffer, "\"%s\" tests/process.c \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile); sprintf(buffer, "\"%s\" tests/process.c \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile);
ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n");
@ -1677,7 +1677,7 @@ static void test_ProcessNameA(void)
/* this is a difference between the ascii and the unicode version /* this is a difference between the ascii and the unicode version
* the unicode version crashes when the size is big enough to hold the result * the unicode version crashes when the size is big enough to hold the result
* ascii version throughs an error * ascii version through an error
*/ */
size = 1024; size = 1024;
expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size));

View file

@ -690,11 +690,11 @@ static void test_PpropFindProp(void)
pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]);
ok(pRet == &pvProp, ok(pRet == &pvProp,
"PpropFindProp[%d]: Didn't find existing propery\n", "PpropFindProp[%d]: Didn't find existing property\n",
ptTypes[i]); ptTypes[i]);
pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]);
ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent propery\n", ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent property\n",
ptTypes[i]); ptTypes[i]);
} }
@ -929,20 +929,20 @@ static void test_LpValFindProp(void)
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp);
ok(pRet == &pvProp, ok(pRet == &pvProp,
"LpValFindProp[%d]: Didn't find existing propery id/type\n", "LpValFindProp[%d]: Didn't find existing property id/type\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp);
ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id\n", ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp);
ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id/type\n", ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id/type\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp);
ok(pRet == &pvProp, ok(pRet == &pvProp,
"LpValFindProp[%d]: Didn't find existing propery id\n", "LpValFindProp[%d]: Didn't find existing property id\n",
ptTypes[i]); ptTypes[i]);
} }
} }

View file

@ -147,7 +147,7 @@ static void test_UFromSz(void)
ok(pUFromSz("105679") == 105679u, ok(pUFromSz("105679") == 105679u,
"UFromSz: expected 105679, got %d\n", pUFromSz("105679")); "UFromSz: expected 105679, got %d\n", pUFromSz("105679"));
ok(pUFromSz(" 4") == 0, "UFromSz: exected 0. got %d\n", ok(pUFromSz(" 4") == 0, "UFromSz: expected 0. got %d\n",
pUFromSz(" 4")); pUFromSz(" 4"));
} }
@ -162,7 +162,7 @@ static void test_UlFromSzHex(void)
ok(pUlFromSzHex("fF") == 0xffu, ok(pUlFromSzHex("fF") == 0xffu,
"UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF")); "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF"));
ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%x\n", ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: expected 0x0. got 0x%x\n",
pUlFromSzHex(" c")); pUlFromSzHex(" c"));
} }

View file

@ -1223,7 +1223,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2)
} }
/* SUBLANG_NEUTRAL only allowed for english, arabic, chinese */ /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */
ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_GERMAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc); ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_GERMAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc);
ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret);

View file

@ -30,7 +30,7 @@
DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
/* Some of the QueryInterface tests are really just to check if I got the IID's right :) */ /* Some of the QueryInterface tests are really just to check if I got the IIDs right :) */
/* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ /* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */
static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col)

View file

@ -138,7 +138,7 @@ static void test_versioninfo(void)
hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size);
ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr);
ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0));
/* With NULL-pointer for bufferlength, the buffer itsself still gets filled with correct string */ /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */
memset(version, 0, sizeof(version)); memset(version, 0, sizeof(version));
hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL);
ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr);

View file

@ -558,7 +558,7 @@ ITfContext *pic)
ITfContext *test; ITfContext *test;
hr = ITfContext_GetDocumentMgr(pic,&docmgr); hr = ITfContext_GetDocumentMgr(pic,&docmgr);
ok(SUCCEEDED(hr),"GetDocumenMgr failed\n"); ok(SUCCEEDED(hr),"GetDocumentMgr failed\n");
test = (ITfContext*)0xdeadbeef; test = (ITfContext*)0xdeadbeef;
ITfDocumentMgr_Release(docmgr); ITfDocumentMgr_Release(docmgr);
hr = ITfDocumentMgr_GetTop(docmgr,&test); hr = ITfDocumentMgr_GetTop(docmgr,&test);
@ -579,7 +579,7 @@ ITfContext *pic)
ITfContext *test; ITfContext *test;
hr = ITfContext_GetDocumentMgr(pic,&docmgr); hr = ITfContext_GetDocumentMgr(pic,&docmgr);
ok(SUCCEEDED(hr),"GetDocumenMgr failed\n"); ok(SUCCEEDED(hr),"GetDocumentMgr failed\n");
ITfDocumentMgr_Release(docmgr); ITfDocumentMgr_Release(docmgr);
test = (ITfContext*)0xdeadbeef; test = (ITfContext*)0xdeadbeef;
hr = ITfDocumentMgr_GetTop(docmgr,&test); hr = ITfDocumentMgr_GetTop(docmgr,&test);
@ -1025,7 +1025,7 @@ static void test_ThreadMgrAdviseSinks(void)
ok(SUCCEEDED(hr),"Failed to Advise Sink\n"); ok(SUCCEEDED(hr),"Failed to Advise Sink\n");
ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n");
/* Advising the sink adds a ref, Relesing here lets the object be deleted /* Advising the sink adds a ref, Releasing here lets the object be deleted
when unadvised */ when unadvised */
tmSinkRefCount = 2; tmSinkRefCount = 2;
IUnknown_Release(sink); IUnknown_Release(sink);
@ -1866,7 +1866,7 @@ static void test_TStoApplicationText(void)
} }
hrSession = 0xfeedface; hrSession = 0xfeedface;
/* Test no premissions flags */ /* Test no permissions flags */
hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession); hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession);
ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr);
ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession);

View file

@ -1470,5 +1470,5 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr)
return; return;
} }
} }
FIXME("ITfDocumenMgr %p not found in this thread\n",mgr); FIXME("ITfDocumentMgr %p not found in this thread\n",mgr);
} }

View file

@ -502,7 +502,7 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p)
nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle, nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle,
(void**)&nselemstyle); (void**)&nselemstyle);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Coud not get nsIDOMCSSStyleDeclaration interface: %08x\n", nsres); ERR("Could not get nsIDOMCSSStyleDeclaration interface: %08x\n", nsres);
return E_FAIL; return E_FAIL;
} }

View file

@ -107,7 +107,7 @@ nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc)
nsres = nsIDOMAbstractView_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow); nsres = nsIDOMAbstractView_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow);
nsIDOMAbstractView_Release(nsview); nsIDOMAbstractView_Release(nsview);
if(NS_FAILED(nsres)) { if(NS_FAILED(nsres)) {
ERR("Coult not get nsIDOMWindow iface: %08x\n", nsres); ERR("Could not get nsIDOMWindow iface: %08x\n", nsres);
return NULL; return NULL;
} }

View file

@ -5720,7 +5720,7 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc)
HRESULT hres; HRESULT hres;
hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3);
ok(hres == S_OK, "Coult not get IHTMLDocument3 iface: %08x\n", hres); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres);
hres = IHTMLDocument3_createDocumentFragment(doc3, &frag); hres = IHTMLDocument3_createDocumentFragment(doc3, &frag);
IHTMLDocument3_Release(doc3); IHTMLDocument3_Release(doc3);

View file

@ -2086,9 +2086,9 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum
if(activeobj) { if(activeobj) {
IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd);
ok(hres == S_OK, "GetWindow failed: %08x\n", hres); ok(hres == S_OK, "GetWindow failed: %08x\n", hres);
ok(hwnd == NULL, "hwnd=%p, expeted NULL\n", hwnd); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd);
} }
if(call_UIActivate == CallUIActivate_ActivateMe) { if(call_UIActivate == CallUIActivate_ActivateMe) {
SET_EXPECT(CanInPlaceActivate); SET_EXPECT(CanInPlaceActivate);
SET_EXPECT(GetWindowContext); SET_EXPECT(GetWindowContext);

View file

@ -2622,7 +2622,7 @@ static BOOL register_script_engine(void)
hres = CoRegisterClassObject(&CLSID_TestScript, (IUnknown *)&script_cf, hres = CoRegisterClassObject(&CLSID_TestScript, (IUnknown *)&script_cf,
CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid);
ok(hres == S_OK, "Could not register screipt engine: %08x\n", hres); ok(hres == S_OK, "Could not register script engine: %08x\n", hres);
return TRUE; return TRUE;
} }

View file

@ -2420,7 +2420,7 @@ static void test_Installer_InstallProduct(void)
/* Avoid an interactive dialog in case of insufficient privileges. */ /* Avoid an interactive dialog in case of insufficient privileges. */
hr = Installer_UILevelPut(INSTALLUILEVEL_NONE); hr = Installer_UILevelPut(INSTALLUILEVEL_NONE);
ok(hr == S_OK, "Expected UILevel propery put invoke to return S_OK, got 0x%08x\n", hr); ok(hr == S_OK, "Expected UILevel property put invoke to return S_OK, got 0x%08x\n", hr);
/* Installer::InstallProduct */ /* Installer::InstallProduct */
hr = Installer_InstallProduct(szMsifile, NULL); hr = Installer_InstallProduct(szMsifile, NULL);

View file

@ -2519,16 +2519,16 @@ static void test_formatrecord_tables(void)
ok( r == ERROR_SUCCESS, "cannot create CustomAction table: %d\n", r); ok( r == ERROR_SUCCESS, "cannot create CustomAction table: %d\n", r);
r = add_custom_action_entry( hdb, "'MyCustom', 51, 'prop', '[!temporal_file]'" ); r = add_custom_action_entry( hdb, "'MyCustom', 51, 'prop', '[!temporal_file]'" );
ok( r == ERROR_SUCCESS, "cannt add custom action: %d\n", r); ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r);
r = add_custom_action_entry( hdb, "'EscapeIt1', 51, 'prop', '[\\[]Bracket Text[\\]]'" ); r = add_custom_action_entry( hdb, "'EscapeIt1', 51, 'prop', '[\\[]Bracket Text[\\]]'" );
ok( r == ERROR_SUCCESS, "cannt add custom action: %d\n", r); ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r);
r = add_custom_action_entry( hdb, "'EscapeIt2', 51, 'prop', '[\\xabcd]'" ); r = add_custom_action_entry( hdb, "'EscapeIt2', 51, 'prop', '[\\xabcd]'" );
ok( r == ERROR_SUCCESS, "cannt add custom action: %d\n", r); ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r);
r = add_custom_action_entry( hdb, "'EscapeIt3', 51, 'prop', '[abcd\\xefgh]'" ); r = add_custom_action_entry( hdb, "'EscapeIt3', 51, 'prop', '[abcd\\xefgh]'" );
ok( r == ERROR_SUCCESS, "cannt add custom action: %d\n", r); ok( r == ERROR_SUCCESS, "cannot add custom action: %d\n", r);
r = package_from_db( hdb, &hpkg ); r = package_from_db( hdb, &hpkg );
if (r == ERROR_INSTALL_PACKAGE_REJECTED) if (r == ERROR_INSTALL_PACKAGE_REJECTED)

View file

@ -1310,7 +1310,7 @@ static void test_get_osfhandle(void)
WriteFile(handle, "bar", 3, &bytes_written, NULL); WriteFile(handle, "bar", 3, &bytes_written, NULL);
_close(fd); _close(fd);
fd = _open(fname, _O_RDONLY, 0); fd = _open(fname, _O_RDONLY, 0);
ok(fd != -1, "Coudn't open '%s' after _get_osfhanle()\n", fname); ok(fd != -1, "Couldn't open '%s' after _get_osfhandle()\n", fname);
_close(fd); _close(fd);
_unlink(fname); _unlink(fname);

View file

@ -3058,17 +3058,17 @@ todo_wine
if (list) if (list)
{ {
r = IXMLDOMNodeList_get_item(list, 0, NULL); r = IXMLDOMNodeList_get_item(list, 0, NULL);
ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
r = IXMLDOMNodeList_get_length(list, NULL); r = IXMLDOMNodeList_get_length(list, NULL);
ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
r = IXMLDOMNodeList_get_length( list, &count ); r = IXMLDOMNodeList_get_length( list, &count );
ok( r == S_OK, "get_length returns %08x\n", r ); ok( r == S_OK, "get_length returns %08x\n", r );
ok( count == 4, "get_length got %d\n", count ); ok( count == 4, "get_length got %d\n", count );
r = IXMLDOMNodeList_nextNode(list, NULL); r = IXMLDOMNodeList_nextNode(list, NULL);
ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); ok(r == E_INVALIDARG, "Expected E_INVALIDARG got %08x\n", r);
r = IXMLDOMNodeList_nextNode( list, &node ); r = IXMLDOMNodeList_nextNode( list, &node );
ok( r == S_OK, "nextNode returned wrong code\n"); ok( r == S_OK, "nextNode returned wrong code\n");
@ -3091,7 +3091,7 @@ todo_wine
ok( V_BSTR(&var) == NULL, "variant value wasn't null\n"); ok( V_BSTR(&var) == NULL, "variant value wasn't null\n");
r = IXMLDOMNode_hasChildNodes( node, NULL ); r = IXMLDOMNode_hasChildNodes( node, NULL );
ok( r == E_INVALIDARG, "hasChildNoes bad return\n"); ok( r == E_INVALIDARG, "hasChildNodes bad return\n");
EXPECT_CHILDREN(node); EXPECT_CHILDREN(node);
@ -4691,7 +4691,7 @@ static void test_XMLHTTP(void)
hr = SafeArrayAccessData(V_ARRAY(&varbody), &ptr); hr = SafeArrayAccessData(V_ARRAY(&varbody), &ptr);
EXPECT_HR(hr, S_OK); EXPECT_HR(hr, S_OK);
ok(memcmp(ptr, xmltestbodyA, sizeof(xmltestbodyA)-1) == 0, "got wrond body data\n"); ok(memcmp(ptr, xmltestbodyA, sizeof(xmltestbodyA)-1) == 0, "got wrong body data\n");
SafeArrayUnaccessData(V_ARRAY(&varbody)); SafeArrayUnaccessData(V_ARRAY(&varbody));
VariantClear(&varbody); VariantClear(&varbody);
@ -6895,7 +6895,7 @@ static void test_save(void)
hr = IXMLDOMDocument_get_xml(doc2, &sNew); hr = IXMLDOMDocument_get_xml(doc2, &sNew);
EXPECT_HR(hr, S_OK); EXPECT_HR(hr, S_OK);
ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as origial\n"); ok( !lstrcmpW( sOrig, sNew ), "New document is not the same as original\n");
SysFreeString(sOrig); SysFreeString(sOrig);
SysFreeString(sNew); SysFreeString(sNew);

View file

@ -1050,7 +1050,7 @@ static void test_mxwriter_flush(void)
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
EXPECT_REF(stream, 1); EXPECT_REF(stream, 1);
/* detach whe nothing was attached */ /* detach when nothing was attached */
V_VT(&dest) = VT_EMPTY; V_VT(&dest) = VT_EMPTY;
hr = IMXWriter_put_output(writer, dest); hr = IMXWriter_put_output(writer, dest);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
@ -1145,7 +1145,7 @@ static void test_mxwriter_startenddocument(void)
/* now try another startDocument */ /* now try another startDocument */
hr = ISAXContentHandler_startDocument(content); hr = ISAXContentHandler_startDocument(content);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
/* and get duplcated prolog */ /* and get duplicated prolog */
V_VT(&dest) = VT_EMPTY; V_VT(&dest) = VT_EMPTY;
hr = IMXWriter_get_output(writer, &dest); hr = IMXWriter_get_output(writer, &dest);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);

View file

@ -110,7 +110,7 @@ static DWORD WINAPI RtlAtomTestThread(LPVOID Table)
Len = 64; Len = 64;
res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len); res = pRtlQueryAtomInAtomTable(AtomTable, Atom, &RefCount, &PinCount, Name, &Len);
ok(!res, "Failed with longenough buffer, retval: %x\n", res); ok(!res, "Failed with long enough buffer, retval: %x\n", res);
ok(RefCount == 1, "Refcount was not 1 but %x\n", RefCount); ok(RefCount == 1, "Refcount was not 1 but %x\n", RefCount);
ok(PinCount == 1, "Pincount was not 1 but %x\n", PinCount); ok(PinCount == 1, "Pincount was not 1 but %x\n", PinCount);
ok(!lstrcmpW(Name, testAtom2), "We found wrong atom!!\n"); ok(!lstrcmpW(Name, testAtom2), "We found wrong atom!!\n");

View file

@ -717,7 +717,7 @@ static void test_exceptions(void)
ctx.Dr7 = 3; ctx.Dr7 = 3;
ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS;
res = pNtSetContextThread( GetCurrentThread(), &ctx); res = pNtSetContextThread( GetCurrentThread(), &ctx);
ok( res == STATUS_SUCCESS, "NtSetContextThread faild with %x\n", res); ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res);
got_exception = 0; got_exception = 0;
run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0); run_exception_test(bpx_handler, NULL, dummy_code, sizeof(dummy_code), 0);
@ -796,7 +796,7 @@ static void test_debugger(void)
if (counter > 100) if (counter > 100)
{ {
ok(FALSE, "got way too many exceptions, probaby caught in a infinite loop, terminating child\n"); ok(FALSE, "got way too many exceptions, probably caught in a infinite loop, terminating child\n");
pNtTerminateProcess(pi.hProcess, 1); pNtTerminateProcess(pi.hProcess, 1);
} }
else if (counter >= 2) /* skip startup breakpoint */ else if (counter >= 2) /* skip startup breakpoint */

View file

@ -326,7 +326,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t
/* the string would have (which can be larger than the MaximumLength). */ /* the string would have (which can be larger than the MaximumLength). */
/* To allow all this in the tests we do the following: */ /* To allow all this in the tests we do the following: */
if (expected_unicode_string.Length >= 64) { if (expected_unicode_string.Length >= 64) {
/* The value is too large to convert only triggerd when testing native */ /* The value is too large to convert only triggered when testing native */
/* Length is not filled with the expected string length (garbage?) */ /* Length is not filled with the expected string length (garbage?) */
expected_unicode_string.Length = unicode_string.Length; expected_unicode_string.Length = unicode_string.Length;
} /* if */ } /* if */

View file

@ -230,7 +230,7 @@ static void CALLBACK userapc(ULONG_PTR dwParam)
userapc_called = TRUE; userapc_called = TRUE;
} }
static BOOL open_succeded; static BOOL open_succeeded;
static DWORD WINAPI thread(PVOID main_thread) static DWORD WINAPI thread(PVOID main_thread)
{ {
HANDLE h; HANDLE h;
@ -248,11 +248,11 @@ static DWORD WINAPI thread(PVOID main_thread)
h = CreateFileW(testpipe, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0); h = CreateFileW(testpipe, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
if (h != INVALID_HANDLE_VALUE) { if (h != INVALID_HANDLE_VALUE) {
open_succeded = TRUE; open_succeeded = TRUE;
Sleep(100); Sleep(100);
CloseHandle(h); CloseHandle(h);
} else } else
open_succeded = FALSE; open_succeeded = FALSE;
return 0; return 0;
} }
@ -303,7 +303,7 @@ static void test_alertable(void)
SleepEx(0, TRUE); /* get rid of the userapc, if NtFsControlFile failed */ SleepEx(0, TRUE); /* get rid of the userapc, if NtFsControlFile failed */
ok(open_succeded, "couldn't open client side pipe\n"); ok(open_succeeded, "couldn't open client side pipe\n");
CloseHandle(hThread); CloseHandle(hThread);
DisconnectNamedPipe(hPipe); DisconnectNamedPipe(hPipe);
@ -315,7 +315,7 @@ static void test_alertable(void)
res = listen_pipe(hPipe, hEvent, &iosb, TRUE); res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
todo_wine ok(!res, "NtFsControlFile returned %x\n", res); todo_wine ok(!res, "NtFsControlFile returned %x\n", res);
ok(open_succeded, "couldn't open client side pipe\n"); ok(open_succeeded, "couldn't open client side pipe\n");
ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status);
todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
@ -350,7 +350,7 @@ static void test_nonalertable(void)
res = listen_pipe(hPipe, hEvent, &iosb, TRUE); res = listen_pipe(hPipe, hEvent, &iosb, TRUE);
todo_wine ok(!res, "NtFsControlFile returned %x\n", res); todo_wine ok(!res, "NtFsControlFile returned %x\n", res);
ok(open_succeded, "couldn't open client side pipe\n"); ok(open_succeeded, "couldn't open client side pipe\n");
todo_wine ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status); todo_wine ok(!U(iosb).Status, "Wrong iostatus %x\n", U(iosb).Status);
todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); todo_wine ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");

View file

@ -749,7 +749,7 @@ static const ustr2astr_t ustr2astr[] = {
{ 8, 7, 12, "------------", 12, 12, 12, "abcdef", FALSE, 6, 7, 7, "abcdef", STATUS_SUCCESS}, { 8, 7, 12, "------------", 12, 12, 12, "abcdef", FALSE, 6, 7, 7, "abcdef", STATUS_SUCCESS},
{ 8, 7, 12, "------------", 0, 12, 12, NULL, FALSE, 0, 7, 0, "", STATUS_SUCCESS}, { 8, 7, 12, "------------", 0, 12, 12, NULL, FALSE, 0, 7, 0, "", STATUS_SUCCESS},
#if 0 #if 0
/* crashes on japanese and chinese XP */ /* crashes on Japanese and Chinese XP */
{ 0, 0, 12, NULL, 10, 10, 12, NULL, FALSE, 5, 0, 0, NULL, STATUS_BUFFER_OVERFLOW}, { 0, 0, 12, NULL, 10, 10, 12, NULL, FALSE, 5, 0, 0, NULL, STATUS_BUFFER_OVERFLOW},
#endif #endif
}; };
@ -1613,7 +1613,7 @@ static void one_RtlIntegerToUnicodeString_test(int test_num, const int2str_t *in
/* the string would have (which can be larger than the MaximumLength). */ /* the string would have (which can be larger than the MaximumLength). */
/* To allow all this in the tests we do the following: */ /* To allow all this in the tests we do the following: */
if (expected_unicode_string.Length > 32 && unicode_string.Length == 0) { if (expected_unicode_string.Length > 32 && unicode_string.Length == 0) {
/* The value is too large to convert only triggerd when testing native */ /* The value is too large to convert only triggered when testing native */
expected_unicode_string.Length = 0; expected_unicode_string.Length = 0;
} }
} else { } else {
@ -1754,7 +1754,7 @@ static void test_RtlIsTextUnicode(void)
/* build byte reversed unicode string with no control chars */ /* build byte reversed unicode string with no control chars */
be_unicode_no_controls = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); be_unicode_no_controls = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR));
ok(be_unicode_no_controls != NULL, "Expeced HeapAlloc to succeed.\n"); ok(be_unicode_no_controls != NULL, "Expected HeapAlloc to succeed.\n");
be_unicode_no_controls[0] = 0xfffe; be_unicode_no_controls[0] = 0xfffe;
for (i = 0; i < sizeof(unicode_no_controls)/sizeof(unicode_no_controls[0]); i++) for (i = 0; i < sizeof(unicode_no_controls)/sizeof(unicode_no_controls[0]); i++)
be_unicode_no_controls[i + 1] = (unicode_no_controls[i] >> 8) | ((unicode_no_controls[i] & 0xff) << 8); be_unicode_no_controls[i + 1] = (unicode_no_controls[i] >> 8) | ((unicode_no_controls[i] & 0xff) << 8);

View file

@ -875,7 +875,7 @@ static void test_storage_refcount(void)
STATSTG statstg; STATSTG statstg;
r = IStorage_Stat( stg, &statstg, STATFLAG_NONAME ); r = IStorage_Stat( stg, &statstg, STATFLAG_NONAME );
ok(r == S_OK, "Stat should have succeded instead of returning 0x%08x\n", r); ok(r == S_OK, "Stat should have succeeded instead of returning 0x%08x\n", r);
ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %d\n", statstg.type); ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %d\n", statstg.type);
ok(U(statstg.cbSize).LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %d\n", U(statstg.cbSize).LowPart); ok(U(statstg.cbSize).LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %d\n", U(statstg.cbSize).LowPart);
ok(U(statstg.cbSize).HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %d\n", U(statstg.cbSize).HighPart); ok(U(statstg.cbSize).HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %d\n", U(statstg.cbSize).HighPart);
@ -890,7 +890,7 @@ static void test_storage_refcount(void)
ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08x\n", r); ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08x\n", r);
r = IStorage_Stat( stg2, &statstg, STATFLAG_DEFAULT ); r = IStorage_Stat( stg2, &statstg, STATFLAG_DEFAULT );
ok(r == S_OK, "Stat should have succeded instead of returning 0x%08x\n", r); ok(r == S_OK, "Stat should have succeeded instead of returning 0x%08x\n", r);
ok(!memcmp(statstg.pwcsName, stgname, sizeof(stgname)), ok(!memcmp(statstg.pwcsName, stgname, sizeof(stgname)),
"Statstg pwcsName should have been the name the storage was created with\n"); "Statstg pwcsName should have been the name the storage was created with\n");
ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %d\n", statstg.type); ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %d\n", statstg.type);
@ -1555,7 +1555,7 @@ static void test_parent_free(void)
if (r == S_OK) if (r == S_OK)
{ {
r = IStream_Write(stm, "this should fail\n", 17, NULL); r = IStream_Write(stm, "this should fail\n", 17, NULL);
ok(r==STG_E_REVERTED, "IStream->Write sould fail, hr=%x\n", r); ok(r==STG_E_REVERTED, "IStream->Write should fail, hr=%x\n", r);
IStream_Release(stm); IStream_Release(stm);

View file

@ -71,7 +71,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size,
DWORD rtnval; DWORD rtnval;
fd.cbSizeofstruct = sizeof(FONTDESC); fd.cbSizeofstruct = sizeof(FONTDESC);
fd.lpstrName = arial_font; /* using scaleable instead of bitmap font reduces errors due to font realization */ fd.lpstrName = arial_font; /* using scalable instead of bitmap font reduces errors due to font realization */
S(fd.cySize).Lo = lo_size; S(fd.cySize).Lo = lo_size;
S(fd.cySize).Hi = hi_size; S(fd.cySize).Hi = hi_size;
fd.sWeight = 0; fd.sWeight = 0;
@ -100,7 +100,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size,
ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n", ok(hres == S_OK,"%s: IFont_get_size returns 0x%08x instead of S_OK.\n",
test_name, hres); test_name, hres);
/* Check returned size - allow for errors due to rouding & font realization. */ /* Check returned size - allow for errors due to rounding & font realization. */
ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size, ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size,
"%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n", "%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n",
test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size); test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size);
@ -112,7 +112,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size,
rtnval = GetObject (hfont, sizeof(LOGFONT), &lf); rtnval = GetObject (hfont, sizeof(LOGFONT), &lf);
ok(rtnval > 0, "GetObject(hfont) failed\n"); ok(rtnval > 0, "GetObject(hfont) failed\n");
/* Since font scaling may encounter rouding errors, allow 1 pixel deviation. */ /* Since font scaling may encounter rounding errors, allow 1 pixel deviation. */
ok(abs(lf.lfHeight - hfont_height) <= 1, ok(abs(lf.lfHeight - hfont_height) <= 1,
"%s: hFont has lf.lfHeight=%d, expected %d.\n", "%s: hFont has lf.lfHeight=%d, expected %d.\n",
test_name, lf.lfHeight, hfont_height); test_name, lf.lfHeight, hfont_height);

View file

@ -333,7 +333,7 @@ static void test_safearray(void)
ok(hres == S_OK || hres == E_OUTOFMEMORY, ok(hres == S_OK || hres == E_OUTOFMEMORY,
"SAR to a 0 elements dimension failed with hres %x\n", hres); "SAR to a 0 elements dimension failed with hres %x\n", hres);
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD of 0 dim array faild with hres %x\n", hres); ok(hres == S_OK,"SAD of 0 dim array failed with hres %x\n", hres);
SafeArrayAllocDescriptor(2, &a); SafeArrayAllocDescriptor(2, &a);
a->rgsabound[0].cElements = 2; a->rgsabound[0].cElements = 2;
@ -370,7 +370,7 @@ static void test_safearray(void)
ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n");
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD faild with hres %x\n", hres); ok(hres == S_OK,"SAD failed with hres %x\n", hres);
bounds[0].cElements = 0; bounds[0].lLbound = 1; bounds[0].cElements = 0; bounds[0].lLbound = 1;
bounds[1].cElements = 2; bounds[1].lLbound = 23; bounds[1].cElements = 2; bounds[1].lLbound = 23;
@ -378,14 +378,14 @@ static void test_safearray(void)
ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n");
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD faild with hres %x\n", hres); ok(hres == S_OK,"SAD failed with hres %x\n", hres);
bounds[0].cElements = 1; bounds[0].lLbound = 1; bounds[0].cElements = 1; bounds[0].lLbound = 1;
bounds[1].cElements = 0; bounds[1].lLbound = 23; bounds[1].cElements = 0; bounds[1].lLbound = 23;
a = SafeArrayCreate(VT_I4,2,bounds); a = SafeArrayCreate(VT_I4,2,bounds);
ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n");
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD faild with hres %x\n", hres); ok(hres == S_OK,"SAD failed with hres %x\n", hres);
bounds[0].cElements = 42; bounds[0].lLbound = 1; bounds[0].cElements = 42; bounds[0].lLbound = 1;
bounds[1].cElements = 2; bounds[1].lLbound = 23; bounds[1].cElements = 2; bounds[1].lLbound = 23;
@ -470,7 +470,7 @@ static void test_safearray(void)
ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres); ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres);
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD faild with hres %x\n", hres); ok(hres == S_OK,"SAD failed with hres %x\n", hres);
for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) {
if ((i == VT_I8 || i == VT_UI8) && HAVE_OLEAUT32_I8) if ((i == VT_I8 || i == VT_UI8) && HAVE_OLEAUT32_I8)
@ -535,7 +535,7 @@ static void test_safearray(void)
} }
hres = SafeArrayDestroy(c); hres = SafeArrayDestroy(c);
ok(hres == S_OK,"SAD faild with hres %x\n", hres); ok(hres == S_OK,"SAD failed with hres %x\n", hres);
hres = SafeArrayDestroy(a); hres = SafeArrayDestroy(a);
ok(hres == S_OK,"SAD of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); ok(hres == S_OK,"SAD of array with vt %d failed with hres %x\n", vttypes[i].vt, hres);
@ -1453,7 +1453,7 @@ static void test_SafeArrayCreateEx(void)
/* VT_RECORD failure case */ /* VT_RECORD failure case */
sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, NULL); sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, NULL);
ok(sa == NULL, "CreateEx (NULL-Rec) succeded\n"); ok(sa == NULL, "CreateEx (NULL-Rec) succeeded\n");
iRec = IRecordInfoImpl_Construct(); iRec = IRecordInfoImpl_Construct();

View file

@ -255,7 +255,7 @@ static void test_VarFormat(void)
if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH) if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH)
{ {
skip("Skipping VarFormat tests for non english language\n"); skip("Skipping VarFormat tests for non English language\n");
return; return;
} }
GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char));

View file

@ -1621,7 +1621,7 @@ static void test_VarUdateFromDate(void)
/* Test handling of times on dates prior to the epoch */ /* Test handling of times on dates prior to the epoch */
DT2UD(-5.25,0,S_OK,25,12,1899,6,0,0,0,1,359); DT2UD(-5.25,0,S_OK,25,12,1899,6,0,0,0,1,359);
DT2UD(-5.9999884259259,0,S_OK,25,12,1899,23,59,59,0,1,359); DT2UD(-5.9999884259259,0,S_OK,25,12,1899,23,59,59,0,1,359);
/* This just demostrates the non-linear nature of values prior to the epoch */ /* This just demonstrates the non-linear nature of values prior to the epoch */
DT2UD(-4.0,0,S_OK,26,12,1899,0,0,0,0,2,360); DT2UD(-4.0,0,S_OK,26,12,1899,0,0,0,0,2,360);
/* Numerical oddity: for 0.0 < x < 1.0, x and -x represent the same datetime */ /* Numerical oddity: for 0.0 < x < 1.0, x and -x represent the same datetime */
DT2UD(-0.25,0,S_OK,30,12,1899,6,0,0,0,6,364); DT2UD(-0.25,0,S_OK,30,12,1899,6,0,0,0,6,364);
@ -1693,7 +1693,7 @@ static void test_VarDateFromUdate(void)
/* Test handling of times on dates prior to the epoch */ /* Test handling of times on dates prior to the epoch */
UD2T(25,12,1899,6,0,0,0,1,359,0,S_OK,-5.25); UD2T(25,12,1899,6,0,0,0,1,359,0,S_OK,-5.25);
UD2T(25,12,1899,23,59,59,0,1,359,0,S_OK,-5.9999884259259); UD2T(25,12,1899,23,59,59,0,1,359,0,S_OK,-5.9999884259259);
/* This just demostrates the non-linear nature of values prior to the epoch */ /* This just demonstrates the non-linear nature of values prior to the epoch */
UD2T(26,12,1899,0,0,0,0,2,360,0,S_OK,-4.0); UD2T(26,12,1899,0,0,0,0,2,360,0,S_OK,-4.0);
/* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */ /* for DATE values 0.0 < x < 1.0, x and -x represent the same datetime */
/* but when converting to DATE, prefer the positive versions */ /* but when converting to DATE, prefer the positive versions */

View file

@ -6064,7 +6064,7 @@ static void test_ChangeType_keep_dst(void)
V_INT(&v2) = 4; V_INT(&v2) = 4;
hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT);
ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres);
ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n");
SysFreeString(bstr); SysFreeString(bstr);
} }
@ -6072,7 +6072,7 @@ START_TEST(vartype)
{ {
hOleaut32 = GetModuleHandleA("oleaut32.dll"); hOleaut32 = GetModuleHandleA("oleaut32.dll");
trace("LCID's: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(), trace("LCIDs: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(),
GetUserDefaultLCID()); GetUserDefaultLCID());
test_VarI1FromI2(); test_VarI1FromI2();

View file

@ -226,7 +226,7 @@ static void test_Skip_walkList(void)
ok(hres == S_OK, "Skip failed: %08x\n", hres); ok(hres == S_OK, "Skip failed: %08x\n", hres);
if(hres != S_OK) if(hres != S_OK)
{ {
skip("Unable to propely Skip files\n"); skip("Unable to properly Skip files\n");
return; return;
} }
} }

View file

@ -247,7 +247,7 @@ static void test_Skip_walkList(void)
ok(hres == S_OK, "Skip failed: %08x\n", hres); ok(hres == S_OK, "Skip failed: %08x\n", hres);
if(hres != S_OK) if(hres != S_OK)
{ {
skip("Unable to propely Skip jobs\n"); skip("Unable to properly Skip jobs\n");
return; return;
} }
} }

View file

@ -162,7 +162,7 @@ static void test_GetProgress_PreTransfer(void)
(DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal); (DWORD)(progress.BytesTotal >> 32), (DWORD)progress.BytesTotal);
ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n", ok(progress.BytesTransferred == 0, "Got incorrect number of transferred bytes: %x%08x\n",
(DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred); (DWORD)(progress.BytesTransferred >> 32), (DWORD)progress.BytesTransferred);
ok(progress.Completed == FALSE, "Got incorret completion status\n"); ok(progress.Completed == FALSE, "Got incorrect completion status\n");
} }
typedef void (*test_t)(void); typedef void (*test_t)(void);

View file

@ -846,7 +846,7 @@ static void test_RpcBindingFree(void)
status = RpcBindingFree(&binding); status = RpcBindingFree(&binding);
ok(status == RPC_S_INVALID_BINDING, ok(status == RPC_S_INVALID_BINDING,
"RpcBindingFree should have retured RPC_S_INVALID_BINDING instead of %d\n", "RpcBindingFree should have returned RPC_S_INVALID_BINDING instead of %d\n",
status); status);
} }

View file

@ -133,7 +133,7 @@ static void test_URLSubRegQueryA(void)
"got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 2); "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len - 2);
} }
/* only space for the terminating 0: function still succeded */ /* only space for the terminating 0: function still succeeded */
memset(buffer, '#', sizeof(buffer)-1); memset(buffer, '#', sizeof(buffer)-1);
buffer[sizeof(buffer)-1] = '\0'; buffer[sizeof(buffer)-1] = '\0';
hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 1, -1); hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 1, -1);

View file

@ -32,7 +32,7 @@
#include "mshtml.h" #include "mshtml.h"
/********************************************************************** /**********************************************************************
* Some IID's for test_SetSite. * Some IIDs for test_SetSite.
*/ */
DEFINE_GUID(IID_IBrowserSettings, 0xDD1E21CC, 0xE2C7, 0x402C, 0xBF,0x05, 0x10,0x32,0x8D,0x3F,0x6B,0xAD); DEFINE_GUID(IID_IBrowserSettings, 0xDD1E21CC, 0xE2C7, 0x402C, 0xBF,0x05, 0x10,0x32,0x8D,0x3F,0x6B,0xAD);
DEFINE_GUID(IID_IShellBrowserService, 0xDFBC7E30, 0xF9E5, 0x455F, 0x88,0xF8, 0xFA,0x98,0xC1,0xE4,0x94,0xCA); DEFINE_GUID(IID_IShellBrowserService, 0xDFBC7E30, 0xF9E5, 0x455F, 0x88,0xF8, 0xFA,0x98,0xC1,0xE4,0x94,0xCA);

View file

@ -1,7 +1,7 @@
/* /*
* Unit test suite for shell32 functions * Unit test suite for shell32 functions
* *
* Copyright 2005 Francois Gougett for CodeWeavers * Copyright 2005 Francois Gouget for CodeWeavers
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public

View file

@ -1716,11 +1716,11 @@ static void test_copy(void)
{ {
ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n"); ok(DeleteFileA("threedir\\two.txt"), "Expected file to exist\n");
ok(!DeleteFileA("fourdir"), "Expected file to not exist\n"); ok(!DeleteFileA("fourdir"), "Expected file to not exist\n");
ok(!RemoveDirectoryA("fourdir"), "Expected dit to not exist\n"); ok(!RemoveDirectoryA("fourdir"), "Expected dir to not exist\n");
} }
ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n"); ok(RemoveDirectoryA("threedir"), "Expected dir to exist\n");
ok(!DeleteFileA("five"), "Expected file to not exist\n"); ok(!DeleteFileA("five"), "Expected file to not exist\n");
ok(!RemoveDirectoryA("five"), "Expected dit to not exist\n"); ok(!RemoveDirectoryA("five"), "Expected dir to not exist\n");
createTestFile("aa.txt"); createTestFile("aa.txt");
createTestFile("ab.txt"); createTestFile("ab.txt");

View file

@ -1778,7 +1778,7 @@ static void test_ITEMIDLIST_format(void) {
/* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably /* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably
* can't implement this correctly, since unix filesystems don't support * can't implement this correctly, since unix filesystems don't support
* this nasty short/long filename stuff. So we'll probably stay with our * this nasty short/long filename stuff. So we'll probably stay with our
* current habbit of storing the long filename here, which seems to work * current habit of storing the long filename here, which seems to work
* just fine. */ * just fine. */
todo_wine todo_wine
ok(pidlFile->mkid.abID[18] == '~' || ok(pidlFile->mkid.abID[18] == '~' ||

View file

@ -128,7 +128,7 @@ static void test_ClassIDs(void)
i++; i++;
} }
/* Test endianess */ /* Test endianness */
dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 256); dwLen = pSHLWAPI_23(&IID_Endianess, szBuff, 256);
ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianess\n", dwLen); ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for IID_Endianess\n", dwLen);

View file

@ -769,7 +769,7 @@ static void register_protocols(void)
hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL, hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL,
&IID_IClassFactory, (void**)&factory); &IID_IClassFactory, (void**)&factory);
ok(hres == S_OK, "Coud not get AboutProtocol factory: %08x\n", hres); ok(hres == S_OK, "Could not get AboutProtocol factory: %08x\n", hres);
if(FAILED(hres)) if(FAILED(hres))
return; return;

View file

@ -1135,7 +1135,7 @@ static void test_SetZoneAttributes(void)
/* The key for the zone must be present, when calling SetZoneAttributes */ /* The key for the zone must be present, when calling SetZoneAttributes */
myRegDeleteTreeA(HKEY_CURRENT_USER, regpath); myRegDeleteTreeA(HKEY_CURRENT_USER, regpath);
/* E_FAIL is returned from IE6 here, which is resonable. /* E_FAIL is returned from IE6 here, which is reasonable.
All newer IE return S_OK without saving the zone attributes to the registry. All newer IE return S_OK without saving the zone attributes to the registry.
This is a Windows bug, but we have to accept that as standard */ This is a Windows bug, but we have to accept that as standard */
hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA);

View file

@ -842,7 +842,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* Unreserved, percent encoded characters aren't decoded in the userinfo becuase the scheme /* Unreserved, percent encoded characters aren't decoded in the userinfo because the scheme
* isn't known. * isn't known.
*/ */
{ "zip://%2E:%52%53ord@winehq.org/", 0, S_OK, FALSE, { "zip://%2E:%52%53ord@winehq.org/", 0, S_OK, FALSE,
@ -1436,7 +1436,7 @@ static const uri_properties uri_tests[] = {
{URLZONE_INVALID,E_NOTIMPL,FALSE} {URLZONE_INVALID,E_NOTIMPL,FALSE}
} }
}, },
/* Hostname get's lower cased for known scheme types. */ /* Hostname gets lower-cased for known scheme types. */
{ "http://WWW.GOOGLE.com/", 0, S_OK, FALSE, { "http://WWW.GOOGLE.com/", 0, S_OK, FALSE,
{ {
{"http://www.google.com/",S_OK,FALSE}, {"http://www.google.com/",S_OK,FALSE},

View file

@ -2085,9 +2085,9 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva
ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId());
if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST)
ok(!fFullyAvailable, "fFulyAvailable = %x\n", fFullyAvailable); ok(!fFullyAvailable, "fFullyAvailable = %x\n", fFullyAvailable);
else else
ok(fFullyAvailable, "fFulyAvailable = %x\n", fFullyAvailable); ok(fFullyAvailable, "fFullyAvailable = %x\n", fFullyAvailable);
ok(pimkName != NULL, "pimkName == NULL\n"); ok(pimkName != NULL, "pimkName == NULL\n");
ok(pibc != NULL, "pibc == NULL\n"); ok(pibc != NULL, "pibc == NULL\n");
ok(grfMode == 0x12, "grfMode = %x\n", grfMode); ok(grfMode == 0x12, "grfMode = %x\n", grfMode);
@ -3606,7 +3606,7 @@ static void test_StdURLMoniker(void)
IUri *uri; IUri *uri;
hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container);
ok(hres == S_OK, "Coud not get IUriMoniker iface: %08x\n", hres); ok(hres == S_OK, "Could not get IUriMoniker iface: %08x\n", hres);
uri = (void*)0xdeadbeef; uri = (void*)0xdeadbeef;

View file

@ -81,7 +81,7 @@ static void test_ClipboardOwner(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = OpenClipboard(hWnd2); ret = OpenClipboard(hWnd2);
ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED), ok(!ret && (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED),
"OpenClipboard should fail without setting last error valuei, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError()); "OpenClipboard should fail without setting last error value, or with ERROR_ACCESS_DENIED, got error %d\n", GetLastError());
ret = CloseClipboard(); ret = CloseClipboard();
ok( ret, "CloseClipboard error %d\n", GetLastError()); ok( ret, "CloseClipboard error %d\n", GetLastError());

View file

@ -1802,7 +1802,7 @@ static void test_DrawIcon(void)
if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8)
{ {
skip("Windows will distort DrawIcon colors at 8-bpp and less due to palletizing.\n"); skip("Windows will distort DrawIcon colors at 8-bpp and less due to palettizing.\n");
goto cleanup; goto cleanup;
} }
@ -1886,7 +1886,7 @@ static void test_DrawIconEx(void)
if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8)
{ {
skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palletizing.\n"); skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palettizing.\n");
goto cleanup; goto cleanup;
} }
@ -2035,7 +2035,7 @@ static void test_DrawState(void)
if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8)
{ {
skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palletizing.\n"); skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palettizing.\n");
goto cleanup; goto cleanup;
} }

View file

@ -223,7 +223,7 @@ static void test_dc_visrgn(void)
SetRectEmpty( &rect ); SetRectEmpty( &rect );
GetClipBox( hdc, &rect ); GetClipBox( hdc, &rect );
ok( !(rect.left >= 10 && rect.top >= 10 && rect.right <= 20 && rect.bottom <= 20), ok( !(rect.left >= 10 && rect.top >= 10 && rect.right <= 20 && rect.bottom <= 20),
"clip box sould have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom );
ReleaseDC( hwnd_cache, hdc ); ReleaseDC( hwnd_cache, hdc );
/* window DC */ /* window DC */

View file

@ -1001,7 +1001,7 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam,
ok(data->fAckReq == 0, "Expected 0, got %d\n", data->fAckReq); ok(data->fAckReq == 0, "Expected 0, got %d\n", data->fAckReq);
ok(data->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", data->cfFormat); ok(data->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", data->cfFormat);
ok(!lstrcmpA((LPSTR)data->Value, "requested data\r\n"), ok(!lstrcmpA((LPSTR)data->Value, "requested data\r\n"),
"Expeted 'requested data\\r\\n', got %s\n", data->Value); "Expected 'requested data\\r\\n', got %s\n", data->Value);
GlobalUnlock((HGLOBAL)lo); GlobalUnlock((HGLOBAL)lo);
size = GlobalGetAtomNameA(hi, str, MAX_PATH); size = GlobalGetAtomNameA(hi, str, MAX_PATH);
@ -1761,7 +1761,7 @@ static void test_initialisation(void)
item = DdeCreateStringHandleA(client_pid, "request", CP_WINANSI); item = DdeCreateStringHandleA(client_pid, "request", CP_WINANSI);
/* There is no converstation so an invalild parameter results */ /* There is no conversation so an invalid parameter results */
res = 0xdeadbeef; res = 0xdeadbeef;
DdeGetLastError(client_pid); DdeGetLastError(client_pid);
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);

View file

@ -221,7 +221,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg,
} }
if( pdis->itemData > MOD_maxid) return TRUE; if( pdis->itemData > MOD_maxid) return TRUE;
/* store the rectangl */ /* store the rectangle */
MOD_rc[pdis->itemData] = pdis->rcItem; MOD_rc[pdis->itemData] = pdis->rcItem;
/* calculate average character width */ /* calculate average character width */
GetTextExtentPoint( pdis->hDC, chrs, 52, &sz ); GetTextExtentPoint( pdis->hDC, chrs, 52, &sz );
@ -3103,7 +3103,7 @@ static void test_menu_cancelmode(void)
{MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);} {MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);}
/* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP /* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP
* handler of the menu owner */ * handler of the menu owner */
/* test results is exctracted from variable g_got_enteridle. Possible values: /* test results is extracted from variable g_got_enteridle. Possible values:
* 0 : complete conformance. Sending WM_CANCELMODE cancels a menu initializing tracking * 0 : complete conformance. Sending WM_CANCELMODE cancels a menu initializing tracking
* 1 : Sending WM_CANCELMODE cancels a menu that is in tracking state * 1 : Sending WM_CANCELMODE cancels a menu that is in tracking state
* 2 : Sending WM_CANCELMODE does not work * 2 : Sending WM_CANCELMODE does not work

View file

@ -295,7 +295,7 @@ static const struct message WmSwitchChild[] = {
{ WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, /* in the 2nd MDI child */ { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, /* in the 2nd MDI child */
{ WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */
{ HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE },
/* Preparing for maximize and maximaze the 1st MDI child */ /* Preparing for maximize and maximize the 1st MDI child */
{ WM_GETMINMAXINFO, sent|defwinproc }, /* in the 1st MDI child */ { WM_GETMINMAXINFO, sent|defwinproc }, /* in the 1st MDI child */
{ WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_STATECHANGED }, /* in the 1st MDI child */ { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_STATECHANGED }, /* in the 1st MDI child */
{ WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */
@ -6729,7 +6729,7 @@ static void test_interthread_messages(void)
CloseHandle(wnd_event.start_event); CloseHandle(wnd_event.start_event);
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ok(!DestroyWindow(wnd_event.hwnd), "DestroyWindow succeded\n"); ok(!DestroyWindow(wnd_event.hwnd), "DestroyWindow succeeded\n");
ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == 0xdeadbeef, ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == 0xdeadbeef,
"wrong error code %d\n", GetLastError()); "wrong error code %d\n", GetLastError());
@ -6751,7 +6751,7 @@ static void test_interthread_messages(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
len = DispatchMessageA(&msg); len = DispatchMessageA(&msg);
ok((!len && GetLastError() == ERROR_MESSAGE_SYNC_ONLY) || broken(len), /* nt4 */ ok((!len && GetLastError() == ERROR_MESSAGE_SYNC_ONLY) || broken(len), /* nt4 */
"DispatchMessageA(WM_GETTEXT) succeded on another thread window: ret %d, error %d\n", len, GetLastError()); "DispatchMessageA(WM_GETTEXT) succeeded on another thread window: ret %d, error %d\n", len, GetLastError());
/* the following test causes an exception in user.exe under win9x */ /* the following test causes an exception in user.exe under win9x */
msg.hwnd = wnd_event.hwnd; msg.hwnd = wnd_event.hwnd;

View file

@ -259,7 +259,7 @@ todo_wine
"Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style);
/* test GetScrollInfo, vist for vertical SB */ /* test GetScrollInfo, vist for vertical SB */
ret = GetScrollInfo( hwnd, SB_VERT, &si); ret = GetScrollInfo( hwnd, SB_VERT, &si);
/* should fail if no H orV scroll bar styles are present. Succeed otherwise */ /* should fail if no H or V scroll bar styles are present. Succeed otherwise */
if( !( style & ( WS_VSCROLL | WS_HSCROLL))) if( !( style & ( WS_VSCROLL | WS_HSCROLL)))
ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style);
else else
@ -269,7 +269,7 @@ todo_wine
"GetScrollInfo failed unexpectedly. Style is %08x\n", style); "GetScrollInfo failed unexpectedly. Style is %08x\n", style);
/* Same for Horizontal SB */ /* Same for Horizontal SB */
ret = GetScrollInfo( hwnd, SB_HORZ, &si); ret = GetScrollInfo( hwnd, SB_HORZ, &si);
/* should fail if no H orV scroll bar styles are present. Succeed otherwise */ /* should fail if no H or V scroll bar styles are present. Succeed otherwise */
if( !( style & ( WS_VSCROLL | WS_HSCROLL))) if( !( style & ( WS_VSCROLL | WS_HSCROLL)))
ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style);
else else
@ -316,7 +316,7 @@ todo_wine
hwnd = CreateWindowExA( 0, "static", "", WS_POPUP | style, hwnd = CreateWindowExA( 0, "static", "", WS_POPUP | style,
0, 0, 10, 10, 0, 0, 0, NULL); 0, 0, 10, 10, 0, 0, 0, NULL);
assert( hwnd != 0); assert( hwnd != 0);
/* Set Horizonta Scroll range to something that could be the default value it /* Set Horizontal Scroll range to something that could be the default value it
* already has */; * already has */;
ret = SetScrollRange( hwnd, SB_HORZ, 0, 100, FALSE); ret = SetScrollRange( hwnd, SB_HORZ, 0, 100, FALSE);
ok( ret, "SetScrollRange failed.\n"); ok( ret, "SetScrollRange failed.\n");

View file

@ -2463,7 +2463,7 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam )
* not all metrics are properly restored. Problems are * not all metrics are properly restored. Problems are
* SM_CXMAXTRACK, SM_CYMAXTRACK * SM_CXMAXTRACK, SM_CYMAXTRACK
* Fortunately setting the Non-Client metrics like in * Fortunately setting the Non-Client metrics like in
* test_SPI_SETNONCLIENTMETRICS will corect this. That is why * test_SPI_SETNONCLIENTMETRICS will correct this. That is why
* we do the DISPLAY change now... */ * we do the DISPLAY change now... */
test_WM_DISPLAYCHANGE(); test_WM_DISPLAYCHANGE();
test_SPI_SETNONCLIENTMETRICS(); /* 42 */ test_SPI_SETNONCLIENTMETRICS(); /* 42 */

View file

@ -5157,13 +5157,13 @@ static void test_SetWindowLong(void)
retval = SetWindowLongPtr(NULL, GWLP_WNDPROC, 0); retval = SetWindowLongPtr(NULL, GWLP_WNDPROC, 0);
ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%lx\n", retval); ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%lx\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_WINDOW_HANDLE), ok(check_error(GetLastError(), ERROR_INVALID_WINDOW_HANDLE),
"SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instad of %d\n", GetLastError()); "SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instead of %d\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
retval = SetWindowLongPtr(hwndMain, 0xdeadbeef, 0); retval = SetWindowLongPtr(hwndMain, 0xdeadbeef, 0);
ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%lx\n", retval); ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%lx\n", retval);
ok(check_error(GetLastError(), ERROR_INVALID_INDEX), ok(check_error(GetLastError(), ERROR_INVALID_INDEX),
"SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instad of %d\n", GetLastError()); "SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instead of %d\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
retval = SetWindowLongPtr(hwndMain, GWLP_WNDPROC, 0); retval = SetWindowLongPtr(hwndMain, GWLP_WNDPROC, 0);
@ -5239,7 +5239,7 @@ static void test_ShowWindow(void)
ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n");
GetWindowRect(hwnd, &rcMinimized); GetWindowRect(hwnd, &rcMinimized);
ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n");
/* shouldn't be able to resize minized windows */ /* shouldn't be able to resize minimized windows */
ret = SetWindowPos(hwnd, 0, 0, 0, ret = SetWindowPos(hwnd, 0, 0, 0,
(rcMinimized.right - rcMinimized.left) * 2, (rcMinimized.right - rcMinimized.left) * 2,
(rcMinimized.bottom - rcMinimized.top) * 2, (rcMinimized.bottom - rcMinimized.top) * 2,

View file

@ -1760,7 +1760,7 @@ static void test_ScriptTextOut3(HDC hdc)
ABC pABC[256]; ABC pABC[256];
RECT rect; RECT rect;
/* This is to ensure that non exisiting glyphs are translated into a valid glyph number */ /* This is to ensure that non existing glyphs are translated into a valid glyph number */
cInChars = 2; cInChars = 2;
cMaxItems = 255; cMaxItems = 255;
hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems);
@ -2116,9 +2116,9 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
hr = ScriptStringCPtoX(ssa, Cp, FALSE, &lead); hr = ScriptStringCPtoX(ssa, Cp, FALSE, &lead);
ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr);
if (rtl[Cp]) if (rtl[Cp])
ok(lead > trail, "Leading values should be after trialing for rtl chracters(%i)\n",Cp); ok(lead > trail, "Leading values should be after trialing for rtl characters(%i)\n",Cp);
else else
ok(lead < trail, "Trailing values should be after leading for ltr chracters(%i)\n",Cp); ok(lead < trail, "Trailing values should be after leading for ltr characters(%i)\n",Cp);
/* move by 1 pixel so that we are not inbetween 2 characters. That could result in being the lead of a rtl and /* move by 1 pixel so that we are not inbetween 2 characters. That could result in being the lead of a rtl and
at the same time the trail of an ltr */ at the same time the trail of an ltr */
@ -2215,7 +2215,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing);
ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr);
ok(Ch == String_len, "ScriptStringXtoCP should return Ch = %i not %d for X outside trailing edge\n", String_len, Ch); ok(Ch == String_len, "ScriptStringXtoCP should return Ch = %i not %d for X outside trailing edge\n", String_len, Ch);
ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside traling edge\n", ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = outside trailing edge\n",
iTrailing); iTrailing);
/* /*

View file

@ -807,7 +807,7 @@ static void test_EnumForms(LPSTR pName)
RETURN_ON_DEACTIVATED_SPOOLER(res) RETURN_ON_DEACTIVATED_SPOOLER(res)
if (!res || !hprinter) if (!res || !hprinter)
{ {
/* Open the local Prinserver is not supported on win9x */ /* Open the local Printserver is not supported on win9x */
if (pName) skip("Failed to open '%s' (not supported on win9x)\n", pName); if (pName) skip("Failed to open '%s' (not supported on win9x)\n", pName);
return; return;
} }

View file

@ -576,7 +576,7 @@ todo_wine {
ok(type == XmlNodeType_XmlDeclaration, ok(type == XmlNodeType_XmlDeclaration,
"Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type));
} }
/* new version 1.2.x and 1.3.x properly update postition for <?xml ?> */ /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */
ok_pos(reader, 1, 3, -1, 55, TRUE); ok_pos(reader, 1, 3, -1, 55, TRUE);
/* check attributes */ /* check attributes */