From 114b667f4102c37cc25135d306113f41d6823898 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Wed, 2 Apr 2003 01:23:43 +0000 Subject: [PATCH] Some spelling and formatting fixes. --- dlls/commdlg/colordlg.c | 2 +- dlls/commdlg/filedlg95.c | 10 +++++----- dlls/ntdll/rtlbitmap.c | 2 +- dlls/setupapi/dirid.c | 2 +- dlls/shdocvw/events.c | 2 +- dlls/shell32/shell32_main.c | 5 +++-- dlls/shlwapi/path.c | 4 ++-- dlls/shlwapi/thread.c | 2 +- dlls/user/text.c | 2 +- dlls/winmm/midimap/midimap.c | 2 +- include/winnt.h | 2 +- memory/global.c | 4 ++-- tools/wineconf | 2 +- 13 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 5b2dc49170a..8091c37b9d5 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -934,7 +934,7 @@ static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 ) lpp->s = CC_RGBtoHSL('S', r, g, b); lpp->l = CC_RGBtoHSL('L', r, g, b); - /* Doing it the long way becaus CC_EditSetRGB/HSL doesn'nt seem to work */ + /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ SetDlgItemInt(hDlg, 703, lpp->h, TRUE); SetDlgItemInt(hDlg, 704, lpp->s, TRUE); SetDlgItemInt(hDlg, 705, lpp->l, TRUE); diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c index d25c092aded..8e6135fe1e6 100644 --- a/dlls/commdlg/filedlg95.c +++ b/dlls/commdlg/filedlg95.c @@ -19,11 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * FIXME: The whole concept of handling unicode is badly broken. - * many hook-messages expecting a pointer to a + * many hook-messages expect a pointer to a * OPENFILENAMEA or W structure. With the current architecture * we would have to convert the beast at every call to a hook. - * we have to find a better solution but if would likely cause - * a complete rewrite with after we shouldhandle the + * we have to find a better solution but it would likely cause + * a complete rewrite after which we should handle the * OPENFILENAME structure without any converting (jsch). * * FIXME: any hook gets a OPENFILENAMEA structure @@ -1264,7 +1264,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using current dir of %s\n", debugstr_w(fodInfos->initdir)); } } - TRACE("After manipilation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); + TRACE("After manipulation, file = %s, dir = %s\n", debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir)); /* Must the open as read only check box be checked ?*/ if(fodInfos->ofnInfos->Flags & OFN_READONLY) @@ -2743,7 +2743,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) if (pidl) { - /* get the total length of the selected file names*/ + /* get the total length of the selected file names */ lpstrTemp[0] = '\0'; GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER|SHGDN_FORPARSING, lpstrTemp ); diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 924a6e01cff..3190d2d1930 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -638,7 +638,7 @@ CCHAR WINAPI RtlFindLeastSignificantBit(ULONGLONG ulLong) /************************************************************************* * NTDLL_RunSortFn * - * Internal helper: qsort comparason function for RTL_BITMAP_RUN arrays + * Internal helper: qsort comparison function for RTL_BITMAP_RUN arrays */ static int NTDLL_RunSortFn(const void *lhs, const void *rhs) { diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index d7016ae1d12..336812e418c 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -126,7 +126,7 @@ static const WCHAR *create_system_dirid( int dirid ) case DIRID_COLOR: /* FIXME */ case DIRID_PRINTPROCESSOR: /* FIXME */ default: - FIXME( "unknwon dirid %d\n", dirid ); + FIXME( "unknown dirid %d\n", dirid ); return get_unknown_dirid(); } len = (strlenW(buffer) + 1) * sizeof(WCHAR); diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index b85583e36f3..08b1544cedc 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -179,7 +179,7 @@ static HRESULT WINAPI WBCP_Advise(LPCONNECTIONPOINT iface, static HRESULT WINAPI WBCP_Unadvise(LPCONNECTIONPOINT iface, DWORD dwCookie) { - FIXME("stub: cookie to disconnect = %ld\n", dwCookie); + FIXME("stub: cookie to disconnect = %lx\n", dwCookie); return S_OK; } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 50f0a7e6bc1..0cb62da984f 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -298,8 +298,9 @@ DWORD WINAPI SHGetFileInfoA(LPCSTR path,DWORD dwFileAttributes, } - /* translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES in not specified - the pidl functions fail on not existing file names */ + /* translate the path into a pidl only when SHGFI_USEFILEATTRIBUTES + * is not specified. + The pidl functions fail on not existing file names */ if (flags & SHGFI_PIDL) { pidl = ILClone((LPCITEMIDLIST)path); diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index b5a06a8409b..cb2f0407653 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2543,8 +2543,8 @@ BOOL WINAPI PathMakePrettyW(LPWSTR lpszPath) * Determine the length of the common prefix between two paths. * * PARAMS - * lpszFile1 [I] First path for comparason - * lpszFile2 [I] Second path for comparason + * lpszFile1 [I] First path for comparison + * lpszFile2 [I] Second path for comparison * achPath [O] Destination for common prefix string * * RETURNS diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 2c0f2eece91..cfd40bb5144 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -65,7 +65,7 @@ DWORD WINAPI SHLWAPI_23(REFGUID,LPSTR,INT); * Failure: NULL, if any parameters are invalid. * * NOTES - * This function always returns returns NULL if the underlying OS version + * This function always returns NULL if the underlying OS version * Wine is impersonating does not use security descriptors (i.e. anything * before Windows NT). */ diff --git a/dlls/user/text.c b/dlls/user/text.c index c46dfc16d0d..beb4db7d323 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -846,7 +846,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int prefix_offset; ellipsis_data ellip; - TRACE("%s, %d , [(%ld,%ld),(%ld,%ld)]\n", debugstr_wn (str, count), count, + TRACE("%s, %d, [(%ld,%ld),(%ld,%ld)]\n", debugstr_wn (str, count), count, rect->left, rect->top, rect->right, rect->bottom); if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c index 535af403356..310733556b9 100644 --- a/dlls/winmm/midimap/midimap.c +++ b/dlls/winmm/midimap/midimap.c @@ -1,6 +1,6 @@ /* -*- tab-width: 8; c-basic-offset: 4 -*- */ /* - * Wine Midi mapper driver + * Wine MIDI mapper driver * * Copyright 1999, 2000, 2001 Eric Pouech * diff --git a/include/winnt.h b/include/winnt.h index 9dd29e52408..e9a26e63c46 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2852,7 +2852,7 @@ typedef struct { typedef struct _SID_AND_ATTRIBUTES { PSID Sid; DWORD Attributes; -} SID_AND_ATTRIBUTES ; +} SID_AND_ATTRIBUTES; /* security entities */ #define SECURITY_NULL_RID (0x00000000L) diff --git a/memory/global.c b/memory/global.c index a91a4a67dda..d1c48e45bb4 100644 --- a/memory/global.c +++ b/memory/global.c @@ -364,9 +364,9 @@ HGLOBAL16 WINAPI GlobalReAlloc16( else { /* - * if more then one reader (e.g. some pointer has been + * if more than one reader (e.g. some pointer has been * given out by GetVDMPointer32W16), - * only try to realloc in place + * only try to realloc in place */ newptr = HeapReAlloc( GetProcessHeap(), (pArena->pageLockCount > 0) ? diff --git a/tools/wineconf b/tools/wineconf index a9b5ed167c3..b523890c460 100755 --- a/tools/wineconf +++ b/tools/wineconf @@ -106,7 +106,7 @@ sub ReadFSTAB { } elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom') && $type eq 'supermount') { - push(@::CdromDrives, [ '/dev/cdrom', $mntpoint, 'win95']); + push(@::CdromDrives, ['/dev/cdrom', $mntpoint, 'win95']); } } }