Assorted comment, typo and mostly cosmetic fixes
François Gouget
fgouget at codeweavers.com
Tue Feb 13 23:45:47 CST 2001
From the more important to the less.
Changelog:
François Gouget <fgouget at codeweavers.com>
* dlls/comctl32/comctl32undoc.c
Change the callback declarations to a safer format
* controls/menu.c,
dlls/comctl32/toolbar.c,
ole/ole2nls.c
debugstr_xxx already does the quoting
* dlls/comctl32/listview.c
ListView_GetItemRect already sets rc.left
* dlls/richedit/richedit.c,
programs/regapi/regapi.c,
windows/cursoricon.c,
memory/heap.c
Misc typos in comments
--
François Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: dlls/comctl32/comctl32undoc.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.44
diff -u -r1.44 comctl32undoc.c
--- dlls/comctl32/comctl32undoc.c 2000/11/30 19:58:56 1.44
+++ dlls/comctl32/comctl32undoc.c 2001/02/14 04:12:56
@@ -46,7 +46,7 @@
PVOID ptr;
} LOADDATA, *LPLOADDATA;
-typedef HRESULT(CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
+typedef HRESULT CALLBACK (*DPALOADPROC)(LPLOADDATA,IStream*,LPARAM);
/**************************************************************************
Index: controls/menu.c
===================================================================
RCS file: /home/wine/wine/controls/menu.c,v
retrieving revision 1.105
diff -u -r1.105 menu.c
--- controls/menu.c 2001/02/14 00:23:45 1.105
+++ controls/menu.c 2001/02/14 04:26:06
@@ -266,7 +266,7 @@
if (typ == MFT_STRING) {
if (mp->text)
- DPRINTF( ", Text=\"%s\"", debugstr_w(mp->text));
+ DPRINTF( ", Text=%s", debugstr_w(mp->text));
else
DPRINTF( ", Text=Null");
} else if (mp->text == NULL)
Index: dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.77
diff -u -r1.77 toolbar.c
--- dlls/comctl32/toolbar.c 2001/02/12 03:42:23 1.77
+++ dlls/comctl32/toolbar.c 2001/02/14 04:26:14
@@ -209,7 +209,7 @@
/* get a pointer to the text */
lpText = TOOLBAR_GetText(infoPtr, btnPtr);
- TRACE ("lpText: \"%s\"\n", debugstr_w(lpText));
+ TRACE ("lpText: %s\n", debugstr_w(lpText));
/* draw text */
if (lpText) {
@@ -1879,7 +1879,7 @@
len = LoadStringW ((HINSTANCE)wParam, (UINT)lParam,
szString, MAX_RESOURCE_STRING_LENGTH);
- TRACE("len=%d \"%s\"\n", len, debugstr_w(szString));
+ TRACE("len=%d %s\n", len, debugstr_w(szString));
TRACE("First char: 0x%x\n", *szString);
if (szString[0] == L'|')
{
@@ -1902,7 +1902,7 @@
}
len = COMCTL32_StrChrW (p, L'|') - p;
- TRACE("len=%d \"%s\"\n", len, debugstr_w(p));
+ TRACE("len=%d %s\n", len, debugstr_w(p));
infoPtr->strings[infoPtr->nNumStrings] =
COMCTL32_Alloc (sizeof(WCHAR)*(len+1));
lstrcpynW (infoPtr->strings[infoPtr->nNumStrings], p, len);
@@ -1944,7 +1944,7 @@
while (*p) {
len = strlenW (p);
- TRACE("len=%d \"%s\"\n", len, debugstr_w(p));
+ TRACE("len=%d %s\n", len, debugstr_w(p));
if (infoPtr->nNumStrings == 0) {
infoPtr->strings =
COMCTL32_Alloc (sizeof(LPWSTR));
Index: ole/ole2nls.c
===================================================================
RCS file: /home/wine/wine/ole/ole2nls.c,v
retrieving revision 1.83
diff -u -r1.83 ole2nls.c
--- ole/ole2nls.c 2000/12/19 04:53:22 1.83
+++ ole/ole2nls.c 2001/02/14 04:26:23
@@ -438,7 +438,7 @@
}
FreeResource(hmem);
- TRACE("\"%s\" loaded!\n", debugstr_w(buffer));
+ TRACE("%s loaded!\n", debugstr_w(buffer));
return (i + 1);
}
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/listview.c,v
retrieving revision 1.95
diff -u -r1.95 listview.c
--- dlls/comctl32/listview.c 2001/02/12 18:07:43 1.95
+++ dlls/comctl32/listview.c 2001/02/14 04:13:01
@@ -7442,8 +7442,7 @@
else
{
/* get item bounding rectangle */
- rc.left = LVIR_BOUNDS;
- ListView_GetItemRect(hwnd, nItem, &rc, rc.left);
+ ListView_GetItemRect(hwnd, nItem, &rc, LVIR_BOUNDS);
InvalidateRect(hwnd, &rc, TRUE);
}
}
Index: dlls/richedit/richedit.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/richedit/richedit.c,v
retrieving revision 1.8
diff -u -r1.8 richedit.c
--- dlls/richedit/richedit.c 2001/01/26 20:43:44 1.8
+++ dlls/richedit/richedit.c 2001/02/14 04:13:04
@@ -1,9 +1,9 @@
/*
* RichEdit32 functions
*
- * This module is a simple wrap-arround the edit controls.
- * At the point, it is good only for application who use the RICHEDIT control to
- * display RTF text.
+ * This module is a simple wrapper for the edit controls.
+ * At the point, it is good only for application who use the RICHEDIT
+ * control to display RTF text.
*
* Copyright 2000 by Jean-Claude Batista
*
Index: programs/regapi/regapi.c
===================================================================
RCS file: /home/cvs/wine/wine/programs/regapi/regapi.c,v
retrieving revision 1.12
diff -u -r1.12 regapi.c
--- programs/regapi/regapi.c 2001/01/26 20:40:51 1.12
+++ programs/regapi/regapi.c 2001/02/14 04:13:09
@@ -619,7 +619,7 @@
}
/******************************************************************************
- * This function is a wrapper arround the setValue function. It prepares the
+ * This function is a wrapper for the setValue function. It prepares the
* land and clean the area once completed.
*/
static void processSetValue(LPSTR cmdline)
@@ -675,7 +675,7 @@
}
/******************************************************************************
- * This function is a wrapper arround the queryValue function. It prepares the
+ * This function is a wrapper for the queryValue function. It prepares the
* land and clean the area once completed.
*/
static void processQueryValue(LPSTR cmdline)
Index: windows/cursoricon.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/cursoricon.c,v
retrieving revision 1.28
diff -u -r1.28 cursoricon.c
--- windows/cursoricon.c 2001/02/13 01:48:14 1.28
+++ windows/cursoricon.c 2001/02/14 04:13:11
@@ -62,7 +62,7 @@
*
* FIXME: This should not be allocated on the system heap, but on a
* subsystem-global heap (i.e. one for all Win16 processes,
- * and one each for every Win32 process).
+ * and one for each Win32 process).
*/
typedef struct tagICONCACHE
{
@@ -843,7 +843,7 @@
{
ICONCACHE* pIconCache = CURSORICON_FindCache(Handle);
- /* Not Found in Cache, then do a strait copy
+ /* Not Found in Cache, then do a straight copy
*/
if(pIconCache == NULL)
{
@@ -876,7 +876,7 @@
SM_CXICON : SM_CXCURSOR);
}
- /* Retreive the CURSORICONDIRENTRY
+ /* Retrieve the CURSORICONDIRENTRY
*/
if (!(hMem = LoadResource( pIconCache->hModule ,
pIconCache->hGroupRsrc)))
Index: memory/heap.c
===================================================================
RCS file: /home/wine/wine/memory/heap.c,v
retrieving revision 1.44
diff -u -r1.44 heap.c
--- memory/heap.c 2000/12/27 04:18:27 1.44
+++ memory/heap.c 2001/02/14 04:26:19
@@ -1219,7 +1219,7 @@
/* Validate the parameters */
- if (!ptr) return TRUE; /* freeing a NULL ptr is doesn't indicate an error in Win2k */
+ if (!ptr) return TRUE; /* freeing a NULL ptr isn't an error in Win2k */
if (flags & HEAP_WINE_SEGPTR) heapPtr = segptrHeap;
if (!heapPtr) return FALSE;
More information about the wine-patches
mailing list