Hi all,
do some spelling and formatting fixes, add filedlg TRACE.
Index: dlls/commdlg/colordlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/colordlg.c,v
retrieving revision 1.38
diff -u -r1.38 colordlg.c
--- dlls/commdlg/colordlg.c 21 Nov 2002 23:55:10 -0000 1.38
+++ dlls/commdlg/colordlg.c 1 Apr 2003 20:36:15 -0000
@@ -934,7 +934,7 @@
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);
Index: dlls/commdlg/filedlg95.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlg95.c,v
retrieving revision 1.92
diff -u -r1.92 filedlg95.c
--- dlls/commdlg/filedlg95.c 26 Mar 2003 23:36:25 -0000 1.92
+++ dlls/commdlg/filedlg95.c 1 Apr 2003 20:36:18 -0000
@@ -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
@@ -421,6 +421,8 @@
TRACE("selected file: %s\n",ofn->lpstrFile);
+ TRACE("<-- OPENFILENAMEA: lStructSize %ld, hwndOwner %04x, hInstance %x, lpstrFilter '%s', lpstrCustomFilter '%s', nMaxCustFilter %ld, nFilterIndex %ld, lpstrFile '%s', nMaxFile %ld, lpstrFileTitle '%s', nMaxFileTitle %ld, lpstrInitialDir '%s', lpstrTitle '%s', Flags %08lx, nFileOffset %d, nFileExtension %d, lpstrDefExt '%s', lCustData %08lx, lpfnHook %p, lpTemplateName '%s'\n", ofn->lStructSize, ofn->hwndOwner, ofn->hInstance, ofn->lpstrFilter, ofn->lpstrCustomFilter, ofn->nMaxCustFilter, ofn->nFilterIndex, ofn->lpstrFile, ofn->nMaxFile, ofn->lpstrFileTitle, ofn->nMaxFileTitle, ofn->lpstrInitialDir, ofn->lpstrTitle, ofn->Flags, ofn->nFileOffset, ofn->nFileExtension, ofn->lpstrDefExt, ofn->lCustData, ofn->lpfnHook, ofn->lpTemplateName);
+
return ret;
}
@@ -1264,7 +1266,7 @@
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 +2745,7 @@
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 );
Index: dlls/ntdll/rtlbitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtlbitmap.c,v
retrieving revision 1.4
diff -u -r1.4 rtlbitmap.c
--- dlls/ntdll/rtlbitmap.c 7 Mar 2003 23:15:52 -0000 1.4
+++ dlls/ntdll/rtlbitmap.c 1 Apr 2003 20:36:18 -0000
@@ -638,7 +638,7 @@
/*************************************************************************
* 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)
{
Index: dlls/setupapi/dirid.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/dirid.c,v
retrieving revision 1.3
diff -u -r1.3 dirid.c
--- dlls/setupapi/dirid.c 12 Sep 2002 22:07:04 -0000 1.3
+++ dlls/setupapi/dirid.c 1 Apr 2003 20:36:18 -0000
@@ -126,7 +126,7 @@
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);
Index: dlls/shdocvw/events.c
===================================================================
RCS file: /home/wine/wine/dlls/shdocvw/events.c,v
retrieving revision 1.6
diff -u -r1.6 events.c
--- dlls/shdocvw/events.c 31 May 2002 23:25:51 -0000 1.6
+++ dlls/shdocvw/events.c 1 Apr 2003 20:36:19 -0000
@@ -179,7 +179,7 @@
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;
}
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.113
diff -u -r1.113 shell32_main.c
--- dlls/shell32/shell32_main.c 16 Mar 2003 23:51:02 -0000 1.113
+++ dlls/shell32/shell32_main.c 1 Apr 2003 20:36:19 -0000
@@ -298,8 +298,9 @@
}
- /* 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);
Index: dlls/shlwapi/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/path.c,v
retrieving revision 1.30
diff -u -r1.30 path.c
--- dlls/shlwapi/path.c 30 Mar 2003 03:05:55 -0000 1.30
+++ dlls/shlwapi/path.c 1 Apr 2003 20:36:21 -0000
@@ -2543,8 +2543,8 @@
* 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
Index: dlls/shlwapi/thread.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/thread.c,v
retrieving revision 1.8
diff -u -r1.8 thread.c
--- dlls/shlwapi/thread.c 18 Mar 2003 18:35:49 -0000 1.8
+++ dlls/shlwapi/thread.c 1 Apr 2003 20:36:21 -0000
@@ -65,7 +65,7 @@
* 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).
*/
Index: dlls/user/text.c
===================================================================
RCS file: /home/wine/wine/dlls/user/text.c,v
retrieving revision 1.44
diff -u -r1.44 text.c
--- dlls/user/text.c 31 Jan 2003 03:23:18 -0000 1.44
+++ dlls/user/text.c 1 Apr 2003 20:36:23 -0000
@@ -846,7 +846,7 @@
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",
Index: dlls/winmm/midimap/midimap.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/midimap/midimap.c,v
retrieving revision 1.15
diff -u -r1.15 midimap.c
--- dlls/winmm/midimap/midimap.c 2 Dec 2002 18:57:00 -0000 1.15
+++ dlls/winmm/midimap/midimap.c 1 Apr 2003 20:36:23 -0000
@@ -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
*
Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.154
diff -u -r1.154 winnt.h
--- include/winnt.h 12 Mar 2003 20:14:35 -0000 1.154
+++ include/winnt.h 1 Apr 2003 20:36:26 -0000
@@ -2852,7 +2852,7 @@
typedef struct _SID_AND_ATTRIBUTES {
PSID Sid;
DWORD Attributes;
-} SID_AND_ATTRIBUTES ;
+} SID_AND_ATTRIBUTES;
/* security entities */
#define SECURITY_NULL_RID (0x00000000L)
Index: memory/global.c
===================================================================
RCS file: /home/wine/wine/memory/global.c,v
retrieving revision 1.79
diff -u -r1.79 global.c
--- memory/global.c 28 Mar 2003 00:29:00 -0000 1.79
+++ memory/global.c 1 Apr 2003 20:36:27 -0000
@@ -364,9 +364,9 @@
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) ?
Index: tools/wineconf
===================================================================
RCS file: /home/wine/wine/tools/wineconf,v
retrieving revision 1.15
diff -u -r1.15 wineconf
--- tools/wineconf 12 Feb 2003 01:12:18 -0000 1.15
+++ tools/wineconf 1 Apr 2003 20:36:27 -0000
@@ -106,7 +106,7 @@
}
elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom')
&& $type eq 'supermount') {
- push(@::CdromDrives, [ '/dev/cdrom', $mntpoint, 'win95']);
+ push(@::CdromDrives, ['/dev/cdrom', $mntpoint, 'win95']);
}
}
}
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
