From bcd56fe0e5c2bd6e544026d0f6e6f96bf4059999 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 12 Aug 2005 18:22:06 +0000 Subject: [PATCH] Assorted spelling fixes. --- dlls/kernel/tests/thread.c | 8 ++++---- dlls/ntdll/cdrom.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/drawprim.c | 10 ++++++++-- dlls/wined3d/vertexdeclaration.c | 6 +++--- dlls/wininet/tests/wininet_test.h | 2 +- tools/winapi/winapi.pm | 4 ++-- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 7e265d43904..f9fb3af568e 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -83,7 +83,7 @@ typedef struct { } t1Struct; /* WinME supports OpenThread but doesn't know about access restrictions so - we require them to be either completly ignored or always obeyed. + we require them to be either completely ignored or always obeyed. */ INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */ #define obey_ar(x) \ @@ -96,7 +96,7 @@ INT obeying_ars = 0; /* -1 == no, 0 == dunno yet, 1 == yes */ ? ok(!(x), "access restrictions obeyed\n") \ : ok( (x), "access restrictions not obeyed\n")) -/* Basic test that simulatneous threads can access shared memory, +/* Basic test that simultaneous threads can access shared memory, that the thread local storage routines work correctly, and that threads actually run concurrently */ @@ -119,7 +119,7 @@ static DWORD WINAPI threadFunc1(LPVOID p) for(i=0;ithreadmem[i]==0) ; } -/* Check that noone cahnged our tls memory */ +/* Check that noone changed our tls memory */ ok((int)TlsGetValue(tlsIndex)-1==tstruct->threadnum, "TlsGetValue failed\n"); return NUM_THREADS+tstruct->threadnum; @@ -323,7 +323,7 @@ static VOID test_TerminateThread(void) thread = CreateThread(NULL,0,threadFunc4, (LPVOID)event, 0,&threadId); ok(thread!=NULL,"Create Thread failed\n"); -/* Terminate thread has a race condition in Wine. If the thread is terminated +/* TerminateThread has a race condition in Wine. If the thread is terminated before it starts, it leaves a process behind. Therefore, we wait for the thread to signal that it has started. There is no easy way to force the race to occur, so we don't try to find it. diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 5552fcb0421..404dcb61816 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1929,7 +1929,7 @@ static NTSTATUS DVD_ReadStructure(int dev, PDVD_READ_STRUCTURE structure, PDVD_L * GetInquiryData * Implements the IOCTL_GET_INQUIRY_DATA ioctl. * Returns Inquiry data for all devices on the specified scsi bus - * Returns STATUS_BUFFER_TOO_SMALL if the output buffer is to small, + * Returns STATUS_BUFFER_TOO_SMALL if the output buffer is too small, * STATUS_INVALID_DEVICE_REQUEST if the given handle isn't to a SCSI device, * or STATUS_NOT_SUPPORTED if the OS driver is too old */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d4ba7a4c326..275882e31f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -272,7 +272,7 @@ void WINAPI IWineD3DDeviceImpl_SetupTextureStates(IWineD3DDevice *iface, DWORD S APPLY_STATE(WINED3DTSS_RESULTARG); APPLY_STATE(WINED3DTSS_CONSTANT); #endif - /* a quick sanity check incase someone forgot to update this function */ + /* a quick sanity check in case someone forgot to update this function */ if (WINED3D_HIGHEST_TEXTURE_STATE > WINED3DTSS_CONSTANT) { FIXME("(%p) : There are more texture states than expected, update device.c to match\n", This); } @@ -349,7 +349,7 @@ ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { if (nextSwapchain != NULL) { nextSwapchain = nextSwapchain->next; } else { - WARN("Expected to find the implicite swapchain\n"); + WARN("Expected to find the implicit swapchain\n"); } /* release all the other swapchains */ @@ -366,11 +366,11 @@ ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { } if (This->swapchains != NULL) { - /* Swapchain 0 is special because it's created in startup with a hanging parent, so we have to release it's parent now */ + /* Swapchain 0 is special because it's created in startup with a hanging parent, so we have to release its parent now */ IWineD3DSwapChain_GetParent(This->swapchains->swapchain, &swapChainParent); IUnknown_Release(swapChainParent); /* once for the get parent */ if (IUnknown_Release(swapChainParent) > 0) { /* the second time for when it was created */ - FIXME("(%p) Something's still holding the implicite swapchain\n", This); + FIXME("(%p) Something's still holding the implicit swapchain\n", This); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ae5660f342..c75d52e2c0f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1645,7 +1645,7 @@ HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, D3DDEV IWineD3DStateBlock_AddRef((IWineD3DStateBlock*)object->updateStateBlock); /* Setup surfaces for the backbuffer, frontbuffer and depthstencil buffer */ - /* Setup some defaults for creating the implicite swapchain */ + /* Setup some defaults for creating the implicit swapchain */ ENTER_GL(); IWineD3DImpl_FillGLCaps(&This->gl_info, IWineD3DImpl_GetAdapterDisplay(iface, Adapter)); LEAVE_GL(); @@ -1653,7 +1653,7 @@ HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, D3DDEV /* Setup the implicit swapchain */ TRACE("Creating implicit swapchain\n"); if (D3D_OK != D3DCB_CreateAdditionalSwapChain((IUnknown *) object->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain) || swapchain == NULL) { - WARN("Failed to create implicite swapchain\n"); + WARN("Failed to create implicit swapchain\n"); goto create_device_error; } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5b3feac942b..547b98e8e9f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1627,7 +1627,13 @@ void inline drawPrimitiveUploadTextures(IWineD3DDeviceImpl* This) { /* Load up the texture now */ IWineD3DBaseTexture_PreLoad((IWineD3DBaseTexture *) This->stateBlock->textures[i]); IWineD3DDevice_SetupTextureStates((IWineD3DDevice *)This, i, REAPPLY_ALPHAOP); - /* this is a stub function representing the state blocks being seperated here we are only updating the texture state changes, other objects and units get updated when they change (or need to be updated), e.g. states that relate to a context member line the texture unit are only updated when the context needs updating */ + /* this is a stub function representing the state blocks + * being separated here we are only updating the texture + * state changes, other objects and units get updated when + * they change (or need to be updated), e.g. states that + * relate to a context member line the texture unit are + * only updated when the context needs updating + */ /* Tell the abse texture to sync it's states */ IWineD3DBaseTexture_ApplyStateChanges(This->stateBlock->textures[i], This->stateBlock->textureState[i], This->stateBlock->samplerState[i]); @@ -1641,7 +1647,7 @@ void inline drawPrimitiveUploadTextures(IWineD3DDeviceImpl* This) { This->stateBlock->textureDimensions[i] = GL_TEXTURE_1D; glBindTexture(GL_TEXTURE_1D, This->dummyTextureName[i]); } -/** these ops apply to the texture unit, so they are preseved between texture changes, but for now brute force and reapply all +/** these ops apply to the texture unit, so they are preserved between texture changes, but for now brute force and reapply all dx9_1pass_emboss_bump_mapping and dx9_2pass_emboss_bump_mapping are good texts to make sure the states are being applied when needed **/ set_tex_op((IWineD3DDevice *)This, FALSE, i, This->stateBlock->textureState[i][WINED3DTSS_COLOROP], This->stateBlock->textureState[i][WINED3DTSS_COLORARG1], diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 79eae7ca243..fc31f1466c1 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -440,7 +440,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration8(IWineD3DVert return D3D_OK; } - /* The increadables and teenage mutant ninja turtles require this in d3d9 for NumElements == 0, + /* The Incredibles and Teenage Mutant Ninja Turtles require this in d3d9 for NumElements == 0, TODO: this needs to be tested against windows */ if(*pSizeOfData == 0) { TRACE("(%p) : Requested the vertex declaration without specefying the size of the return buffer\n", This); @@ -467,7 +467,7 @@ HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration9(IWineD3DVertexDecla return D3D_OK; } - /* The increadables and teenage mutant ninja turtles require this for NumElements == 0, + /* The Incredibles and Teenage Mutant Ninja Turtles require this for NumElements == 0, TODO: this needs to be tested against windows */ if(*pNumElements == 0) { TRACE("(%p) : Requested the vertex declaration without specefying the size of the return buffer\n", This); @@ -476,7 +476,7 @@ HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration9(IWineD3DVertexDecla return D3D_OK; } - /* just incase there's a simila problem to The increadables and teenage mutant ninja without pNumElements = 0 */ + /* just in case there's a similar problem to The Incredibles and Teenage Mutant Ninja Turtles without pNumElements = 0 */ if (*pNumElements < This->declaration9NumElements) { *pNumElements = This->declaration9NumElements; FIXME("(%p) : Returning D3DERR_MOREDATA numElements %ld expected %u\n", iface, *pNumElements, This->declaration9NumElements); diff --git a/dlls/wininet/tests/wininet_test.h b/dlls/wininet/tests/wininet_test.h index fd7ccbfa147..7791fd402ff 100644 --- a/dlls/wininet/tests/wininet_test.h +++ b/dlls/wininet/tests/wininet_test.h @@ -20,7 +20,7 @@ /* The Windows headers don't define A/W types for any of the following * structures and pointers :-( - * Because for these structures there's not alignment or packing difference + * Because for these structures there's no alignment or packing difference * between the A and W versions, we just define a set of macros so the * generated tests work anyway. */ diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 1aeef1b09dc..d1669bde22e 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -197,12 +197,12 @@ sub parse_api_file($$) { if(!$forbidden) { if(defined($module)) { if($$allowed_modules_unlimited{$type}) { - $output->write("$file: type ($type) already specificed as an unlimited type\n"); + $output->write("$file: type ($type) already specified as an unlimited type\n"); } elsif(!$$allowed_modules{$type}{$module}) { $$allowed_modules{$type}{$module} = 1; $$allowed_modules_limited{$type} = 1; } else { - $output->write("$file: type ($type) already specificed\n"); + $output->write("$file: type ($type) already specified\n"); } } else { $$allowed_modules_unlimited{$type} = 1;