Changelog:
* dlls/ddraw/d3ddevice/mesa.c,
dlls/ntdll/exception.c,
dlls/shell32/changenotify.c,
dlls/x11drv/scroll.c,
include/ddraw.h,
loader/ne/module.c,
programs/winedbg/hash.c,
server/file.h,
tools/winemaker.man,
tools/wineconf.libs/general.eng,
tools/wineconf.libs/wineconf.eng
Spelling fixes (s/occured/occurred/ and variants).
Index: dlls/ddraw/d3ddevice/mesa.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3ddevice/mesa.c,v
retrieving revision 1.128
diff -u -r1.128 mesa.c
--- dlls/ddraw/d3ddevice/mesa.c 11 Jul 2003 03:50:43 -0000 1.128
+++ dlls/ddraw/d3ddevice/mesa.c 12 Jul 2003 11:14:58 -0000
@@ -969,7 +969,7 @@
}
/* TODO: optimize this to not always reset all the fog stuff on all DrawPrimitive call
- if no fogging state change occured */
+ if no fogging state change occurred */
if (This->state_block.render_state[D3DRENDERSTATE_FOGENABLE - 1] == TRUE) {
if (vertex_transformed == TRUE) {
if (glThis->fogging != 0) {
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.54
diff -u -r1.54 exception.c
--- dlls/ntdll/exception.c 21 Mar 2003 23:45:26 -0000 1.54
+++ dlls/ntdll/exception.c 12 Jul 2003 11:15:01 -0000
@@ -415,7 +415,7 @@
/*************************************************************
* __wine_callto16_handler
*
- * Handler for exceptions occuring in 16-bit code.
+ * Handler for exceptions occurring in 16-bit code.
*/
DWORD __wine_callto16_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame,
CONTEXT *context, LPVOID pdispatcher )
Index: dlls/shell32/changenotify.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/changenotify.c,v
retrieving revision 1.21
diff -u -r1.21 changenotify.c
--- dlls/shell32/changenotify.c 23 Jun 2003 19:49:40 -0000 1.21
+++ dlls/shell32/changenotify.c 12 Jul 2003 11:15:02 -0000
@@ -39,7 +39,7 @@
LPNOTIFYREGISTER apidl; /* array of entries to watch*/
UINT cidl; /* number of pidls in array */
LONG wEventMask; /* subscribed events */
- LONG wSignalledEvent; /* event that occured */
+ LONG wSignalledEvent; /* event that occurred */
DWORD dwFlags; /* client flags */
LPCITEMIDLIST pidlSignaled; /*pidl of the path that caused the signal*/
Index: dlls/x11drv/scroll.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/scroll.c,v
retrieving revision 1.13
diff -u -r1.13 scroll.c
--- dlls/x11drv/scroll.c 11 May 2003 03:01:42 -0000 1.13
+++ dlls/x11drv/scroll.c 12 Jul 2003 11:15:09 -0000
@@ -154,7 +154,7 @@
DeleteObject( hrgn );
}
- /* Take into account the fact that some damages may have occured during the scroll */
+ /* Take into account the fact that some damage may have occurred during the scroll */
hrgnTemp = CreateRectRgn( 0, 0, 0, 0 );
retVal = GetUpdateRgn( hwnd, hrgnTemp, FALSE );
if (retVal != NULLREGION)
Index: include/ddraw.h
===================================================================
RCS file: /home/wine/wine/include/ddraw.h,v
retrieving revision 1.49
diff -u -r1.49 ddraw.h
--- include/ddraw.h 9 Jul 2003 02:52:57 -0000 1.49
+++ include/ddraw.h 12 Jul 2003 11:15:13 -0000
@@ -820,7 +820,7 @@
/* DDCAPS.dwSVCaps */
/* the first 4 of these are now obsolete */
-#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occured */
+#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch occurred */
#define DDSVCAPS_RESERVED1 0x00000001
#define DDSVCAPS_RESERVED2 0x00000002
#define DDSVCAPS_RESERVED3 0x00000004
Index: loader/ne/module.c
===================================================================
RCS file: /home/wine/wine/loader/ne/module.c,v
retrieving revision 1.133
diff -u -r1.133 module.c
--- loader/ne/module.c 21 May 2003 18:32:17 -0000 1.133
+++ loader/ne/module.c 12 Jul 2003 11:15:14 -0000
@@ -1040,7 +1040,7 @@
break;
}
}
- return hinst; /* The last error that occured */
+ return hinst; /* The last error that occurred */
}
Index: programs/winedbg/hash.c
===================================================================
RCS file: /home/wine/wine/programs/winedbg/hash.c,v
retrieving revision 1.8
diff -u -r1.8 hash.c
--- programs/winedbg/hash.c 9 Jul 2003 22:01:33 -0000 1.8
+++ programs/winedbg/hash.c 12 Jul 2003 11:15:15 -0000
@@ -364,7 +364,7 @@
* Return values:
* gsv_found: if the symbol is found
* gsv_unknown: if the symbol isn't found
- * gsv_aborted: some error occured (likely, many symbols of same name exist,
+ * gsv_aborted: some error occurred (likely, many symbols of same name exist,
* and user didn't pick one of them)
*/
static int DEBUG_GSV_Helper(const char* name, const int lineno,
Index: server/file.h
===================================================================
RCS file: /home/wine/wine/server/file.h,v
retrieving revision 1.8
diff -u -r1.8 file.h
--- server/file.h 15 May 2003 04:22:45 -0000 1.8
+++ server/file.h 12 Jul 2003 11:15:15 -0000
@@ -32,7 +32,7 @@
{
/* get the events we want to poll() for on this object */
int (*get_poll_events)(struct fd *);
- /* a poll() event occured */
+ /* a poll() event occurred */
void (*poll_event)(struct fd *,int event);
/* flush the object buffers */
int (*flush)(struct fd *, struct event **);
Index: tools/winemaker.man
===================================================================
RCS file: /home/wine/wine/tools/winemaker.man,v
retrieving revision 1.2
diff -u -r1.2 winemaker.man
--- tools/winemaker.man 10 Sep 2002 00:20:27 -0000 1.2
+++ tools/winemaker.man 12 Jul 2003 11:15:17 -0000
@@ -132,7 +132,7 @@
.I --wrap
Specifies that executable targets should be built as libraries and a small
executable wrapper generated for them. This technique is sometimes required
-to solve initialization problems occuring on the application startup.
+to solve initialization problems occurring on the application startup.
.TP
.I --nowrap
Specifies that no wrapper should be generated for executable targets. This is
Index: tools/wineconf.libs/general.eng
===================================================================
RCS file: /home/wine/wine/tools/wineconf.libs/general.eng,v
retrieving revision 1.2
diff -u -r1.2 general.eng
--- tools/wineconf.libs/general.eng 10 Mar 2002 00:24:23 -0000 1.2
+++ tools/wineconf.libs/general.eng 12 Jul 2003 11:15:17 -0000
@@ -58,7 +58,7 @@
set EditTitle "TkWine Text Viewer"
set errorTitle "\n*************** TkWine Error ****************\n\
-\n An error occured, that I could not resolve. This might be \n\n\
+\n An error occurred, that I could not resolve. This might be \n\n\
a) An invalid entry \n\
b) An error in the script\n\
In any case, this error should be detected by the script, even an invalid\
Index: tools/wineconf.libs/wineconf.eng
===================================================================
RCS file: /home/wine/wine/tools/wineconf.libs/wineconf.eng,v
retrieving revision 1.2
diff -u -r1.2 wineconf.eng
--- tools/wineconf.libs/wineconf.eng 10 Mar 2002 00:24:23 -0000 1.2
+++ tools/wineconf.libs/wineconf.eng 12 Jul 2003 11:15:17 -0000
@@ -164,6 +164,6 @@
set GiveCustomDefault "Enter (or choose) the configuration file to use"
set GenereConf "Auto-generate a new configuration file"
set TkWBuiltConf "Use TkWine built-in configuration file (not recommended)"
-set AutoConfFail " Warning: An error occured while running tools/wineconf.\n\
+set AutoConfFail " Warning: An error occurred while running tools/wineconf.\n\
You can still edit the generated file (if it does not crashes) but \n\
some parts are probably missing. Check for a newer release of wine where wineconf could have been imporved"
--
Francois Gouget fgouget@free.fr http://fgouget.free.fr/
Computers are like airconditioners
They stop working properly if you open WINDOWS
