From f5c9da6860ae82060dcfadc3124ce4d42321aacc Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 6 May 2005 15:44:31 +0000 Subject: [PATCH] Assorted spelling fixes. --- dlls/comctl32/comctl32undoc.c | 4 ++-- dlls/comctl32/hotkey.c | 2 +- dlls/comctl32/imagelist.c | 2 +- dlls/comctl32/listview.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/dsound/buffer.c | 2 +- dlls/dsound/primary.c | 2 +- dlls/gdi/bitblt.c | 2 +- dlls/gdi/palette.c | 4 ++-- dlls/kernel/profile.c | 6 +++--- dlls/kernel/tests/file.c | 2 +- dlls/kernel/volume.c | 2 +- dlls/kernel/wowthunk.c | 2 +- dlls/ntdll/rtlstr.c | 8 ++++---- dlls/odbc32/proxyodbc.c | 4 ++-- dlls/opengl32/wgl_ext.c | 2 +- dlls/shell32/shell32_En.rc | 6 +++--- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 +- dlls/shlwapi/reg.c | 6 +++--- dlls/winspool/info.c | 2 +- dlls/x11drv/palette.c | 6 +++--- documentation/configuring.sgml | 2 +- documentation/debugging.sgml | 2 +- documentation/opengl.sgml | 2 +- documentation/winedev-coding.sgml | 2 +- documentation/winedev-otherdebug.sgml | 2 +- documentation/winelib-mfc.sgml | 2 +- programs/notepad/En.rc | 2 +- programs/wineconsole/wineconsole.c | 2 +- tools/winegcc/utils.c | 6 +++--- 31 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index e244e2cf3e..038cf46696 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -588,7 +588,7 @@ static void MRU_SaveChanged ( LPWINEMRULIST mp ) if ((err = RegOpenKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, KEY_WRITE, &newkey))) { /* not present - what to do ??? */ - ERR("Can not open key, error=%d, attempting to create\n", + ERR("Could not open key, error=%d, attempting to create\n", err); if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, @@ -980,7 +980,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%lu %lu %lx %lx \"%s\" %p): Can not open key, error=%d\n", + ERR("(%lu %lu %lx %lx \"%s\" %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, err); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index aeb39c4d61..ab8d7465cb 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -54,7 +54,7 @@ typedef struct tagHOTKEY_INFO BYTE CurrMod; INT CaretPos; DWORD ScanCode; - WCHAR strNone[15]; /* hope its long enough ... */ + WCHAR strNone[15]; /* hope it's long enough ... */ } HOTKEY_INFO; static const WCHAR HOTKEY_plussep[] = { ' ', '+', ' ' }; diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 32800453c8..b87309d651 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -98,7 +98,7 @@ static inline BOOL is_valid(HIMAGELIST himl) * nothing * * NOTES - * This function can NOT be used to reduce the number of images. + * This function CANNOT be used to reduce the number of images. */ static void IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e935f43b23..8a9274ce57 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8617,7 +8617,7 @@ static LRESULT LISTVIEW_SetRedraw(LISTVIEW_INFO *infoPtr, BOOL bRedraw) { TRACE("infoPtr->bRedraw=%d, bRedraw=%d\n", infoPtr->bRedraw, bRedraw); - /* we can not use straight equality here because _any_ non-zero value is TRUE */ + /* we cannot use straight equality here because _any_ non-zero value is TRUE */ if ((infoPtr->bRedraw && bRedraw) || (!infoPtr->bRedraw && !bRedraw)) return 0; infoPtr->bRedraw = bRedraw; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4cb0160d2d..153c2e32ac 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6233,7 +6233,7 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam) * forgets to specify TBSTYLE_TRANSPARENT but does specify either * CCS_TOP or CCS_BOTTOM (_NOMOVEY and _TOP), then the control * does *not* set TBSTYLE_TRANSPARENT even though it should!!!! - * Some how, the only cases of this seem to be MFC programs. + * Somehow, the only cases of this seem to be MFC programs. * * Note also that the addition of _TRANSPARENT occurs *only* here. It * does not occur in the WM_STYLECHANGING routine. diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2856ea94dc..02f6021ded 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -554,7 +554,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFormat( if (wfwritten) *wfwritten = size; } else { - WARN("invalid parameter: wfsize to small\n"); + WARN("invalid parameter: wfsize too small\n"); if (wfwritten) *wfwritten = 0; return DSERR_INVALIDPARAM; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0669b4a9cb..a16d511ce3 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -649,7 +649,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat( if (wfwritten) *wfwritten = size; } else { - WARN("invalid parameter: wfsize to small\n"); + WARN("invalid parameter: wfsize too small\n"); if (wfwritten) *wfwritten = 0; return DSERR_INVALIDPARAM; diff --git a/dlls/gdi/bitblt.c b/dlls/gdi/bitblt.c index dc8b98b34f..668adae067 100644 --- a/dlls/gdi/bitblt.c +++ b/dlls/gdi/bitblt.c @@ -323,7 +323,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, int oldStretchMode; if(widthDest < 0 || heightDest < 0 || widthSrc < 0 || heightSrc < 0) { - TRACE("Can not mirror\n"); + TRACE("Cannot mirror\n"); return FALSE; } diff --git a/dlls/gdi/palette.c b/dlls/gdi/palette.c index febcfa0d4e..80ae49585f 100644 --- a/dlls/gdi/palette.c +++ b/dlls/gdi/palette.c @@ -124,7 +124,7 @@ HPALETTE PALETTE_Init(void) if (palObj) { if (!(palObj->mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int) * NB_RESERVED_COLORS ))) - ERR("Can not create palette mapping -- out of memory!\n"); + ERR("Cannot create palette mapping -- out of memory!\n"); GDI_ReleaseObj( hpalette ); } return hpalette; @@ -401,7 +401,7 @@ BOOL WINAPI ResizePalette( int *newMap = HeapReAlloc(GetProcessHeap(), 0, mapping, cEntries * sizeof(int) ); if(newMap == NULL) { - ERR("Can not resize mapping -- out of memory!\n"); + ERR("Cannot resize mapping -- out of memory!\n"); GDI_ReleaseObj( hPal ); return FALSE; } diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c index 087cf0f53d..a17e1bcf32 100644 --- a/dlls/kernel/profile.c +++ b/dlls/kernel/profile.c @@ -1580,12 +1580,12 @@ BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values) * Win95: * - if the buffer is 0 or 1 character long then it is as if it was of * infinite length. - * - otherwise, if the buffer is to small only the section names that fit + * - otherwise, if the buffer is too small only the section names that fit * are returned. - * - note that this means if the buffer was to small to return even just + * - note that this means if the buffer was too small to return even just * the first section name then a single '\0' will be returned. * - the return value is the number of characters written in the buffer, - * except if the buffer was too smal in which case len-2 is returned + * except if the buffer was too small in which case len-2 is returned * * Win2000: * - if the buffer is 0, 1 or 2 characters long then it is filled with diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index 2fdd28cfea..5eb66aad76 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1277,7 +1277,7 @@ static void test_MapFile() ok( hmap == NULL, "mapping should fail\n"); /* GetLastError() varies between win9x and WinNT and also depends on the filesystem */ - /* On XP you can now map again, on Win 95 you can not. */ + /* On XP you can now map again, on Win 95 you cannot. */ ok( CloseHandle( handle ), "can't close file handle\n"); ok( DeleteFileA( filename ), "DeleteFile failed after map\n" ); diff --git a/dlls/kernel/volume.c b/dlls/kernel/volume.c index 2599278c23..c85a1aa603 100644 --- a/dlls/kernel/volume.c +++ b/dlls/kernel/volume.c @@ -1192,7 +1192,7 @@ UINT WINAPI GetLogicalDriveStringsW( UINT len, LPWSTR buffer ) * DRIVE_UNKNOWN unable to find out anything about the drive * DRIVE_NO_ROOT_DIR nonexistent root dir * DRIVE_REMOVABLE the disk can be removed from the machine - * DRIVE_FIXED the disk can not be removed from the machine + * DRIVE_FIXED the disk cannot be removed from the machine * DRIVE_REMOTE network disk * DRIVE_CDROM CDROM drive * DRIVE_RAMDISK virtual disk in RAM diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c index eb44d5418b..9471a98487 100644 --- a/dlls/kernel/wowthunk.c +++ b/dlls/kernel/wowthunk.c @@ -776,7 +776,7 @@ DWORD WINAPI LoadLibraryEx32W16( LPCSTR lpszLibFile, DWORD hFile, DWORD dwFlags return 0; } - /* if the file can not be found, call LoadLibraryExA anyway, since it might be + /* if the file cannot be found, call LoadLibraryExA anyway, since it might be a builtin module. This case is handled in MODULE_LoadLibraryExA */ if ((p = strrchr( lpszLibFile, '.' )) && !strchr( p, '\\' )) /* got an extension */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 50e42025cd..7447ea1e33 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1288,7 +1288,7 @@ DWORD WINAPI RtlUnicodeStringToOemSize( const UNICODE_STRING *str ) * * RETURNS * Success: STATUS_SUCCESS. src is appended to dest. - * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is to small + * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is too small * to hold the concatenated string. * * NOTES @@ -1318,7 +1318,7 @@ NTSTATUS WINAPI RtlAppendAsciizToString( * * RETURNS * Success: STATUS_SUCCESS. src is appended to dest. - * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is to small + * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is too small * to hold the concatenated string. * * NOTES @@ -1348,7 +1348,7 @@ NTSTATUS WINAPI RtlAppendStringToString( * * RETURNS * Success: STATUS_SUCCESS. src is appended to dest. - * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is to small + * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is too small * to hold the concatenated string. * * NOTES @@ -1387,7 +1387,7 @@ NTSTATUS WINAPI RtlAppendUnicodeToString( * * RETURNS * Success: STATUS_SUCCESS. src is appended to dest. - * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is to small + * Failure: STATUS_BUFFER_TOO_SMALL, if the buffer of dest is too small * to hold the concatenated string. * * NOTES diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index e09a6b433e..d59e008176 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -658,7 +658,7 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, S if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; @@ -716,7 +716,7 @@ SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType, if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL) { if (gProxyHandle.nErrorType == ERROR_LIBRARY_NOT_FOUND) - WARN("ProxyODBC: Can not load ODBC driver manager library.\n"); + WARN("ProxyODBC: Cannot load ODBC driver manager library.\n"); if (HandleType == SQL_HANDLE_ENV) *OutputHandle = SQL_NULL_HENV; diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index fc090436ab..04cdac630d 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -825,7 +825,7 @@ void wgl_ext_finalize_extensions(void) * * @WARNING: this list must be ordered by name * - * @TODO: real handle caps on providing some func_init functions (third param, ex: to check extentions) + * @TODO: real handle caps on providing some func_init functions (third param, ex: to check extensions) */ WGL_extension wgl_extension_registry[] = { { "wglBindTexImageARB", (void *) wglBindTexImageARB, NULL, NULL}, diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 027f3bdb7f..3bcf385994 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -158,10 +158,10 @@ STRINGTABLE DISCARDABLE IDS_SELECT "Select" IDS_OPEN "Open" - IDS_CREATEFOLDER_DENIED "Can not create new Folder: Permission denied." + IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file delete" - IDS_DELETEFOLDER_CAPTION "Confirm folder delete" + IDS_DELETEITEM_CAPTION "Confirm file deletion" + IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" IDS_OVERWRITEFILE_TEXT "OverWrite File %1?" diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 5e12e81563..0f9d9b2d45 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -817,7 +817,7 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); - HeapFree(GetProcessHeap(), 0, ForFree); /* we can not use wString, it was changed */ + HeapFree(GetProcessHeap(), 0, ForFree); /* we cannot use wString, it was changed */ break; } else diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 218f433ae8..2df3d8c508 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -388,7 +388,7 @@ void test_move(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); - ok(SHFileOperationA(&shfo), "Can not move many files\n"); + ok(SHFileOperationA(&shfo), "Cannot move many files\n"); ok(file_exists(".\\test1.txt"), "The file is not moved. Many files are specified\n"); ok(file_exists(".\\test4.txt"), "The directory is not moved. Many files are specified\n"); diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 99ee92bb9d..4ba027348c 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1300,10 +1300,10 @@ LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, * * REG_EXPAND_SZ: * case-1: the unexpanded string is smaller than the expanded one - * subcase-1: the buffer is to small to hold the unexpanded string: + * subcase-1: the buffer is too small to hold the unexpanded string: * function fails and returns the size of the unexpanded string. * - * subcase-2: buffer is to small to hold the expanded string: + * subcase-2: buffer is too small to hold the expanded string: * the function return success (!!) and the result is truncated * *** This is clearly an error in the native implementation. *** * @@ -1332,7 +1332,7 @@ DWORD WINAPI SHQueryValueExA( HKEY hKey, LPCSTR lpszValue, /* Expand type REG_EXPAND_SZ into REG_SZ */ LPSTR szData; - /* If the caller didn't supply a buffer or the buffer is to small we have + /* If the caller didn't supply a buffer or the buffer is too small we have * to allocate our own */ if ((!pvData) || (dwRet == ERROR_MORE_DATA) ) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 97fe7e7ab6..df844a55ef 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -3343,7 +3343,7 @@ BOOL WINAPI GetDefaultPrinterW(LPWSTR name, LPDWORD namesize) /* make the buffer big enough for the stuff from the profile/registry, * the content must fit into the local buffer to compute the correct - * size even if the extern buffer is to small or not given. + * size even if the extern buffer is too small or not given. * (20 for ,driver,port) */ insize = *namesize; len = max(100, (insize + 20)); diff --git a/dlls/x11drv/palette.c b/dlls/x11drv/palette.c index 07741e0093..ae09c9e85a 100644 --- a/dlls/x11drv/palette.c +++ b/dlls/x11drv/palette.c @@ -322,7 +322,7 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template int i; if((COLOR_sysPal = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY)*palette_size)) == NULL) { - WARN("Can not allocate system palette\n"); + WARN("Unable to allocate the system palette\n"); return FALSE; } @@ -578,7 +578,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template COLOR_sysPal = HeapAlloc(GetProcessHeap(),0,sizeof(PALETTEENTRY)*256); if(COLOR_sysPal == NULL) { - ERR("Can not allocate system palette!\n"); + ERR("Unable to allocate the system palette!\n"); HeapFree(GetProcessHeap(), 0, pixDynMapping); return FALSE; } @@ -1095,7 +1095,7 @@ static UINT X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNu sizeof(int)*palPtr->logpalette.palNumEntries); if(mapping == NULL) { - ERR("Can not allocate new mapping -- memory exausted!\n"); + ERR("Unable to allocate new mapping -- memory exhausted!\n"); return 0; } palPtr->mapping = mapping; diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index 87cac98fe0..5520c8897d 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -1435,7 +1435,7 @@ ln -s /c c: c:\AnApp directories as well as have read access to the entire FAT filesystem. On this system the FAT filesystem has default permissions which should not - be changed for security reasons or can not be changed due to + be changed for security reasons or cannot be changed due to lack of root access. On this system a shadow directory might be set up in the following manner: diff --git a/documentation/debugging.sgml b/documentation/debugging.sgml index 4b579d8ccb..6b5034a2ae 100644 --- a/documentation/debugging.sgml +++ b/documentation/debugging.sgml @@ -59,7 +59,7 @@ MESSAGE( "Could not create graphics driver '%s'\n", buffer ); These are warning messages. You should report a warning when something unwanted happens, and the - function can not deal with the condition. This + function cannot deal with the condition. This is seldomly used since proper functions can usually report failures back to the caller. Think twice before making the message a warning. diff --git a/documentation/opengl.sgml b/documentation/opengl.sgml index dbf8e88cde..cd47ba60b3 100644 --- a/documentation/opengl.sgml +++ b/documentation/opengl.sgml @@ -12,7 +12,7 @@ that is needed. - To be more clear, I will detail one step after another what + For clarity, I will detail one step after another what the configure script checks. diff --git a/documentation/winedev-coding.sgml b/documentation/winedev-coding.sgml index 5cdb82afea..55409fee0c 100644 --- a/documentation/winedev-coding.sgml +++ b/documentation/winedev-coding.sgml @@ -300,7 +300,7 @@ code There are exceptions to the "avoid #ifdef MyOS" rule. Wine, for example, needs the internals of the signal stack -- that cannot easily be - described in terms of features. Moreover, you can not use + described in terms of features. Moreover, you cannot use autoconf's HAVE_* symbols in Wine's headers, as these may be used by Winelib users who may not be using a configure diff --git a/documentation/winedev-otherdebug.sgml b/documentation/winedev-otherdebug.sgml index 89621add4e..890f509abb 100644 --- a/documentation/winedev-otherdebug.sgml +++ b/documentation/winedev-otherdebug.sgml @@ -604,7 +604,7 @@ less lzexpand_main.c.gcov INT file; -/* Check for non-existent file. */ +/* Check for nonexistent file */ file = LZOpenFile("badfilename_", &test, OF_READ); ok(file == LZERROR_BADINHANDLE, "LZOpenFile succeeded on nonexistent file\n"); diff --git a/documentation/winelib-mfc.sgml b/documentation/winelib-mfc.sgml index 68fe423524..3e93c47beb 100644 --- a/documentation/winelib-mfc.sgml +++ b/documentation/winelib-mfc.sgml @@ -80,7 +80,7 @@ First you must legally get MFC source code on your computer. The MFC source code comes as a part of Visual Studio. The license for - Visual Studio implies it is a single product that can not + Visual Studio implies it is a single product that cannot be broken up into its components. So the cleanest way to get MFC on your system is to buy Visual Studio and install it on a dual boot Linux box. diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index d13210a1ea..55184c27cb 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -121,7 +121,7 @@ STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' can not be found." +STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ task. \nClose one or more applications to increase the amount of \nfree \ memory." diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 6fc0674275..4ac8ea3c26 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -246,7 +246,7 @@ int WINECON_GrabChanges(struct inner_data* data) continue; } - if (ev_found != -1 && /* Only 2 cases where they can NOT merge */ + if (ev_found != -1 && /* Only 2 cases where they CANNOT merge */ !(evts[i ].u.update.bottom + 1 < evts[ev_found].u.update.top || evts[ev_found].u.update.bottom + 1 < evts[i ].u.update.top)) { diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 6d5d31ef77..09e0a5e127 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -53,7 +53,7 @@ void* xmalloc(size_t size) void* p; if ((p = malloc (size)) == NULL) - error("Can not malloc %d bytes.", size); + error("Could not malloc %d bytes.", size); return p; } @@ -62,7 +62,7 @@ void *xrealloc(void* p, size_t size) { void* p2 = realloc (p, size); if (size && !p2) - error("Can not realloc %d bytes.", size); + error("Could not realloc %d bytes.", size); return p2; } @@ -195,7 +195,7 @@ void create_file(const char* name, int mode, const char* fmt, ...) if (verbose) printf("Creating file %s\n", name); va_start(ap, fmt); if ( !(file = fopen(name, "w")) ) - error ("Can not create %s.", name); + error("Unable to open %s for writing.", name); vfprintf(file, fmt, ap); va_end(ap); fclose(file); -- 2.32.0.93.g670b81a890