Assorted spelling fixes.
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 61806f4..468fe24 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2131,9 +2131,9 @@
lpBand->hwndChild = lprbbi->hwndChild;
lpBand->hwndPrevParent =
SetParent (lpBand->hwndChild, hwnd);
- /* below in trace fro WinRAR */
+ /* below in trace from WinRAR */
ShowWindow(lpBand->hwndChild, SW_SHOWNOACTIVATE | SW_SHOWNORMAL);
- /* above in trace fro WinRAR */
+ /* above in trace from WinRAR */
}
else {
TRACE("child: %p prev parent: %p\n",
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index b738a4e..39d981b 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -1507,7 +1507,7 @@
/* NB this API is broken, there is no way for the app to determine
what size buffer it requires nor a way to specify how long the
- one it supplies is. We'll assume it's upto INFOTIPSIZE */
+ one it supplies is. We'll assume it's up to INFOTIPSIZE */
WideCharToMultiByte(CP_ACP, 0, infoPtr->tools[nTool].lpszText, -1,
lpToolInfo->lpszText, INFOTIPSIZE, NULL, NULL);
diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c
index f29c066..e506271 100644
--- a/dlls/d3d8/shader.c
+++ b/dlls/d3d8/shader.c
@@ -770,7 +770,7 @@
curOpcode = vshader_program_get_opcode(*pToken);
++pToken;
if (NULL == curOpcode) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
while (*pToken & 0x80000000) {
TRACE_(d3d_hw_shader)("unrecognized opcode: %08lx\n", *pToken);
++pToken;
@@ -904,7 +904,7 @@
++pToken;
++len;
if (NULL == curOpcode) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
while (*pToken & 0x80000000) {
TRACE("unrecognized opcode: %08lx\n", *pToken);
++pToken;
@@ -1041,7 +1041,7 @@
++pToken;
if (NULL == curOpcode) {
i = 0;
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
while (*pToken & 0x80000000) {
if (i == 0) {
TRACE("unrecognized opcode: pos=%d token=%08lX\n", (pToken - 1) - vshader->function, *(pToken - 1));
@@ -1875,7 +1875,7 @@
curOpcode = pshader_program_get_opcode(code, version);
++pToken;
if (NULL == curOpcode) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
while (*pToken & 0x80000000) {
TRACE("unrecognized opcode: %08lx\n", *pToken);
++pToken;
@@ -2249,7 +2249,7 @@
++pToken;
++len;
if (NULL == curOpcode) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
while (*pToken & 0x80000000) {
TRACE("unrecognized opcode: %08lx\n", *pToken);
++pToken;
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index bc03b72..928bfb2 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -173,7 +173,7 @@
case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD";
case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK";
case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE";
- default: return "Unkown";
+ default: return "Unknown";
}
}
diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c
index d86b0ac..0a30d9b 100644
--- a/dlls/dinput/effect_linuxinput.c
+++ b/dlls/dinput/effect_linuxinput.c
@@ -823,7 +823,7 @@
HeapFree(GetProcessHeap(), 0, newEffect);
return DIERR_INVALIDPARAM;
default:
- FIXME("Unkown force type.\n");
+ FIXME("Unknown force type.\n");
HeapFree(GetProcessHeap(), 0, newEffect);
return DIERR_INVALIDPARAM;
}
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 7502513..b1c5558 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -637,7 +637,7 @@
return i;
}
- /* XXX - the following part wont work with LiveForSpeed
+ /* XXX - the following part won't work with LiveForSpeed
* - the game sets the dwTypes to something else then
* the ddoi.dwType set in EnumObjects
*/
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index d502d4d..8bc5fdb 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -345,7 +345,7 @@
* Failure: error code from winerror.h
*
* FIXME
- * Stub, returns allways NO_ERROR.
+ * Stub, always returns NO_ERROR.
*/
DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{
@@ -368,7 +368,7 @@
* Failure: error code from winerror.h
*
* FIXME
- * Stub, returns allways NO_ERROR.
+ * Stub, always returns NO_ERROR.
*/
DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
{
@@ -1333,7 +1333,7 @@
*
* PARAMS
* pFixedInfo [Out] buffer for network parameters
- * pOutBufLen [In/Out] lenght of output buffer
+ * pOutBufLen [In/Out] length of output buffer
*
* RETURNS
* Success: NO_ERROR
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 97df18e..d050cd1 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -324,7 +324,7 @@
return S_OK;
}
-/** IUnkown methods **/
+/** IUnknown methods **/
static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv)
{
diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c
index b053b73..e596c56 100644
--- a/dlls/rsaenh/mpi.c
+++ b/dlls/rsaenh/mpi.c
@@ -2628,7 +2628,7 @@
/*
* shifts with subtractions when the result is greater than b.
*
- * The method is slightly modified to shift B unconditionally upto just under
+ * The method is slightly modified to shift B unconditionally up to just under
* the leading bit of b. This saves a lot of multiple precision shifting.
*/
int mp_montgomery_calc_normalization (mp_int * a, mp_int * b)
@@ -4151,7 +4151,7 @@
return err;
}
-/* multiplies |a| * |b| and only computes upto digs digits of result
+/* multiplies |a| * |b| and only computes up to digs digits of result
* HAC pp. 595, Algorithm 14.12 Modified so you can control how
* many digits of output are created.
*/
diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h
index 78cc22c..47138d2 100644
--- a/dlls/rsaenh/tomcrypt.h
+++ b/dlls/rsaenh/tomcrypt.h
@@ -222,7 +222,7 @@
mp_digit *dp;
} mp_int;
-/* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */
+/* callback for mp_prime_random, should fill dst with random bytes and return how many read [up to len] */
typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
#define DIGIT(m,k) ((m)->dp[(k)])
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index ab1d3d7..905796a 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -1699,7 +1699,7 @@
*/
HRESULT WINAPI SHGetFolderPathW(
HWND hwndOwner, /* [I] owner window */
- int nFolder, /* [I] CSIDL identifing the folder */
+ int nFolder, /* [I] CSIDL identifying the folder */
HANDLE hToken, /* [I] access token */
DWORD dwFlags, /* [I] which path to return */
LPWSTR pszPath) /* [O] converted path */
diff --git a/dlls/user/edit.c b/dlls/user/edit.c
index 9b9a7c5..47f317d 100644
--- a/dlls/user/edit.c
+++ b/dlls/user/edit.c
@@ -1780,7 +1780,7 @@
*
* EDIT_InvalidateText
*
- * Invalidate the text from offset start upto, but not including,
+ * Invalidate the text from offset start up to, but not including,
* offset end. Useful for (re)painting the selection.
* Regions outside the linewidth are not invalidated.
* end == -1 means end == TextLength.
@@ -2484,7 +2484,7 @@
*
* Find the beginning of words.
* Note: unlike the specs for a WordBreakProc, this function only
- * allows to be called without linebreaks between s[0] upto
+ * allows to be called without linebreaks between s[0] up to
* s[count - 1]. Remember it is only called
* internally, so we can decide this for ourselves.
*
diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index ce604cc..13ef66c 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -877,7 +877,7 @@
return;
/* do not increase the value as it would upset the user's icon layout */
dotest_spi_iconverticalspacing( old_spacing - 1);
- /* same tests with a value less then the minimum 32 */
+ /* same tests with a value less than the minimum 32 */
dotest_spi_iconverticalspacing( 10);
/* restore */
rc=SystemParametersInfoA( SPI_ICONVERTICALSPACING, old_spacing, 0,
@@ -1932,7 +1932,7 @@
/* the tests: */
- /* SM_CXSCREEN, can not test these two */
+ /* SM_CXSCREEN, cannot test these two */
/* SM_CYSCREEN */
ok_gsm( SM_CXVSCROLL, ncm.iScrollWidth);
ok_gsm( SM_CYHSCROLL, ncm.iScrollWidth);
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 1a80f6d..237d409 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -180,7 +180,7 @@
}
}
}
- /* If an image couldnt be selected, choose the first one */
+ /* If an image couldn't be selected, choose the first one */
return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1);
}
else if(imageselecttype == IST_SIZE) {
@@ -224,7 +224,7 @@
return fileProp;
}
}
- /* If an image couldnt be selected, choose the smallest one */
+ /* If an image couldn't be selected, choose the smallest one */
return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1);
}
return NULL;
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index a8bb0ff..1df337c 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -254,7 +254,7 @@
glPrioritizeTextures(1, &This->baseTexture.textureName, &tmp);
}
- /* Initilise the state of the texture object
+ /* Initialise the state of the texture object
to the openGL defaults, not the directx defaults */
This->baseTexture.states[WINED3DTEXSTA_ADDRESSU] = D3DTADDRESS_WRAP;
This->baseTexture.states[WINED3DTEXSTA_ADDRESSV] = D3DTADDRESS_WRAP;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3619097..5ce1df7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -108,7 +108,7 @@
TRACE("(%p) : Created resource %p\n", This, object); \
}
-#define D3DINITILIZEBASETEXTURE(_basetexture) { \
+#define D3DINITIALIZEBASETEXTURE(_basetexture) { \
_basetexture.levels = Levels; \
_basetexture.filterType = (Usage & D3DUSAGE_AUTOGENMIPMAP) ? D3DTEXF_LINEAR : D3DTEXF_NONE; \
_basetexture.LOD = 0; \
@@ -723,7 +723,7 @@
Size = (pow2Width * D3DFmtGetBpp(This, Format)) * pow2Height;
}
- /** Create the and initilise surface resource **/
+ /** Create and initialise the surface resource **/
D3DCREATERESOURCEOBJECTINSTANCE(object,Surface,D3DRTYPE_SURFACE, Size)
object->container = (IUnknown*) This;
@@ -837,7 +837,7 @@
}
D3DCREATERESOURCEOBJECTINSTANCE(object, Texture, D3DRTYPE_TEXTURE, 0);
- D3DINITILIZEBASETEXTURE(object->baseTexture);
+ D3DINITIALIZEBASETEXTURE(object->baseTexture);
object->width = Width;
object->height = Height;
@@ -922,7 +922,7 @@
}
D3DCREATERESOURCEOBJECTINSTANCE(object, VolumeTexture, D3DRTYPE_VOLUMETEXTURE, 0);
- D3DINITILIZEBASETEXTURE(object->baseTexture);
+ D3DINITIALIZEBASETEXTURE(object->baseTexture);
TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%s)\n", This, Width, Height,
Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool));
@@ -1022,7 +1022,7 @@
}
D3DCREATERESOURCEOBJECTINSTANCE(object, CubeTexture, D3DRTYPE_CUBETEXTURE, 0);
- D3DINITILIZEBASETEXTURE(object->baseTexture);
+ D3DINITIALIZEBASETEXTURE(object->baseTexture);
TRACE("(%p) Create Cube Texture\n", This);
@@ -1172,7 +1172,7 @@
/** FIXME: Test under windows to find out what the life cycle of a swap chain is,
* does a device hold a reference to a swap chain giving them a lifetime of the device
- * or does the swap chain notify the device of it'd destruction.
+ * or does the swap chain notify the device of its destruction.
*******************************/
D3DCREATEOBJECTINSTANCE(object, SwapChain)
@@ -1310,7 +1310,7 @@
/**
* TODO: MSDN says that we are only allowed one fullscreen swapchain per device,
- * so we should really check to see if their is a fullscreen swapchain already
+ * so we should really check to see if there is a fullscreen swapchain already
* I think Windows and X have different ideas about fullscreen, does a single head count as full screen?
**************************************/
@@ -2097,7 +2097,7 @@
}
}
- /* Initialze the object */
+ /* Initialize the object */
TRACE("Light %ld setting to type %d, Diffuse(%f,%f,%f,%f), Specular(%f,%f,%f,%f), Ambient(%f,%f,%f,%f)\n", Index, pLight->Type,
pLight->Diffuse.r, pLight->Diffuse.g, pLight->Diffuse.b, pLight->Diffuse.a,
pLight->Specular.r, pLight->Specular.g, pLight->Specular.b, pLight->Specular.a,
@@ -4095,7 +4095,7 @@
* TODO: Verify against dx9 definitions
*****/
-/* NOTE: It's expected that this function is going to be called lots of times with the same stage active, so make it the callers responsibility to GLACTIVETEXTURE(Stage) for better state management. Set the correct Texture unit active before callnig ApplyTextureStageState */
+/* NOTE: It's expected that this function is going to be called lots of times with the same stage active, so make it the callers responsibility to GLACTIVETEXTURE(Stage) for better state management. Set the correct Texture unit active before calling ApplyTextureStageState */
static void WINAPI IWineD3DDeviceImpl_ApplyTextureUnitState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
DWORD Value = This->updateStateBlock->textureState[Stage][Type];
@@ -4380,7 +4380,7 @@
/** NOTE: MSDN says that setTexture increases the reference count,
* and the the application nust set the texture back to null (or have a leaky application),
- * This means we should pass the refcount upto the parent
+ * This means we should pass the refcount up to the parent
*******************************/
if (NULL != This->updateStateBlock->textures[Stage]) {
IUnknown *textureParent;
@@ -4832,7 +4832,7 @@
TRACE("(%p) Source %p Destination %p\n", This, pSourceTexture, pDestinationTexture);
- /* verify that the source and destination textures arebn't NULL */
+ /* verify that the source and destination textures aren't NULL */
if (NULL == pSourceTexture || NULL == pDestinationTexture) {
WARN("(%p) : source (%p) and destination (%p) textures must not be NULL, returning D3DERR_INVALIDCALL\n",
This, pSourceTexture, pDestinationTexture);
@@ -4975,9 +4975,9 @@
surfaceDesc.Width = &surfaceWidth;
surfaceDesc.Height = &surfaceHeight;
IWineD3DSurface_GetDesc(pSurface, &surfaceDesc);
- /* check to see if it's the backbuffer or the frontbuffer being requested (to make sureteh data is upto date)*/
+ /* check to see if it's the backbuffer or the frontbuffer being requested (to make sure the data is up to date)*/
- /* Ok, I may need to setup some kind of active swapchain reference on the device */
+ /* Ok, I may need to setup some kind of active swapchain reference on the device */
IWineD3DSurface_GetContainer(pRenderTarget, &IID_IWineD3DSwapChain, (void **)&container);
ENTER_GL();
/* TODO: opengl Context switching for swapchains etc... */
@@ -5048,7 +5048,7 @@
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
/* return a sensible default */
*pNumPasses = 1;
- /* TODO: If the window is minimized then validate device shold return something other than d3d_ok */
+ /* TODO: If the window is minimized then validate device should return something other than d3d_ok */
FIXME("(%p) : stub\n", This);
return D3D_OK;
}
@@ -5228,7 +5228,7 @@
IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc);
}
- /* Make sure the surface is loaded and upto date */
+ /* Make sure the surface is loaded and up to date */
IWineD3DSurface_PreLoad(pDestinationSurface);
IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription);
@@ -6285,7 +6285,7 @@
/* Set changed flag? */
}
}
- if (This->stateBlock != NULL ) { /* only happens if their is an error in the application, or on reset/release (because we don't manage internal tracknig properly) */
+ if (This->stateBlock != NULL ) { /* only happens if there is an error in the application, or on reset/release (because we don't manage internal tracking properly) */
if ((IWineD3DResource *)This->stateBlock->streamSource[streamNumber] == resource) {
TRACE("Vertex buffer released whlst bound to a state block stream %d\n", streamNumber);
This->stateBlock->streamSource[streamNumber] = 0;
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index bae6ac7..8325c27 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -670,7 +670,7 @@
/** FIXME: use direct access so add the others opcodes as stubs */
/* NOTE: gl function is currently NULL for calls and loops because they are not yet supported
- They can be easly managed in software by introducing a call/loop stack and should be possible to implement in glsl ol NV_shader's */
+ They can be easily managed in software by introducing a call/loop stack and should be possible to implement in glsl ol NV_shader's */
{D3DSIO_CALL, "call", GLNAME_REQUIRE_GLSL, 1, pshader_call, 0, 0},
{D3DSIO_CALLNZ, "callnz", GLNAME_REQUIRE_GLSL, 2, pshader_callnz, 0, 0},
{D3DSIO_LOOP, "loop", GLNAME_REQUIRE_GLSL, 2, pshader_loop, 0, 0},
@@ -685,7 +685,7 @@
RCP tmp, vec
MUL out, tmp, vec*/
{D3DSIO_SGN, "sng", NULL, 2, pshader_sng, 0, 0},
- /* TODO: xyz normalise can be performed is VS_ARB using one tempory register,
+ /* TODO: xyz normalise can be performed as VS_ARB using one temporary register,
DP3 tmp , vec, vec;
RSQ tmp, tmp.x;
MUL vec.xyz, vec, tmp;
@@ -727,7 +727,7 @@
{D3DSIO_EXPP, "expp", "EXP", 2, pshader_expp, 0, 0},
{D3DSIO_LOGP, "logp", "LOG", 2, pshader_logp, 0, 0},
{D3DSIO_CND, "cnd", GLNAME_REQUIRE_GLSL, 4, pshader_cnd, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)},
- /* def is a special opperation */
+ /* def is a special operation */
{D3DSIO_DEF, "def", "undefined", 5, pshader_def, 0, 0},
{D3DSIO_TEXREG2RGB, "texreg2rgb", GLNAME_REQUIRE_GLSL, 2, pshader_texreg2rgb, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXDP3TEX, "texdp3tex", GLNAME_REQUIRE_GLSL, 2, pshader_texdp3tex, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
@@ -983,7 +983,7 @@
unsigned int pgmLength = 0;
#if 0 /* FIXME: Use the buffer that is held by the device, this is ok since fixups will be skipped for software shaders
- it also requires entering a critical section but cuts down the runtime footprint of wined3d and any memory fragmentation that may occure... */
+ it also requires entering a critical section but cuts down the runtime footprint of wined3d and any memory fragmentation that may occur... */
if (This->device->fixupVertexBufferSize < PGMSIZE) {
HeapFree(GetProcessHeap(), 0, This->fixupVertexBuffer);
This->fixupVertexBuffer = HeapAlloc(GetProcessHeap() , 0, PGMSIZE);
@@ -1090,7 +1090,7 @@
continue;
}
/* here */
-#if 0 /* Not sure what thease are here for, the're not required for vshaders */
+#if 0 /* Not sure what these are here for, they're not required for vshaders */
code = *pToken;
#endif
pInstr = pToken;
@@ -1098,13 +1098,13 @@
TRACE("Found opcode %s %s\n", curOpcode->name,curOpcode->glname);
++pToken;
if (NULL == curOpcode) {
- /* unkown current opcode ... (shouldn't be any!) */
+ /* unknown current opcode ... (shouldn't be any!) */
while (*pToken & 0x80000000) { /* TODO: Think of a sensible name for 0x80000000 */
FIXME("unrecognized opcode: %08lx\n", *pToken);
++pToken;
}
} else if (GLNAME_REQUIRE_GLSL == curOpcode->glname) {
- /* if the token isn't supported by this cross compiler then skip it and it's parameters */
+ /* if the token isn't supported by this cross compiler then skip it and its parameters */
FIXME("Token %s requires greater functionality than Fragment_Progarm_ARB supports\n", curOpcode->name);
pToken += curOpcode->num_params;
} else {
@@ -1148,7 +1148,7 @@
case D3DSIO_LOG:
case D3DSIO_LRP:
case D3DSIO_TEXKILL:
- TRACE("Appending glname %s to tmpLine \n", curOpcode->glname);
+ TRACE("Appending glname %s to tmpLine\n", curOpcode->glname);
strcpy(tmpLine, curOpcode->glname);
break;
case D3DSIO_DEF:
@@ -1689,7 +1689,7 @@
/* TODO: Think of a good name for 0x80000000 and replace it with a constant */
while (*pToken & 0x80000000) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
TRACE("unrecognized opcode: %08lx", *pToken);
++pToken;
++len;
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 380bacd..af1940a 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -310,7 +310,7 @@
}
}
- /* FIXME: textures are upto MAX_SAMPLERS for d3d9? */
+ /* FIXME: textures are up to MAX_SAMPLERS for d3d9? */
/* Texture */
for (j = 0; j < GL_LIMITS(textures); j++) {
/* TODO: move over to using memcpy */
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6e69bb2..0aa1446 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -895,7 +895,7 @@
/* Resources are placed in system RAM and do not need to be recreated when a device is lost. These resources are not bound by device size or format restrictions. Because of this, these resources cannot be accessed by the Direct3D device nor set as textures or render targets. However, these resources can always be created, locked, and copied. */
if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM) /*never store scratch or system mem textures in the video ram*/
{
- FIXME("(%p) Opperation not supported for scratch or SYSTEMMEM textures\n",This);
+ FIXME("(%p) Operation not supported for scratch or SYSTEMMEM textures\n",This);
return D3DERR_INVALIDCALL;
}
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 7f3c608..1d7421f 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1834,7 +1834,7 @@
#define PUSH1(att) attribs[(*nAttribs)++] = (att);
#define PUSH2(att,value) attribs[(*nAttribs)++] = (att); attribs[(*nAttribs)++] = (value);
/*We need to do some Card specific stuff in here at some point,
- D3D now support floating point format buffers, and their are a number of different OpelGl ways on managing thease e.g.
+ D3D now supports floating point format buffers, and there are a number of different OpelGl ways of managing these e.g.
GLX_ATI_pixel_format_float
*/
switch (BackBufferFormat) {
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index cc221ec..cf4638f 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -623,7 +623,7 @@
{D3DSIO_M3x2, "m3x2", "undefined", 3, vshader_m3x2, 0, 0},
/** FIXME: use direct access so add the others opcodes as stubs */
/* NOTE: gl function is currently NULL for calls and loops because they are not yet supported
- They can be easly managed in software by introducing a call/loop stack and should be possible to implement in glsl ol NV_shader's */
+ They can be easily managed in software by introducing a call/loop stack and should be possible to implement in glsl ol NV_shader's */
{D3DSIO_CALL, "call", GLNAME_REQUIRE_GLSL, 1, vshader_call, 0, 0},
{D3DSIO_CALLNZ, "callnz", GLNAME_REQUIRE_GLSL, 2, vshader_callnz, 0, 0},
{D3DSIO_LOOP, "loop", GLNAME_REQUIRE_GLSL, 2, vshader_loop, 0, 0},
@@ -638,7 +638,7 @@
RCP tmp, vec
MUL out, tmp, vec*/
{D3DSIO_SGN, "sng", NULL, 2, vshader_sng, 0, 0},
- /* TODO: xyz normalise can be performed is VS_ARB using one temporary register,
+ /* TODO: xyz normalise can be performed as VS_ARB using one temporary register,
DP3 tmp , vec, vec;
RSQ tmp, tmp.x;
MUL vec.xyz, vec, tmp;
@@ -680,7 +680,7 @@
{D3DSIO_EXPP, "expp", "EXP", 2, vshader_expp, 0, 0},
{D3DSIO_LOGP, "logp", "LOG", 2, vshader_logp, 0, 0},
{D3DSIO_CND, "cnd", GLNAME_REQUIRE_GLSL, 4, vshader_cnd, D3DPS_VERSION(1,1), D3DPS_VERSION(1,4)},
- /* def is a special opperation */
+ /* def is a special operation */
{D3DSIO_DEF, "def", NULL, 5, vshader_def, D3DPS_VERSION(1,0), D3DPS_VERSION(3,0)},
{D3DSIO_TEXREG2RGB, "texreg2rgb", GLNAME_REQUIRE_GLSL, 2, vshader_texreg2rgb, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
{D3DSIO_TEXDP3TEX, "texdp3tex", GLNAME_REQUIRE_GLSL, 2, vshader_texdp3tex, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)},
@@ -1087,7 +1087,7 @@
int pgmLength = 0;
#if 0 /* FIXME: Use the buffer that is held by the device, this is ok since fixups will be skipped for software shaders
- it also requires entering a critical section but cuts down the runtime footprint of wined3d and any memory fragmentation that may occure... */
+ it also requires entering a critical section but cuts down the runtime footprint of wined3d and any memory fragmentation that may occur... */
if (This->device->fixupVertexBufferSize < PGMSIZE) {
HeapFree(GetProcessHeap(), 0, This->fixupVertexBuffer);
This->fixupVertexBuffer = HeapAlloc(GetProcessHeap() , 0, PGMSIZE);
@@ -1107,7 +1107,7 @@
}
pgmStr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 65535); /* 64kb should be enough */
- /* Initilise the shader */
+ /* Initialise the shader */
This->namedArrays = FALSE;
This->declaredArrays = FALSE;
for (i = 0; i < WINED3DSHADERDECLUSAGE_MAX_USAGE; i++) {
@@ -1160,9 +1160,9 @@
This->arrayUsageMap[WINED3DSHADERDECLUSAGE_POSITION] = arrayNo;
This->namedArrays = TRUE;
} else {
- /* TODO: position indexes go fro 0-8!!*/
+ /* TODO: position indexes go from 0-8!!*/
TRACE("Setting position 2 to %d because usage = %d\n", arrayNo, (usage & 0xF0000) >> 16);
- /* robots uses positions upto 8, the position arrays are just packed.*/
+ /* robots uses positions up to 8, the position arrays are just packed.*/
if ((usage & 0xF0000) >> 16 > 1) {
TRACE("Loaded for position %d (greater than 2)\n", (usage & 0xF0000) >> 16);
}
@@ -1437,13 +1437,13 @@
curOpcode = vshader_program_get_opcode(*pToken);
++pToken;
if (NULL == curOpcode) {
- /* unkown current opcode ... (shouldn't be any!) */
+ /* unknown current opcode ... (shouldn't be any!) */
while (*pToken & 0x80000000) {
FIXME("unrecognized opcode: %08lx\n", *pToken);
++pToken;
}
} else if (GLNAME_REQUIRE_GLSL == curOpcode->glname) {
- /* if the token isn't supported by this cross compiler then skip it and it's parameters */
+ /* if the token isn't supported by this cross compiler then skip it and its parameters */
FIXME("Token %s requires greater functionality than Vertex_Progarm_ARB supports\n", curOpcode->name);
pToken += curOpcode->num_params;
@@ -1733,8 +1733,8 @@
++pToken;
if (NULL == curOpcode) {
i = 0;
- /* unkown current opcode ... */
- /* TODO: Think of a name for 0x80000000 and repalce it's use with a constant */
+ /* unknown current opcode ... */
+ /* TODO: Think of a name for 0x80000000 and replace its use with a constant */
while (*pToken & 0x80000000) {
if (i == 0) {
FIXME("unrecognized opcode: pos=%d token=%08lX\n", (pToken - 1) - This->function, *(pToken - 1));
@@ -2081,7 +2081,7 @@
if (NULL == curOpcode) {
/* TODO: Think of a good name for 0x80000000 and replace it with a constant */
while (*pToken & 0x80000000) {
- /* unkown current opcode ... */
+ /* unknown current opcode ... */
FIXME("unrecognized opcode: %08lx", *pToken);
++pToken;
++len;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4a930c9..554d6e6 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1029,7 +1029,7 @@
BOOL wantsDepthStencilBuffer;
D3DPRESENT_PARAMETERS presentParms;
- /* TODO: move everything upto drawable off into a context manager
+ /* TODO: move everything up to drawable off into a context manager
and store the 'data' in the contextManagerData interface.
IUnknown *contextManagerData;
*/
diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
index 2ed0b49..5872ab2 100644
--- a/dlls/winedos/dosaspi.c
+++ b/dlls/winedos/dosaspi.c
@@ -167,7 +167,7 @@
TRACE("SC_RESET_DEV\n");
break;
default:
- TRACE("Unkown command code\n");
+ TRACE("Unknown command code\n");
break;
}
diff --git a/dlls/wineps/download.c b/dlls/wineps/download.c
index 0c37c46..526f54a 100644
--- a/dlls/wineps/download.c
+++ b/dlls/wineps/download.c
@@ -85,7 +85,7 @@
int count = 0;
/* FIXME: should consider vm usage of each font and available printer memory.
- For now we allow upto two fonts to be downloaded at a time */
+ For now we allow up to two fonts to be downloaded at a time */
for(pdl = physDev->downloaded_fonts; pdl; pdl = pdl->next)
count++;
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 1ed9c72..4ad05ed 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -2490,13 +2490,13 @@
nSeconds = e_long_time - s_long_time;
if( nSeconds / 60 > 0 )
{
- TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld min %ld sec estimated remainig time %ld sec\n",
+ TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld min %ld sec estimated remaining time %ld sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds / 60,
nSeconds % 60, (fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent );
}
else
{
- TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld sec estimated remainig time %ld sec\n",
+ TRACE( "%ld bytes of %ld bytes (%ld%%) in %ld sec estimated remaining time %ld sec\n",
nTotalSent, fi.nFileSizeLow, nTotalSent*100/fi.nFileSizeLow, nSeconds,
(fi.nFileSizeLow - nTotalSent) * nSeconds / nTotalSent);
}
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 3556fd1..c1ad589 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -1103,7 +1103,7 @@
ok(HttpEndRequest(hRequest, NULL, 0, 0), "HttpEndRequest Failed\n");
ok(InternetReadFile(hRequest, szBuffer, 255, &dwBytesRead),
- "Unable to read responce\n");
+ "Unable to read response\n");
szBuffer[dwBytesRead] = 0;
ok(dwBytesRead == 13,"Read %lu bytes instead of 13\n",dwBytesRead);
diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c
index 2741e82..c433e88 100644
--- a/dlls/winspool/tests/info.c
+++ b/dlls/winspool/tests/info.c
@@ -191,7 +191,7 @@
"or result != 0 and last error == ERROR_INVALID_PARAMETER "
"got result %d and last error == %ld\n", res, GetLastError());
- /* with a valid buffer, but level is to large */
+ /* with a valid buffer, but level is too large */
buffer[0] = '\0';
SetLastError(0x00dead00);
res = GetPrinterDriverDirectoryA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded);
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 897082c..e58c2bb 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -122,7 +122,7 @@
static void LoadTablet(void)
{
- TRACE("Initilizing the tablet to hwnd %p\n",hwndDefault);
+ TRACE("Initializing the tablet to hwnd %p\n",hwndDefault);
gLoaded= TRUE;
pLoadTabletInfo(hwndDefault);
}
