diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 3e8ba4e0731..4e81e9faba8 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -118,7 +118,7 @@ static DM_FUNC template_func[] = static PROXYHANDLE gProxyHandle = {NULL, FALSE, FALSE, FALSE, ERROR_LIBRARY_NOT_FOUND}; -SQLRETURNTYPE SQLDummyFunc() +SQLRETURN SQLDummyFunc() { TRACE("SQLDummyFunc: \n"); return SQL_SUCCESS; diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 82d07aa12c3..6c7d65e2852 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -142,7 +142,7 @@ ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) if (This->ref==0){ - /* release all registred objects */ + /* release all registered objects */ BindCtxImpl_ReleaseBoundObjects((IBindCtx*)This); BindCtxImpl_Destroy(This); diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index c0cd32379db..2e65c44da54 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -2,7 +2,7 @@ * HGLOBAL Stream implementation * * This file contains the implementation of the stream interface - * for streams contained suported by an HGLOBAL pointer. + * for streams contained supported by an HGLOBAL pointer. * * Copyright 1999 Francis Beaudet */ diff --git a/graphics/ttydrv/bitmap.c b/graphics/ttydrv/bitmap.c index 75e07e00246..18a40d12292 100644 --- a/graphics/ttydrv/bitmap.c +++ b/graphics/ttydrv/bitmap.c @@ -131,15 +131,15 @@ HBITMAP TTYDRV_DC_BITMAP_SelectObject(DC *dc, HBITMAP hbitmap, BITMAPOBJ *bitmap TRACE("(%p, 0x%04x, %p)\n", dc, hbitmap, bitmap); if(!(dc->w.flags & DC_MEMORY)) - return NULL; + return 0; /* Assure that the bitmap device dependent */ if(!bitmap->DDBitmap && !TTYDRV_DC_CreateBitmap(hbitmap)) - return NULL; + return 0; if(bitmap->DDBitmap->funcs != dc->funcs) { ERR("Trying to select a non-TTY DDB into a TTY DC\n"); - return NULL; + return 0; } dc->w.totalExtent.left = 0; @@ -155,7 +155,7 @@ HBITMAP TTYDRV_DC_BITMAP_SelectObject(DC *dc, HBITMAP hbitmap, BITMAPOBJ *bitmap HRGN hrgn; if(!(hrgn = CreateRectRgn(0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight))) - return NULL; + return 0; dc->w.hVisRgn = hrgn; } diff --git a/misc/ddeml.c b/misc/ddeml.c index 26d75c53426..c9d527c6ecc 100644 --- a/misc/ddeml.c +++ b/misc/ddeml.c @@ -541,7 +541,7 @@ UINT WINAPI DdeInitializeW( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes ) { -/* probably not really capable of handling mutliple processes, but should handle +/* probably not really capable of handling multiple processes, but should handle * multiple instances within one process */ SECURITY_ATTRIBUTES *s_att= NULL; diff --git a/misc/version.c b/misc/version.c index 8ed9cc473e5..993f8f7d5ee 100644 --- a/misc/version.c +++ b/misc/version.c @@ -242,7 +242,7 @@ DWORD VERSION_GetLinkedDllVersion(PDB *pdb) WinVersion = DllVersion; else { if (WinVersion != DllVersion) { - ERR("You mixed system dlls from different windows versions! Expect a chrash!\n"); + ERR("You mixed system dlls from different windows versions! Expect a crash!\n"); return WIN31; /* this may let the exe exiting */ } } diff --git a/win32/process.c b/win32/process.c index 320447d5064..6a3a894a789 100644 --- a/win32/process.c +++ b/win32/process.c @@ -32,7 +32,7 @@ DEFAULT_DEBUG_CHANNEL(win32) * no need in offset correction, like in UnixTimeToFileTime * FIXME: This function should be moved to a more appropriate .c file * FIXME: On floating point operations, it is assumed that - * floating values are truncated on convertion to integer. + * floating values are truncated on conversion to integer. */ void Process_ClockTimeToFileTime( clock_t unix_time, LPFILETIME filetime ) { diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c index 5271ccce136..1ab2c673954 100644 --- a/windows/x11drv/wnd.c +++ b/windows/x11drv/wnd.c @@ -690,7 +690,7 @@ void X11DRV_WND_SurfaceCopy(WND* wndPtr, DC *dcPtr, INT dx, INT dy, void X11DRV_WND_SetDrawable(WND *wndPtr, DC *dc, WORD flags, BOOL bSetClipOrigin) { X11DRV_PDEVICE *physDev = (X11DRV_PDEVICE *)dc->physDev; - INT dcOrgXCopy, dcOrgYCopy; + INT dcOrgXCopy = 0, dcOrgYCopy = 0; BOOL offsetClipRgn = FALSE; if (!wndPtr) /* Get a DC for the whole screen */