Francois Gouget : Assorted spelling fixes.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Dec 2 09:45:51 CST 2005


Module: wine
Branch: refs/heads/master
Commit: 5127dc9f49d4505d08ceb353467939c0c4f58e04
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5127dc9f49d4505d08ceb353467939c0c4f58e04

Author: Francois Gouget <fgouget at free.fr>
Date:   Fri Dec  2 15:15:09 2005

Assorted spelling fixes.

---

 dlls/ole32/usrmarshal.c              |    4 ++--
 dlls/wined3d/surface.c               |   12 ++++++------
 dlls/winspool/info.c                 |    2 +-
 tools/winapi/msvcmaker               |    4 ++--
 tools/winapi/winapi_check_options.pm |   18 +++++++++---------
 tools/winapi/winapi_extract          |    2 +-
 tools/winebuild/utils.c              |    2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 294be08..3bd46cb 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -333,7 +333,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU
 
             size = *(ULONG *)pBuffer;
             pBuffer += sizeof(ULONG);
-            /* redunancy is bad - it means you have to check consistancy like
+            /* redundancy is bad - it means you have to check consistency like
              * this: */
             if (*(ULONG *)pBuffer != handle)
             {
@@ -341,7 +341,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU
                 return pBuffer;
             }
             pBuffer += sizeof(ULONG);
-            /* redunancy is bad - it means you have to check consistancy like
+            /* redundancy is bad - it means you have to check consistency like
              * this: */
             if (*(ULONG *)pBuffer != size)
             {
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0aa1446..e1711e6 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -320,19 +320,19 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR
 
     if (0 == This->resource.usage || This->resource.usage & D3DUSAGE_DYNAMIC) {
         /* classic surface  TODO: non 2d surfaces?
-        Thease resources may be POOL_SYSTEMMEM, so they must not access the device */
+        These resources may be POOL_SYSTEMMEM, so they must not access the device */
         TRACE("locking an ordinarary surface\n");
-        /* Check to see if memory has already been allocated fro the sufrace*/
+        /* Check to see if memory has already been allocated from the surface*/
         if (NULL == This->resource.allocatedMemory) { /* TODO: check to see if an update has been performed on the surface (an update could just clobber allocatedMemory */
-            /* Non-systemmemory surfaces */
+            /* Non-system memory surfaces */
 
-            /*Surface has no memory currently allocate to it!*/
+            /*Surface has no memory currently allocated to it!*/
             TRACE("(%p) Locking rect\n" , This);
             This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->pow2Size);
             if (0 != This->glDescription.textureName) {
                 /* Now I have to copy thing bits back */
-                This->activeLock = TRUE; /* When this flag is set to true, laoding the surface again won't free THis->resource.allocatedMemory */
-                /* TODO: make activeLock a bit more intelegent, maybe implement a method to purge the texture memory. */
+                This->activeLock = TRUE; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */
+                /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */
                 ENTER_GL();
     
                 /* Make sure that the texture is loaded */
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index ffee18a..3bdd01d 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -3243,7 +3243,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr
  * RETURNS
  *   Success: TRUE  and in pcbNeeded the Bytes used in pDriverDirectory
  *   Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory,
- *   if cbBuf is to small
+ *   if cbBuf is too small
  * 
  *   Native Values returned in pDriverDirectory on Success:
  *|  NT(Windows NT x86):  "%winsysdir%\\spool\\DRIVERS\\w32x86" 
diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker
index fd40f3d..1d31ae0 100755
--- a/tools/winapi/msvcmaker
+++ b/tools/winapi/msvcmaker
@@ -52,7 +52,7 @@ sub read_spec_file($) {
     while($lookahead || defined($_ = <IN>)) {
 	$lookahead = 0;
 
-	s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line
+	s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line
 	s/^(.*?)\s*#.*$/$1/;  # remove comments
 	/^$/ && next;         # skip empty lines
 
@@ -137,7 +137,7 @@ MAKEFILE_IN: foreach my $makefile_in_fil
 	    $again = 0;
 	}
 
-	s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line
+	s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line
 	s/^(.*?)\s*#.*$/$1/;  # remove comments
 	/^$/ && next;         # skip empty lines
 
diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm
index cd788fd..cccfaa4 100644
--- a/tools/winapi/winapi_check_options.pm
+++ b/tools/winapi/winapi_check_options.pm
@@ -75,7 +75,7 @@ my %options_long = (
     "calling-convention-win16" => { default => 0, parent => "calling-convention", description => "calling convention checking (Win16)" },
     "calling-convention-win32" => { default => 1, parent => "calling-convention", description => "calling convention checking (Win32)" },
     "misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" },
-    "statements"  => { default => 0, parent => "local", description => "check for statements inconsistances" },
+    "statements"  => { default => 0, parent => "local", description => "check for statements inconsistencies" },
     "cross-call" => { default => 0, parent => ["statements", "win16", "win32"],  description => "check for cross calling functions" },
     "cross-call-win32-win16" => {
 	default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16"
@@ -83,7 +83,7 @@ my %options_long = (
     "cross-call-unicode-ascii" => {
 	default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII"
     },
-    "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" },
+    "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistencies" },
 
     "comments" => {
 	default => 1,
@@ -99,36 +99,36 @@ my %options_long = (
     "documentation" => {
 	default => 1,
 	parent => "local",
-	description => "check for documentation inconsistances"
+	description => "check for documentation inconsistencies"
 	},
     "documentation-pedantic" => {
 	default => 0,
 	parent => "documentation",
-	description => "be pendantic when checking for documentation inconsistances"
+	description => "be pendantic when checking for documentation inconsistencies"
 	},
 
     "documentation-arguments" => {
 	default => 1,
 	parent => "documentation",
-	description => "check for arguments documentation inconsistances\n"
+	description => "check for arguments documentation inconsistencies\n"
 	},
     "documentation-comment-indent" => {
 	default => 0,
-	parent => "documentation", description => "check for documentation comment indent inconsistances"
+	parent => "documentation", description => "check for documentation comment indent inconsistencies"
 	},
     "documentation-comment-width" => {
 	default => 0,
-	parent => "documentation", description => "check for documentation comment width inconsistances"
+	parent => "documentation", description => "check for documentation comment width inconsistencies"
 	},
     "documentation-name" => {
 	default => 1,
 	parent => "documentation",
-	description => "check for documentation name inconsistances\n"
+	description => "check for documentation name inconsistencies\n"
 	},
     "documentation-ordinal" => {
 	default => 1,
 	parent => "documentation",
-	description => "check for documentation ordinal inconsistances\n"
+	description => "check for documentation ordinal inconsistencies\n"
 	},
     "documentation-wrong" => {
 	default => 1,
diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract
index 70b3f5a..040f228 100755
--- a/tools/winapi/winapi_extract
+++ b/tools/winapi/winapi_extract
@@ -70,7 +70,7 @@ if($options->spec_files || $options->win
 	while($lookahead || defined($_ = <IN>)) {
 	    $lookahead = 0;
 
-	    s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line
+	    s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line
 	    s/^(.*?)\s*#.*$/$1/;  # remove comments
 	    /^$/ && next;         # skip empty lines
 
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index dbfa07c..a4cbb6f 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -417,7 +417,7 @@ const char *get_stub_name( const ORDDEF 
  *
  * The reason gas is written this way is that it's trying to mimick
  * native assemblers for the various architectures it runs on.  gas
- * provides other directives that work consistantly across
+ * provides other directives that work consistently across
  * architectures, but of course we want to work on all arches with or
  * without gas.  Hence this function.
  *




More information about the wine-cvs mailing list