Don't prefix %p with 0x.

Various English fixes.
This commit is contained in:
Francois Gouget 2001-11-06 21:01:32 +00:00 committed by Alexandre Julliard
parent 1425941e29
commit 070e749cfb
22 changed files with 38 additions and 41 deletions

View File

@ -141,7 +141,7 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style)
if( !(GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) )
lphc->wState |= CBF_NOTIFY;
TRACE("[0x%p], style = %08x\n", lphc, lphc->dwStyle );
TRACE("[%p], style = %08x\n", lphc, lphc->dwStyle );
return TRUE;
}
return FALSE;

View File

@ -51,7 +51,7 @@
*
* mod 4
* 1. Implemented CBN_SELCHANGE, CBN_KILLFOCUS, and CBN_SELENDOK.
* 2. Fix putting text in CBEN_ENDEDIT notifys for CBN_DROPDOWN case.
* 2. Fix putting text in CBEN_ENDEDIT notifies for CBN_DROPDOWN case.
* 3. Lock image selected status to focus state of edit control if
* edit control exists. Mimics native actions.
* 4. Implemented WM_SETFOCUS in EditWndProc to track status of
@ -531,7 +531,7 @@ COMBOEX_GetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
TRACE("-- 0x%p\n", infoPtr->himl);
TRACE("-- %p\n", infoPtr->himl);
return (LRESULT)infoPtr->himl;
}

View File

@ -1160,9 +1160,8 @@ static void TAB_SetItemBounds (HWND hwnd)
INT iIndexStart=0,iIndexEnd=0, iCount=0;
/*
* Ok Microsoft trys to even out the rows. place the same
* Ok windows tries to even out the rows. place the same
* number of tabs in each row. So lets give that a shot
*
*/
tabPerRow = infoPtr->uNumItem / (infoPtr->uNumRows);
@ -1218,7 +1217,7 @@ static void TAB_SetItemBounds (HWND hwnd)
(infoPtr->items[iIndexEnd].rect.top ==
infoPtr->items[iIndexStart].rect.top) ;
iIndexEnd++)
/* intentionaly blank */;
/* intentionally blank */;
/*
* we need to justify these tabs so they fill the whole given

View File

@ -778,7 +778,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *
| !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */
return S_FALSE;
/* always include directorys and links */
/* always include directories and links */
if(ulAttr & (SFGAO_FOLDER | SFGAO_LINK))
return S_OK;

View File

@ -21,7 +21,7 @@
DEFAULT_DEBUG_CHANNEL(toolhelp);
/* FIXME: to make this working, we have to callback all these registered
/* FIXME: to make this work, we have to call back all these registered
* functions from all over the WINE code. Someone with more knowledge than
* me please do that. -Marcus
*/

View File

