From 4c8e218252d852d62562ca2029c2f8cc4de03484 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Wed, 13 Feb 2008 22:11:01 +0100 Subject: [PATCH] Assorted spelling fixes. --- dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/colordlg16.c | 2 +- dlls/comdlg32/filedlg.c | 8 ++++---- dlls/comdlg32/filedlg16.c | 4 ++-- dlls/comdlg32/printdlg.c | 2 +- dlls/crypt32/rootstore.c | 2 +- dlls/crypt32/tests/msg.c | 2 +- dlls/crypt32/tests/store.c | 2 +- dlls/ctapi32/ctapi.h | 2 +- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/device.c | 14 +++++++------- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/visual.c | 4 ++-- dlls/localspl/localspl_main.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/ole32/stg_bigblockfile.c | 2 +- dlls/urlmon/tests/stream.c | 2 +- dlls/urlmon/tests/url.c | 2 +- include/wine/mscvpdb.h | 2 +- programs/cmd/builtins.c | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 777b0bd8d2a..cb76e7b110b 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -80,7 +80,7 @@ typedef struct CCPRIVATE RECT fullsize; /* original dialog window size */ UINT msetrgb; /* # of SETRGBSTRING message (today not used) */ RECT old3angle; /* last position of l-marker */ - RECT oldcross; /* last position of color/satuation marker */ + RECT oldcross; /* last position of color/saturation marker */ BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */ int h; int s; diff --git a/dlls/comdlg32/colordlg16.c b/dlls/comdlg32/colordlg16.c index 7680239da1e..adbcf9862a7 100644 --- a/dlls/comdlg32/colordlg16.c +++ b/dlls/comdlg32/colordlg16.c @@ -58,7 +58,7 @@ typedef struct CCPRIVATE RECT fullsize; /* original dialog window size */ UINT msetrgb; /* # of SETRGBSTRING message (today not used) */ RECT old3angle; /* last position of l-marker */ - RECT oldcross; /* last position of color/satuation marker */ + RECT oldcross; /* last position of color/saturation marker */ BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */ int h; int s; diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3e9c692b3e6..38f95ae8c57 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1834,7 +1834,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile)); - /* if the user specifyed a fully qualified path use it */ + /* if the user specified a fully qualified path use it */ if(PathIsRelativeW(lpstrFileList)) { lstrcatW(lpstrPathAndFile, lpstrFileList); @@ -3681,7 +3681,7 @@ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs) priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; - /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */ + /* offsets are not guaranteed to be the same in WCHAR to MULTIBYTE conversion */ /* set filename offset */ lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile); priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile); @@ -3813,7 +3813,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg, * * Creates a win31 style dialog box for the user to select a file to open/save. */ -static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with data*/ +static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* address of structure with data*/ UINT dlgType /* type dialogue : open/save */ ) { @@ -3844,7 +3844,7 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with da * * Creates a win31 style dialog box for the user to select a file to open/save */ -static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* addess of structure with data*/ +static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with data*/ UINT dlgType /* type dialogue : open/save */ ) { diff --git a/dlls/comdlg32/filedlg16.c b/dlls/comdlg32/filedlg16.c index bf9325d09e5..a722a2b8d4e 100644 --- a/dlls/comdlg32/filedlg16.c +++ b/dlls/comdlg32/filedlg16.c @@ -73,7 +73,7 @@ static void FD16_MapOfnStruct16(const OPENFILENAME16 *ofn16, LPOPENFILENAMEW ofn if (HIWORD(ofn16->lpTemplateName)) ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName); else - ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */ + ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* resource number */ /* now calls the 32 bits Ansi to Unicode version to complete the job */ FD31_MapOfnStructA(&ofnA, ofnW, open); } @@ -485,7 +485,7 @@ BOOL16 WINAPI GetOpenFileName16( * unknown. There are some FIXME's left. */ BOOL16 WINAPI GetSaveFileName16( - SEGPTR ofn /* [in/out] addess of structure with data*/ + SEGPTR ofn /* [in/out] address of structure with data*/ ) { HINSTANCE16 hInst; diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 153fceb55d3..75da0275307 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3246,7 +3246,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) GWLP_WNDPROC, (ULONG_PTR)PRINTDLG_PagePaintProc); - /* FIXME: Paint hook. Must it be at begin of initializtion or at end? */ + /* FIXME: Paint hook. Must it be at begin of initialization or at end? */ res = TRUE; if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { if (!pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga)) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 435cbc33683..e41f74a078f 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -97,7 +97,7 @@ static BOOL add_line_to_buffer(struct DynamicBuffer *buffer, LPCSTR line) } /* Reads any base64-encoded certificates present in fp and adds them to store. - * Returns TRUE if any certifcates were successfully imported. + * Returns TRUE if any certificates were successfully imported. */ static BOOL import_base64_certs_from_fp(FILE *fp, HCERTSTORE store) { diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 47321af6e74..ab35b3a19e5 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1921,7 +1921,7 @@ static void test_decode_msg_update(void) "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg); - /* An empty message can be opened with indetermined type.. */ + /* An empty message can be opened with undetermined type.. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, dataEmptyContent, sizeof(dataEmptyContent), TRUE); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 95c8054d0a2..db1447a0b45 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1942,7 +1942,7 @@ static void test_I_UpdateStore(void) } CertDeleteCertificateFromStore(cert); - /* If a context is deleted from store2, I_CertUpdateStore delets it + /* If a context is deleted from store2, I_CertUpdateStore deletes it * from store1 */ ret = pI_CertUpdatestore(store1, store2, 0, 0); diff --git a/dlls/ctapi32/ctapi.h b/dlls/ctapi32/ctapi.h index 89edb47b985..6ab7146e7d8 100644 --- a/dlls/ctapi32/ctapi.h +++ b/dlls/ctapi32/ctapi.h @@ -21,7 +21,7 @@ #ifndef H_CTAPI #define H_CTAPI -/* More uniqe defines */ +/* More unique defines */ #define CT_API_AD_HOST 2 #define CT_API_AD_REMOTE 5 diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1b0618f7a43..d3efb42d0c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -940,7 +940,7 @@ static void test_shader(void) HeapFree(GetProcessHeap(), 0, data); /* Verify that we can retrieve the shader function */ hr = IDirect3DDevice8_GetVertexShaderFunction(pDevice, hVertexShader, NULL, &data_size); - ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderFucntion returned %#08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderFunction returned %#08x\n", hr); ok(data_size == simple_vs_size, "Got data_size %u, expected %u\n", data_size, simple_vs_size); data = HeapAlloc(GetProcessHeap(), 0, simple_vs_size); data_size = 1; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0f1654de9d8..0d2f53b807a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -805,7 +805,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); ZeroMemory(&vp, sizeof(vp)); hr = IDirect3DDevice9_GetViewport(pDevice, &vp); @@ -848,7 +848,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); @@ -901,7 +901,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); /* Scratch, sysmem and managed pools are fine */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &surface, NULL); @@ -909,7 +909,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface, NULL); @@ -917,7 +917,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_CreateTexture(pDevice, 16, 16, 0, 0, D3DFMT_R5G6B5, D3DPOOL_MANAGED, &texture, NULL); @@ -925,7 +925,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DTexture9_Release(texture); /* A reference held to an implicit surface causes failures as well */ @@ -939,7 +939,7 @@ static void test_reset(void) hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); - ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successfull reset returned %#x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); /* Shaders are fine as well */ hr = IDirect3DDevice9_CreateVertexShader(pDevice, simple_vs, &shader); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c8b3d5dc872..a167806c337 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -744,7 +744,7 @@ IDirectDrawSurfaceImpl_Flip(IDirectDrawSurface7 *iface, * Params: * DestRect: Destination rectangle, can be NULL * SrcSurface: Source surface, can be NULL - * SrcRect: Source rectange, can be NULL + * SrcRect: Source rectangle, can be NULL * Flags: Blt flags * DDBltFx: Some extended blt parameters, connected to the flags * diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 1f965e1d29e..7186f48cf14 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1072,7 +1072,7 @@ static void D3D1_TextureMapBlendTest(void) {0.0f, 480.0f, 0.0f, 1.0f, 0x008000ff, 0, 0.0f, 1.0f} }; - /* 1) Test alpha with DDPF_ALPHAPIXELS texture - should be be taken from texture alpha channel*/ + /* 1) Test alpha with DDPF_ALPHAPIXELS texture - should be taken from texture alpha channel*/ memset (&ddsd, 0, sizeof (ddsd)); ddsd.dwSize = sizeof (ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; @@ -1199,7 +1199,7 @@ static void D3D1_TextureMapBlendTest(void) blue = (color & 0x000000ff); ok(red == 0 && green == 0 && blue == 0xff, "Got color %08x, expected 000000ff or near\n", color); - /* 2) Test alpha with texture that has no alpha channel - alpha should be be taken from diffuse color */ + /* 2) Test alpha with texture that has no alpha channel - alpha should be taken from diffuse color */ if(Texture) IDirect3DTexture_Release(Texture); Texture = NULL; if(TexSurface) IDirectDrawSurface_Release(TexSurface); diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 3cb477e5999..77fb730bf37 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -193,7 +193,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) if ((name[0] != '\\') || (name[1] != '\\')) return 0; server = &name[2]; - /* skip over both backslash, find seperator '\' */ + /* skip over both backslash, find separator '\' */ ptr = strchrW(server, '\\'); serverlen = (ptr) ? ptr - server : lstrlenW(server); diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index c741f24d1af..549e9e4da41 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -70,7 +70,7 @@ static HRESULT WINAPI domfrag_QueryInterface( } else { - FIXME("Unsupported inteferace %s\n", debugstr_guid(riid)); + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 8902152bb15..a4634a9b1b2 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -70,7 +70,7 @@ static HRESULT WINAPI entityref_QueryInterface( } else { - FIXME("Unsupported inteferace %s\n", debugstr_guid(riid)); + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 0fe2a3b7090..2c89a3d5ea3 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -358,7 +358,7 @@ void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize) /* * unmap all views, must be done before call to SetEndFile * - * Just ditch the victim list because there is no guarentee we will need them + * Just ditch the victim list because there is no guarantee we will need them * and it is not worth the performance hit to unmap and remap them all. */ BIGBLOCKFILE_DeleteList(This, This->victimhead); diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 12133f9e730..72a1d43c61c 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -167,7 +167,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP ok(szStatusText != NULL, "szStatusText == NULL\n"); break; default: - todo_wine { ok(0, "unexpexted code %d\n", ulStatusCode); } + todo_wine { ok(0, "unexpected code %d\n", ulStatusCode); } }; return S_OK; } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index dec6da88e33..6cb9dc56a5f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1226,7 +1226,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP ok(szStatusText == NULL, "Expected szStatusText to be NULL\n"); break; default: - ok(0, "unexpexted code %d\n", ulStatusCode); + ok(0, "unexpected code %d\n", ulStatusCode); }; return S_OK; } diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 8ea37e1d455..4f4a41aace7 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -81,7 +81,7 @@ * For the evolution of types, the need of the second flavor was the * number of types to be defined (limited to 0xFFFF, including the C * basic types); the need of the third flavor is the increase of - * symbol size (to be greated than 256), which was likely needed for + * symbol size (to be greater than 256), which was likely needed for * complex C++ types (nested + templates). * * It's somehow difficult to represent the layout of those types on diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 549795c1df8..fa033d97ba2 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1525,7 +1525,7 @@ void WCMD_rename (void) { part otherwise use supplied name. This supports: ren *.fred *.jim ren jim.* fred.* etc - However, windows has a more complex algorithum supporting eg + However, windows has a more complex algorithm supporting eg ?'s and *'s mid name */ dotSrc = strchrW(fd.cFileName, '.'); -- 2.11.4.GIT