Hi all,
- dlls/kernel/format_msg.c: use debugstr_a
- dlls/msacm/driver.c: typo in registry key (ouch)
- include/wingdi.h: add offsets to LOGFONTA struct
- windows/winproc.c: improved TRACE
- misc. spelling fixes
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
Determining best CVS host...
Using CVSROOT :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine
Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.20
diff -u -r1.20 freetype.c
--- dlls/gdi/freetype.c 10 Jul 2002 23:16:40 -0000 1.20
+++ dlls/gdi/freetype.c 20 Jul 2002 14:12:49 -0000
@@ -1059,7 +1059,7 @@
else
ret->charset = get_nearest_charset(face);
- TRACE("Choosen %s %s\n", debugstr_w(family->FamilyName),
+ TRACE("Chosen: %s %s\n", debugstr_w(family->FamilyName),
debugstr_w(face->StyleName));
ret->ft_face = OpenFontFile(ret, face->file, face->face_index,
Index: dlls/kernel/format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/format_msg.c,v
retrieving revision 1.23
diff -u -r1.23 format_msg.c
--- dlls/kernel/format_msg.c 5 Jul 2002 21:17:43 -0000 1.23
+++ dlls/kernel/format_msg.c 20 Jul 2002 14:12:49 -0000
@@ -169,8 +169,8 @@
HMODULE hmodule = (HMODULE)lpSource;
CHAR ch;
- TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n",
- dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
+ TRACE("(0x%lx,%s,%ld,0x%lx,%p,%ld,%p)\n",
+ dwFlags,debugstr_a(lpSource),dwMessageId,dwLanguageId,lpBuffer,nSize,args);
if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
&& (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0;
if ((dwFlags & FORMAT_MESSAGE_FROM_STRING)
Index: dlls/msacm/driver.c
===================================================================
RCS file: /home/wine/wine/dlls/msacm/driver.c,v
retrieving revision 1.18
diff -u -r1.18 driver.c
--- dlls/msacm/driver.c 31 May 2002 23:25:48 -0000 1.18
+++ dlls/msacm/driver.c 20 Jul 2002 14:12:50 -0000
@@ -366,7 +366,7 @@
return MMSYSERR_ERROR;
for (dwPriorityCounter = 1; ; dwPriorityCounter++) {
- snprintf(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
+ snprintf(szSubKey, 17, "Priority%ld", dwPriorityCounter);
lError = RegQueryValueA(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
if (lError != ERROR_SUCCESS)
break;
Index: dlls/shlwapi/url.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/url.c,v
retrieving revision 1.15
diff -u -r1.15 url.c
--- dlls/shlwapi/url.c 31 May 2002 23:40:52 -0000 1.15
+++ dlls/shlwapi/url.c 20 Jul 2002 14:12:51 -0000
@@ -705,7 +705,7 @@
* buffer size (including room for the '\0').
*
* By default the function stops converting at the first '?' or
- * '#'. [MSDN says differently]. If URL_ESCAPE_SPACE_ONLY flag is set
+ * '#'. [MSDN says differently]. If URL_ESCAPE_SPACES_ONLY flag is set
* then only spaces are converted, but the conversion continues past a
* '?' or '#'.
*
@@ -750,7 +750,7 @@
URL_ESCAPE_SEGMENT_ONLY);
else
- /* if SPACES_ONLY *not* specified the assume DONT_ESCAPE_EXTRA_INFO */
+ /* if SPACES_ONLY *not* specified then assume DONT_ESCAPE_EXTRA_INFO */
dwFlags |= URL_DONT_ESCAPE_EXTRA_INFO;
for(src = pszUrl; *src; src++) {
@@ -1030,7 +1030,7 @@
* Neither V4 nor V5 of shlwapi.dll implement the '?' and always return
* a NULL.
* MSDN further states that:
- * "If a file URL has a query string, ther returned string
+ * "If a file URL has a query string, the returned string is
* the query string."
* In all test cases if the scheme starts with "fi" then a NULL is
* returned. V5 gives the following results:
@@ -1349,7 +1349,7 @@
}
strcpyW(pszOut, pszIn);
*pcchOut = strlenW(pszOut);
- TRACE("returing copy, left alone\n");
+ TRACE("returning copy, left alone\n");
return S_FALSE;
}
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.74
diff -u -r1.74 wingdi.h
--- include/wingdi.h 24 Jun 2002 23:09:19 -0000 1.74
+++ include/wingdi.h 20 Jul 2002 14:12:55 -0000
@@ -509,20 +509,20 @@
typedef struct
{
- LONG lfHeight;
- LONG lfWidth;
- LONG lfEscapement;
- LONG lfOrientation;
- LONG lfWeight;
- BYTE lfItalic;
- BYTE lfUnderline;
- BYTE lfStrikeOut;
- BYTE lfCharSet;
- BYTE lfOutPrecision;
- BYTE lfClipPrecision;
- BYTE lfQuality;
- BYTE lfPitchAndFamily;
- CHAR lfFaceName[LF_FACESIZE];
+ LONG lfHeight; /* 00 */
+ LONG lfWidth; /* 04 */
+ LONG lfEscapement; /* 0c */
+ LONG lfOrientation; /* 10 */
+ LONG lfWeight; /* 14 */
+ BYTE lfItalic; /* 18 */
+ BYTE lfUnderline; /* 19 */
+ BYTE lfStrikeOut; /* 1a */
+ BYTE lfCharSet; /* 1b */
+ BYTE lfOutPrecision; /* 1c */
+ BYTE lfClipPrecision; /* 1d */
+ BYTE lfQuality; /* 1e */
+ BYTE lfPitchAndFamily; /* 1f */
+ CHAR lfFaceName[LF_FACESIZE]; /* 20 - 3f */
} LOGFONTA, *PLOGFONTA, *LPLOGFONTA;
typedef struct
Index: programs/wineconsole/user.c
===================================================================
RCS file: /home/wine/wine/programs/wineconsole/user.c,v
retrieving revision 1.14
diff -u -r1.14 user.c
--- programs/wineconsole/user.c 2 Jul 2002 02:14:08 -0000 1.14
+++ programs/wineconsole/user.c 20 Jul 2002 14:12:57 -0000
@@ -149,7 +149,7 @@
PRIVATE(data)->cursor_bitmap = (HBITMAP)0;
if (size != 100)
{
- int w16b; /* number of byets per row, aligned on word size */
+ int w16b; /* number of bytes per row, aligned on word size */
BYTE* ptr;
int i, j, nbl;
Index: windows/win.c
===================================================================
RCS file: /home/wine/wine/windows/win.c,v
retrieving revision 1.186
diff -u -r1.186 win.c
--- windows/win.c 2 Jun 2002 21:29:23 -0000 1.186
+++ windows/win.c 20 Jul 2002 14:13:00 -0000
@@ -235,7 +235,7 @@
* WIN_GetPtr
*
* Return a pointer to the WND structure if local to the process,
- * or WND_OTHER_PROCESS is handle may be valid in other process.
+ * or WND_OTHER_PROCESS if handle may be valid in other process.
* If ret value is a valid pointer, it must be released with WIN_ReleasePtr.
*/
WND *WIN_GetPtr( HWND hwnd )
Index: windows/winproc.c
===================================================================
RCS file: /home/wine/wine/windows/winproc.c,v
retrieving revision 1.87
diff -u -r1.87 winproc.c
--- windows/winproc.c 31 May 2002 23:06:54 -0000 1.87
+++ windows/winproc.c 20 Jul 2002 14:13:06 -0000
@@ -520,7 +520,7 @@
{
WINDOWPROC *next = ((WINDOWPROC *)proc)->next;
if (((WINDOWPROC *)proc)->user != user) break;
- TRACE_(win)("freeing %08x\n", (UINT)proc);
+ TRACE_(win)("freeing %08x (%d)\n", (UINT)proc, user);
HeapFree( WinProcHeap, 0, proc );
proc = next;
}