@ -712,7 +712,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(
/******************************************************************************
* RtlOpenCurrentUser [NTDLL.@]
*
* if we return just HKEY_CURRENT_USER the advapi try's to find a remote
* if we return just HKEY_CURRENT_USER the advapi tries to find a remote
* registry (odd handle) and fails
*
*/

View File

@ -4264,7 +4264,7 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime,
{
struct tm t;
TRACE("( 0x%x, 0x%x, 0x%p ), stub\n", wDosDate, wDosTime, pvtime );
TRACE("( 0x%x, 0x%x, %p ), stub\n", wDosDate, wDosTime, pvtime );
t.tm_sec = (wDosTime & 0x001f) * 2;
t.tm_min = (wDosTime & 0x07e0) >> 5;
@ -4356,7 +4356,7 @@ INT WINAPI VariantTimeToDosDateTime(DATE pvtime, USHORT *wDosDate, USHORT *wDosT
wDosTime = 0;
wDosDate = 0;
TRACE("( 0x%x, 0x%x, 0x%p ), stub\n", *wDosDate, *wDosTime, &pvtime );
TRACE("( 0x%x, 0x%x, %p ), stub\n", *wDosDate, *wDosTime, &pvtime );
if (DateToTm(pvtime, 0, &t) < 0) return 0;

View File

@ -20,10 +20,10 @@ static CRITICAL_SECTION SHELL32_ChangenotifyCS = CRITICAL_SECTION_INIT("SHELL32_
typedef struct _NOTIFICATIONLIST
{
struct _NOTIFICATIONLIST *next;
struct _NOTIFICATIONLIST *prev;
struct _NOTIFICATIONLIST *prev;
HWND hwnd; /* window to notify */
DWORD uMsg; /* message to send */
LPNOTIFYREGISTER apidl; /* array of entrys to watch*/
LPNOTIFYREGISTER apidl; /* array of entries to watch*/
UINT cidl; /* number of pidls in array */
LONG wEventMask; /* subscribed events */
DWORD dwFlags; /* client flags */

View File

@ -164,7 +164,7 @@ INT SIC_GetIconIndex (LPCSTR sSourceFile, INT dwSourceIndex )
* SIC_GetIcon [internal]
*
* NOTES
* retrives the specified icon from the iconcache. if not found try's to load the icon
* retrieves the specified icon from the iconcache. if not found tries to load the icon
*/
static HICON WINE_UNUSED SIC_GetIcon (LPCSTR sSourceFile, INT dwSourceIndex, BOOL bSmallIcon )
{ INT index;

View File

@ -821,7 +821,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathAW (LPCVOID lpszPath)
* SHGetSpecialFolderLocation [SHELL32.@]
*
* gets the folder locations from the registry and creates a pidl
* creates missing reg keys and directorys
* creates missing reg keys and directories
*
* PARAMS
* hwndOwner [I]
@ -1839,7 +1839,7 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl)
/*************************************************************************
* ILCopyaPidl
*
* copys a aPidl struct
* copies an aPidl struct
*/
LPITEMIDLIST * _ILCopyaPidl(LPITEMIDLIST * apidlsrc, UINT cidl)
{

View File

@ -27,7 +27,7 @@ DECLARE_DEBUG_CHANNEL(pidl);
/*************************************************************************
* ParseFieldA [internal]
*
* copys a field from a ',' delimited string
* copies a field from a ',' delimited string
*
* first field is nField = 1
*/
@ -61,7 +61,7 @@ DWORD WINAPI ParseFieldA(
/*************************************************************************
* ParseFieldW [internal]
*
* copys a field from a ',' delimited string
* copies a field from a ',' delimited string
*
* first field is nField = 1
*/
@ -1233,8 +1233,8 @@ HGLOBAL WINAPI SHAllocShared(LPVOID psrc, DWORD size, DWORD procID)
* NOTES
* parameter1 is return value from SHAllocShared
* parameter2 is return value from GetCurrentProcessId
* the receiver of (WM_USER+2) trys to lock the HANDLE (?)
* the returnvalue seems to be a memoryadress
* the receiver of (WM_USER+2) tries to lock the HANDLE (?)
* the return value seems to be a memory address
*/
LPVOID WINAPI SHLockShared(HANDLE hmem, DWORD procID)
{ TRACE("handle=0x%04x procID=0x%04lx\n",hmem,procID);

View File

@ -1551,7 +1551,7 @@ static HRESULT WINAPI ISFHelper_fnDeleteItems(
/****************************************************************************
* ISFHelper_fnCopyItems
*
* copys items to this folder
* copies items to this folder
*/
static HRESULT WINAPI ISFHelper_fnCopyItems(
ISFHelper *iface,

View File

@ -757,7 +757,7 @@ BOOL WINAPI FileMenu_EnableItemByCmd(
* FileMenu_GetItemExtent [SHELL32.144]
*
* NOTES
* if the menu is to big, entrys are getting cut away!!
* if the menu is too big, entries are getting cut away!!
*/
DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos)
{ RECT rect;

View File

@ -337,7 +337,7 @@ static void DoDelete(IContextMenu *iface)
/**************************************************************************
* DoCopyOrCut
*
* copys the currently selected items into the clipboard
* copies the currently selected items into the clipboard
*/
static BOOL DoCopyOrCut(
IContextMenu *iface,

View File

@ -320,7 +320,7 @@ LONG WINAPI SHRegGetUSValueA(
if (!pvData || !pcbData) return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/
TRACE("key '%s', value '%s', datalen %ld, %s\n",
debugstr_a(pSubKey), debugstr_a(pValue), *pcbData,
(flagIgnoreHKCU) ? "Ignoring HKCU" : "Trys HKCU then HKLM");
(flagIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
ret = SHRegOpenUSKeyA(pSubKey, 0x1, 0, &myhuskey, flagIgnoreHKCU);
if (ret == ERROR_SUCCESS) {
@ -354,7 +354,7 @@ LONG WINAPI SHRegGetUSValueW(
if (!pvData || !pcbData) return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/
TRACE("key '%s', value '%s', datalen %ld, %s\n",
debugstr_w(pSubKey), debugstr_w(pValue), *pcbData,
(flagIgnoreHKCU) ? "Ignoring HKCU" : "Trys HKCU then HKLM");
(flagIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
ret = SHRegOpenUSKeyW(pSubKey, 0x1, 0, &myhuskey, flagIgnoreHKCU);
if (ret == ERROR_SUCCESS) {
@ -382,7 +382,7 @@ BOOL WINAPI SHRegGetBoolUSValueA(
TRACE("key '%s', value '%s', %s\n",
debugstr_a(pszSubKey), debugstr_a(pszValue),
(fIgnoreHKCU) ? "Ignoring HKCU" : "Trys HKCU then HKLM");
(fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
datalen = sizeof(data)-1;
if (!(retvalue = SHRegGetUSValueA( pszSubKey, pszValue, &type,
@ -441,7 +441,7 @@ BOOL WINAPI SHRegGetBoolUSValueW(
TRACE("key '%s', value '%s', %s\n",
debugstr_w(pszSubKey), debugstr_w(pszValue),
(fIgnoreHKCU) ? "Ignoring HKCU" : "Trys HKCU then HKLM");
(fIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM");
datalen = (sizeof(data)-1) * sizeof(WCHAR);
if (!(retvalue = SHRegGetUSValueW( pszSubKey, pszValue, &type,

View File

@ -435,7 +435,7 @@ LPWSTR WINAPI StrCatBuffW(LPWSTR front, LPCWSTR back, INT size)
*/
HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len)
{
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
TRACE("dest=%p len=0x%lx strret=%p pidl=%p stub\n",dest,len,src,pidl);
switch (src->uType)
{
@ -480,7 +480,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, D
*/
HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len)
{
TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
TRACE("dest=%p len=0x%lx strret=%p pidl=%p stub\n",dest,len,src,pidl);
switch (src->uType)
{

View File

@ -203,7 +203,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG
lpID->idType = lpcid->idType;
lpID->idCount = lpcid->idCount;
/* copy the entrys */
/* copy the entries */
for( i=0; i < lpcid->idCount; i++ )
{
memcpy((void*)&(lpID->idEntries[i]),(void*)&(lpcid->idEntries[i]), sizeof(CURSORICONDIRENTRY) - 2);

View File

@ -479,7 +479,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
foundRoutes = WSCNTL_GetRouteTable(numRoutes, routeTable);
if (foundRoutes < 0)
{
ERR ("Unable to open /proc filesystem to parse the route entrys!\n");
ERR ("Unable to open /proc filesystem to parse the route entries!\n");
free(routeTable);
return -1;
}
@ -888,7 +888,7 @@ int WSCNTL_GetRouteTable(int numRoutes, wscntl_routeentry *routeTable)
/* skip the header line */
fgets(buf, sizeof(buf), file);
/* parse the rest of the file and put the matching entrys into routeTable.
/* parse the rest of the file and put the matching entries into routeTable.
Format of procfs route entry:
Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT
lo 0000007F 00000000 0001 0 0 0 000000FF 0 0 0

View File

@ -224,7 +224,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
PDEVICE_HEADER *pPDH;
WIN16DRV_PDEVICE *physDev;
TRACE("In creatdc for (%s,%s,%s) initData 0x%p\n",
TRACE("In creatdc for (%s,%s,%s) initData %p\n",
driver, device, output, initData);
physDev = (WIN16DRV_PDEVICE *)HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev) );
@ -238,7 +238,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
HeapFree( GetProcessHeap(), 0, physDev );
return FALSE;
}
TRACE("windevCreateDC pLPD 0x%p\n", pLPD);
TRACE("windevCreateDC pLPD %p\n", pLPD);
/* Now Get the device capabilities from the printer driver */
memset( &physDev->DevCaps, 0, sizeof(physDev->DevCaps) );

View File

@ -82,14 +82,12 @@ static void GetPrinterDriverFunctions(HINSTANCE16 hInst, LOADED_PRINTER_DRIVER *
LoadPrinterDrvFunc(ADVANCEDSETUPDIALOG);
LoadPrinterDrvFunc(DIALOGFN);
LoadPrinterDrvFunc(PSEUDOEDIT);
TRACE("got func CONTROL 0x%p enable 0x%p enumDfonts 0x%p realizeobject 0x%p extextout 0x%p\n",
TRACE("got func CONTROL %p enable %p enumDfonts %p realizeobject %p extextout %p\n",
pLPD->fn[FUNC_CONTROL],
pLPD->fn[FUNC_ENABLE],
pLPD->fn[FUNC_ENUMDFONTS],
pLPD->fn[FUNC_REALIZEOBJECT],
pLPD->fn[FUNC_EXTTEXTOUT]);
}

View File

@ -1456,7 +1456,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
pwm->flags &= ~WINE_MODREF_DONT_RESOLVE_REFS;
PE_fixup_imports( pwm );
}
TRACE("Already loaded module '%s' at 0x%08x, count=%d, \n", filename, pwm->module, pwm->refCount);
TRACE("Already loaded module '%s' at 0x%08x, count=%d\n", filename, pwm->module, pwm->refCount);
if (allocated_libdir)
{
HeapFree ( GetProcessHeap(), 0, (LPSTR)libdir );
@ -1502,7 +1502,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
if(pwm)
{
/* Initialize DLL just loaded */
TRACE("Loaded module '%s' at 0x%08x, \n", filename, pwm->module);
TRACE("Loaded module '%s' at 0x%08x\n", filename, pwm->module);
if (!TRACE_ON(module))
TRACE_(loaddll)("Loaded module '%s' : %s\n", filename, filetype);
/* Set the refCount here so that an attach failure will */
@ -1531,7 +1531,7 @@ WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags )
libdir = NULL;
}
RtlReleasePebLock();
WARN("Failed to load module '%s'; error=0x%08lx, \n", filename, GetLastError());
WARN("Failed to load module '%s'; error=0x%08lx\n", filename, GetLastError());
HeapFree ( GetProcessHeap(), 0, filename );
return NULL;
}

View File

@ -326,7 +326,7 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
lpnm->iSmCaptionHeight = lpnm->iSmCaptionWidth;
SystemParametersInfoA( SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(lpnm->lfSmCaptionFont), 0 );
/* menus, FIXME: names of wine.conf entrys are bogus */
/* menus, FIXME: names of wine.conf entries are bogus */
lpnm->iMenuWidth = GetProfileIntA( "Desktop", "MenuWidth", 13 ); /* size of the menu buttons*/
lpnm->iMenuHeight = GetProfileIntA( "Desktop", "MenuHeight",