From 3ca761220a9d6a44f9ced931cd7d0c0e1cd0fea8 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 15 Jul 2003 20:53:39 +0000 Subject: [PATCH] Spelling fixes (s/occured/occurred/ and variants). --- dlls/ddraw/d3ddevice/mesa.c | 2 +- dlls/ntdll/exception.c | 2 +- dlls/shell32/changenotify.c | 2 +- dlls/x11drv/scroll.c | 2 +- include/ddraw.h | 2 +- loader/ne/module.c | 2 +- programs/winedbg/hash.c | 2 +- server/file.h | 2 +- tools/wineconf.libs/general.eng | 2 +- tools/wineconf.libs/wineconf.eng | 2 +- tools/winemaker.man | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index 0f43c87df13..0d7e54dcf61 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -969,7 +969,7 @@ static void draw_primitive_handle_GL_state(IDirect3DDeviceImpl *This, } /* 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) { diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 05aec881bf6..6a2c5797d66 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -415,7 +415,7 @@ DWORD __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *frame, /************************************************************* * __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 ) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 77d78a4a2bb..29292bbeb73 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -39,7 +39,7 @@ typedef struct _NOTIFICATIONLIST 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*/ diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index af5676c1eda..3319567caf0 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -154,7 +154,7 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy, 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) diff --git a/include/ddraw.h b/include/ddraw.h index 3d7c275ba85..e7922b395a7 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -820,7 +820,7 @@ typedef struct _DDPIXELFORMAT { /* 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 diff --git a/loader/ne/module.c b/loader/ne/module.c index 48e7f8c29d5..0e65b946d15 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -1040,7 +1040,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ break; } } - return hinst; /* The last error that occured */ + return hinst; /* The last error that occurred */ } diff --git a/programs/winedbg/hash.c b/programs/winedbg/hash.c index 00ad4d10131..d3683fb7879 100644 --- a/programs/winedbg/hash.c +++ b/programs/winedbg/hash.c @@ -364,7 +364,7 @@ BOOL DEBUG_Normalize(struct name_hash * nh ) * 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, diff --git a/server/file.h b/server/file.h index e558a354bf3..8bc09e9b1b9 100644 --- a/server/file.h +++ b/server/file.h @@ -32,7 +32,7 @@ struct fd_ops { /* 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 **); diff --git a/tools/wineconf.libs/general.eng b/tools/wineconf.libs/general.eng index 9ff0c29d546..3f435f92327 100644 --- a/tools/wineconf.libs/general.eng +++ b/tools/wineconf.libs/general.eng @@ -58,7 +58,7 @@ set ScrollEdits "Scroll to bottom on input" 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\ diff --git a/tools/wineconf.libs/wineconf.eng b/tools/wineconf.libs/wineconf.eng index 95ca21dfe6f..151238ab1fa 100644 --- a/tools/wineconf.libs/wineconf.eng +++ b/tools/wineconf.libs/wineconf.eng @@ -164,6 +164,6 @@ set DejaConf "Use existing config file:" 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" diff --git a/tools/winemaker.man b/tools/winemaker.man index ea2742e94a4..b76e1385f7d 100644 --- a/tools/winemaker.man +++ b/tools/winemaker.man @@ -132,7 +132,7 @@ winspool.drv. .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 -- 2.11.4.GIT