Assorted spelling fixes.

Francois Gouget fgouget at free.fr
Wed Mar 18 02:44:56 CDT 2015


---
 dlls/d3d10core/tests/device.c     | 2 +-
 dlls/d3d8/tests/device.c          | 2 +-
 dlls/d3d9/tests/visual.c          | 2 +-
 dlls/dinput/joystick.c            | 8 ++++----
 dlls/kernel32/tests/volume.c      | 2 +-
 dlls/mshtml/htmlelem.c            | 2 +-
 dlls/mshtml/htmlobject.c          | 2 +-
 dlls/ntdll/tests/reg.c            | 2 +-
 dlls/ole32/compobj.c              | 2 +-
 dlls/ole32/pointermoniker.c       | 2 +-
 dlls/sane.ds/sane_main.c          | 2 +-
 dlls/shell32/shellpath.c          | 2 +-
 dlls/shell32/shfldr_unixfs.c      | 2 +-
 dlls/shell32/shlfileop.c          | 4 ++--
 dlls/urlmon/sec_mgr.c             | 2 +-
 dlls/wined3d/arb_program_shader.c | 2 +-
 programs/cmd/builtins.c           | 2 +-
 programs/winedbg/break.c          | 2 +-
 tools/wrc/parser.y                | 2 +-
 19 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 68012ac..f8a74eb 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -1238,7 +1238,7 @@ struct gs_out
 };
 
 [maxvertexcount(4)]
-void main(point float4 vin[1] : POSTION, inout TriangleStream<gs_out> vout)
+void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout)
 {
     float offset = 0.1 * vin[0].w;
     gs_out v;
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index c8aa724..411f61a 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -2739,7 +2739,7 @@ static void test_wndproc(void)
 
     /* ShowWindow(SW_RESTORE); SetForegroundWindow(desktop); SetForegroundWindow(focus);
      * results in the second SetForegroundWindow call failing and the device not being
-     * restored on native. Directly useing ShowWindow(SW_RESTORE) works, but it means
+     * restored on native. Directly using ShowWindow(SW_RESTORE) works, but it means
      * we cannot test for the absence of WM_WINDOWPOSCHANGED messages. */
     expect_messages = reactivate_messages_filtered;
     ShowWindow(focus_window, SW_RESTORE);
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index a345af1..92c797a 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -17382,7 +17382,7 @@ static void test_signed_formats(void)
     D3DCAPS9 caps;
     ULONG refcount;
 
-    /* The input data was designed for D3DFMT_L6V5U5 and then transfered
+    /* The input data was designed for D3DFMT_L6V5U5 and then transferred
      * to the other formats because L6V5U5 is the lowest precision format.
      * It tests the extreme values -1.0 (-16) and 1.0 (15) for U/V and
      * 0.0 (0) and 1.0 (63) for L, the neutral point 0 as well as -1 and 1.
diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
index edbb64e..547ba56 100644
--- a/dlls/dinput/joystick.c
+++ b/dlls/dinput/joystick.c
@@ -409,13 +409,13 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps)
     TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags);
     switch(type)
     {
-        /* Directx <= 7 definitions */
+        /* Direct X <= 7 definitions */
         DEBUG_TYPE(DIDEVTYPE_DEVICE);
         DEBUG_TYPE(DIDEVTYPE_MOUSE);
         DEBUG_TYPE(DIDEVTYPE_KEYBOARD);
         DEBUG_TYPE(DIDEVTYPE_JOYSTICK);
         DEBUG_TYPE(DIDEVTYPE_HID);
-        /* Directx >= 8 definitions */
+        /* Direct X >= 8 definitions */
         DEBUG_TYPE(DI8DEVTYPE_DEVICE);
         DEBUG_TYPE(DI8DEVTYPE_MOUSE);
         DEBUG_TYPE(DI8DEVTYPE_KEYBOARD);
@@ -742,7 +742,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
         DWORD type = 0x000000ff & (lpdiaf->rgoAction[i].dwSemantic >> 8);
         DWORD genre = 0xff000000 & lpdiaf->rgoAction[i].dwSemantic;
 
-        /* Don't touch an user configured action */
+        /* Don't touch a user configured action */
         if (lpdiaf->rgoAction[i].dwHow == DIAH_USERCONFIG) continue;
 
         /* Only consider actions of the right genre */
@@ -752,7 +752,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
         {
             if (type & object_types[j])
             {
-                /* Assure that the object exists */
+                /* Ensure that the object exists */
                 LPDIOBJECTDATAFORMAT odf = dataformat_to_odf_by_type(This->base.data_format.wine_df, inst, object_types[j]);
 
                 if (odf != NULL)
diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index 61da509..e934dee 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -535,7 +535,7 @@ static void test_enum_vols(void)
     /*get windows drive letter and update strings for testing  */
     ret = GetWindowsDirectoryA( windowsdir, sizeof(windowsdir) );
     ok(ret < sizeof(windowsdir), "windowsdir is abnormally long!\n");
-    ok(ret != 0, "GetWindowsDirecory: error %d\n", GetLastError());
+    ok(ret != 0, "GetWindowsDirectory: error %d\n", GetLastError());
     path[0] = windowsdir[0];
 
     /* get the unique volume name for the windows drive  */
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index dfb8be5..d2e9f27 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -652,7 +652,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr
     TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue);
 
     if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING))
-        FIXME("Unsuported flags %x\n", lFlags);
+        FIXME("Unsupported flags %x\n", lFlags);
 
     hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName,
             lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid);
diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c
index d2f6c95..e7dbe9a 100644
--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@@ -586,7 +586,7 @@ static HRESULT WINAPI HTMLObjectElement2_put_classid(IHTMLObjectElement2 *iface,
         return hres;
 
     if(This->plugin_container.plugin_host) {
-        FIXME("Host already asociated.\n");
+        FIXME("Host already associated.\n");
         return E_NOTIMPL;
     }
 
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 691a6b7..0af009f 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -725,7 +725,7 @@ static void test_NtQueryLicenseKey(void)
     type = 0xdead;
     len = 0xbeef;
     status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len);
-    ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected suceeded\n");
+    ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n");
     ok(type == 0xdead, "expected unmodified value for type, got %u\n", type);
     ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len);
 
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index e2efe58..d842aaf 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2218,7 +2218,7 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id )
 /******************************************************************************
  *		IIDFromString   [OLE32.@]
  *
- * Converts a interface identifier from its string representation into
+ * Converts an interface identifier from its string representation to
  * the IID struct.
  *
  * PARAMS
diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c
index 212a8aa..3589685 100644
--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -108,7 +108,7 @@ PointerMonikerImpl_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0)
     {
         if (This->pObject) IUnknown_Release(This->pObject);
diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c
index 7484ca5..5c0f56f 100644
--- a/dlls/sane.ds/sane_main.c
+++ b/dlls/sane.ds/sane_main.c
@@ -176,7 +176,7 @@ static TW_UINT16 SANE_SourceControlHandler (
                 default:
                     twRC = TWRC_FAILURE;
                     activeDS.twCC = TWCC_CAPBADOPERATION;
-                    FIXME("unrecognized opertion triplet\n");
+                    FIXME("unrecognized operation triplet\n");
                     break;
             }
             break;
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 84e663b..c510624 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -2682,7 +2682,7 @@ static void _SHCreateSymbolicLinks(void)
             strcpy(szPersonalTarget, pszHome);
         }
 
-        /* Replace 'My Documents' directory with a symlink of fail silently if not empty. */
+        /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */
         rmdir(pszPersonal);
         symlink(szPersonalTarget, pszPersonal);
     }
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index b70cae8..b3b0214 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -384,7 +384,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) {
  *
  * RETURNS
  *  Success, TRUE
- *  Failure, FALSE - Path not existent, too long, insufficient rights, too many symlinks
+ *  Failure, FALSE - Nonexistent path, too long, insufficient rights, too many symlinks
  */
 static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath)
 {
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index e7e24e0..bd44457 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -662,7 +662,7 @@ static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists)
  *  ERROR_PATH_NOT_FOUND can't find the path, probably invalid
  *  ERROR_INVALID_NAME if the path contains invalid chars
  *  ERROR_ALREADY_EXISTS when the directory already exists
- *  ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
+ *  ERROR_FILENAME_EXCED_RANGE if the filename was too long to process
  *
  * NOTES
  *  exported by ordinal
@@ -694,7 +694,7 @@ DWORD WINAPI SHCreateDirectory(HWND hWnd, LPCVOID path)
  *  ERROR_INVALID_NAME if the path contains invalid chars
  *  ERROR_FILE_EXISTS when a file with that name exists
  *  ERROR_ALREADY_EXISTS when the directory already exists
- *  ERROR_FILENAME_EXCED_RANGE if the filename was to long to process
+ *  ERROR_FILENAME_EXCED_RANGE if the filename was too long to process
  *
  *  FIXME: Not implemented yet;
  *  SHCreateDirectoryEx also verifies that the files in the directory will be visible
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index cfc68de..0c20562 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -895,7 +895,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManagerEx2* iface)
 
     TRACE("(%p) ref=%u\n", This, refCount);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (!refCount){
         if(This->mgrsite)
             IInternetSecurityMgrSite_Release(This->mgrsite);
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index e7ee1c1..69cf687 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -254,7 +254,7 @@ struct shader_arb_ctx_priv
     {
         /* plain GL_ARB_vertex_program or GL_ARB_fragment_program */
         ARB,
-        /* GL_NV_vertex_progam2_option or GL_NV_fragment_program_option */
+        /* GL_NV_vertex_program2_option or GL_NV_fragment_program_option */
         NV2,
         /* GL_NV_vertex_program3 or GL_NV_fragment_program2 */
         NV3
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 992ca5c..724da20 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1708,7 +1708,7 @@ static BOOL WCMD_parse_forf_options(WCHAR *options, WCHAR *eol, int *skip,
  *  options    [I] The remaining list of directories still to process
  *
  * Note this routine inserts the subdirectories found between the entry being
- * processed, and any other directory still to be processed, mimicing what
+ * processed, and any other directory still to be processed, mimicking what
  * Windows does
  */
 static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) {
diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c
index c0d5663..cedeed7 100644
--- a/programs/winedbg/break.c
+++ b/programs/winedbg/break.c
@@ -504,7 +504,7 @@ void break_delete_xpoints_from_module(DWORD64 base)
     DWORD_PTR                   linear;
     struct dbg_breakpoint*      bp = dbg_curr_process->bp;
 
-    /* FIXME: should do it also on the ELF sibbling if any */
+    /* FIXME: should do it also on the ELF sibling if any */
     im.SizeOfStruct = sizeof(im);
     im_elf.SizeOfStruct = sizeof(im_elf);
     if (!SymGetModuleInfo64(dbg_curr_process->handle, base, &im)) return;
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 0005207..7ffc9c8 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -331,7 +331,7 @@ resource_file
 		/* Find the tail again */
 		while($1 && $1->next)
 			$1 = $1->next;
-		/* Now add any fontdirecory */
+		/* Now add any fontdirectory */
 		rsc = build_fontdirs($1);
 		/* 'build_fontdir' returns a head and $1 is a tail */
 		if($1)
-- 
2.1.4



More information about the wine-patches mailing list