Commit 367f91fb authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Assorted spelling fixes.

parent 2c531ade
......@@ -1343,7 +1343,7 @@ static BOOL fci_flush_folder(
return FALSE;
}
/* Skip a few lines of code. This is catched by the next if. */
/* Skip a few lines of code. This is caught by the next if. */
p_fci_internal->fGetNextCabInVain=TRUE;
}
......@@ -2251,7 +2251,7 @@ static BOOL fci_flush_cabinet(
fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE );
return FALSE;
}
/* Skip a few lines of code. This is catched by the next if. */
/* Skip a few lines of code. This is caught by the next if. */
p_fci_internal->fGetNextCabInVain=TRUE;
}
......@@ -2480,7 +2480,7 @@ BOOL __cdecl FCIAddFile(
fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE );
return FALSE;
}
/* Skip a few lines of code. This is catched by the next if. */
/* Skip a few lines of code. This is caught by the next if. */
p_fci_internal->fGetNextCabInVain=TRUE;
}
......@@ -2647,7 +2647,7 @@ BOOL __cdecl FCIAddFile(
fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE );
return FALSE;
}
/* Skip a few lines of code. This is catched by the next if. */
/* Skip a few lines of code. This is caught by the next if. */
p_fci_internal->fGetNextCabInVain=TRUE;
}
......
......@@ -132,7 +132,7 @@ START_TEST(heap)
"MAGIC_DEAD)\n", res, GetLastError());
GlobalFree(gbl);
/* invalid handles are catched in windows: */
/* invalid handles are caught in windows: */
SetLastError(MAGIC_DEAD);
hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */
ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
......@@ -237,7 +237,7 @@ START_TEST(heap)
"MAGIC_DEAD)\n", res, GetLastError());
LocalFree(gbl);
/* invalid handles are catched in windows: */
/* invalid handles are caught in windows: */
SetLastError(MAGIC_DEAD);
hsecond = LocalFree(gbl); /* invalid handle: free memory twice */
ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
......
......@@ -591,7 +591,7 @@ HRESULT WINAPI ScriptXtoCP(int iX,
if (iPosX - iX > fAvePosX/2)
*piTrailing = 0;
else
*piTrailing = 1; /* yep we are over half way */
*piTrailing = 1; /* yep we are over halfway */
*piCP = item -1; /* Return character position */
TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX);
......
......@@ -2267,10 +2267,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
*pCaps->NumberOfAdaptersInGroup = 1;
if(*pCaps->VertexShaderVersion >= WINED3DVS_VERSION(2,0)) {
/* OpenGL supports all formats below, perhaps not always without conversion but it supports them.
Further GLSL doesn't seem to have an official unsigned type as I'm not sure how we handle it
don't advertise it yet. We might need to add some clamping in the shader engine to support it.
TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */
/* OpenGL supports all the formats below, perhaps not always
* without conversion, but it supports them.
* Further GLSL doesn't seem to have an official unsigned type so
* don't advertise it yet as I'm not sure how we handle it.
* We might need to add some clamping in the shader engine to
* support it.
* TODO: D3DDTCAPS_USHORT2N, D3DDTCAPS_USHORT4N, D3DDTCAPS_UDEC3, D3DDTCAPS_DEC3N */
*pCaps->DeclTypes = D3DDTCAPS_UBYTE4 |
D3DDTCAPS_UBYTE4N |
D3DDTCAPS_SHORT2N |
......
......@@ -151,7 +151,7 @@ void WINAPI DOSVM_Int15Handler( CONTEXT86 *context )
FIXME("INT15: 0xc3\n");
SET_AH( context , 0x86 );
break;
case 0xc4: /* BIOS POS Programm option select */
case 0xc4: /* BIOS POS Program option select */
FIXME("INT15: option 0xc4 not handled!\n");
break;
......
......@@ -1069,7 +1069,7 @@ static void test_GetPrinterDriverDirectory(void)
"'len > 0' or '0' with ERROR_INVALID_ENVIRONMENT)\n",
res, GetLastError(), lstrlenA((char *)buffer));
/* A Setup-Programm (PDFCreator_0.8.0) use empty strings */
/* A setup program (PDFCreator_0.8.0) use empty strings */
SetLastError(MAGIC_DEAD);
res = GetPrinterDriverDirectoryA(empty, empty, 1, buffer, cbBuf*2, &pcbNeeded);
ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError() );
......@@ -1097,7 +1097,7 @@ static void test_GetPrintProcessorDirectory(void)
SetLastError(0xdeadbeef);
res = GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbBuf);
/* The deactivated Spooler is catched here on NT3.51 */
/* The deactivated Spooler is caught here on NT3.51 */
RETURN_ON_DEACTIVATED_SPOOLER(res)
ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER),
"returned %d with %d (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n",
......@@ -1125,7 +1125,7 @@ static void test_GetPrintProcessorDirectory(void)
res, GetLastError());
#if 0
/* XPsp2: the programm will crash here, when the spooler is not running */
/* XPsp2: the program will crash here, when the spooler is not running */
/* GetPrinterDriverDirectory has the same bug */
pcbNeeded = 0;
SetLastError(0xdeadbeef);
......@@ -1226,7 +1226,7 @@ static void test_OpenPrinter(void)
SetLastError(MAGIC_DEAD);
res = OpenPrinter(NULL, NULL, NULL);
/* The deactivated Spooler is catched here on NT3.51 */
/* The deactivated Spooler is caught here on NT3.51 */
RETURN_ON_DEACTIVATED_SPOOLER(res)
ok(!res && (GetLastError() == ERROR_INVALID_PARAMETER),
"returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n",
......@@ -1237,7 +1237,7 @@ static void test_OpenPrinter(void)
hprinter = (HANDLE) MAGIC_DEAD;
SetLastError(MAGIC_DEAD);
res = OpenPrinter(NULL, &hprinter, NULL);
/* The deactivated Spooler is catched here on XPsp2 */
/* The deactivated Spooler is caught here on XPsp2 */
RETURN_ON_DEACTIVATED_SPOOLER(res)
ok(res || (!res && GetLastError() == ERROR_INVALID_PARAMETER),
"returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n",
......
......@@ -728,7 +728,7 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine)
&startup.hStdError, GENERIC_READ|GENERIC_WRITE, TRUE, 0))
{
WINE_ERR("Can't dup handles\n");
/* no need to delete handles, we're exiting the programm anyway */
/* no need to delete handles, we're exiting the program anyway */
return FALSE;
}
......
......@@ -779,7 +779,7 @@ BOOL break_should_continue(ADDRESS64* addr, DWORD code)
/***********************************************************************
* break_ajust_pc
*
* Adjust PC to the address where the trap (if any) actually occured
* Adjust PC to the address where the trap (if any) actually occurred
* Also sets dbg_curr_thread->stopped_xpoint
*/
void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL* is_break)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment