Removed trailing whitespace.
diff --git a/windows/caret.c b/windows/caret.c
index 52ceaf9..1d278ab 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -100,7 +100,7 @@
ReleaseDC( Caret.hwnd, hdc );
}
-
+
/*****************************************************************
* CARET_Callback
*/
@@ -128,7 +128,7 @@
*/
static void CARET_ResetTimer(void)
{
- if (Caret.timerid)
+ if (Caret.timerid)
{
KillSystemTimer( (HWND)0, Caret.timerid );
Caret.timerid = SetSystemTimer( (HWND)0, 0, Caret.timeout,
@@ -142,7 +142,7 @@
*/
static void CARET_KillTimer(void)
{
- if (Caret.timerid)
+ if (Caret.timerid)
{
KillSystemTimer( (HWND)0, Caret.timerid );
Caret.timerid = 0;
@@ -171,8 +171,8 @@
Caret.height = bmp.bmHeight;
bmp.bmBits = NULL;
Caret.hBmp = CreateBitmapIndirect(&bmp);
-
- if (Caret.hBmp)
+
+ if (Caret.hBmp)
{
/* copy the bitmap */
LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, bmp.bmWidthBytes * bmp.bmHeight);
@@ -201,7 +201,7 @@
r.left = r.top = 0;
r.right = Caret.width;
r.bottom = Caret.height;
-
+
if ((Caret.hBmp = CreateCompatibleBitmap(hMemDC, Caret.width, Caret.height)))
{
HBITMAP hPrevBmp = SelectObject(hMemDC, Caret.hBmp);
@@ -223,7 +223,7 @@
Caret.timeout = GetProfileIntA( "windows", "CursorBlinkRate", 500 );
return TRUE;
}
-
+
/*****************************************************************
* DestroyCaret (USER.164)
diff --git a/windows/class.c b/windows/class.c
index 4a2df8e..6229abf 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -18,7 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * FIXME: In win32 all classes are local. They are registered at
+ * FIXME: In win32 all classes are local. They are registered at
* program start. Processes CANNOT share classes. (Source: some
* win31->NT migration book)
*
@@ -312,8 +312,8 @@
* NOTES
* 980805 a local class will be found now if registred with hInst=0
* and looed up with a hInst!=0. msmoney does it (jsch)
- *
- * Local class registered with a USER instance handle are found as if
+ *
+ * Local class registered with a USER instance handle are found as if
* they were global classes.
*/
static CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE hinstance )
@@ -342,7 +342,7 @@
}
}
}
-
+
/* Then search global classes */
for (class = firstClass; (class); class = class->next)
@@ -368,7 +368,7 @@
WARN("-- found local Class registred with hInst=0\n");
return tclass;
}
-
+
TRACE("-- not found\n");
return 0;
}
@@ -594,10 +594,10 @@
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr,
HIWORD(wc->lpszClassName) ? wc->lpszClassName : "" );
-
+
iSmIconWidth = GetSystemMetrics(SM_CXSMICON);
iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
-
+
classPtr->hIcon = wc->hIcon;
classPtr->hIconSm = CopyImage(wc->hIcon, IMAGE_ICON,
iSmIconWidth, iSmIconHeight,
@@ -634,7 +634,7 @@
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
-
+
iSmIconWidth = GetSystemMetrics(SM_CXSMICON);
iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
@@ -673,7 +673,7 @@
atom, (DWORD)wc->lpfnWndProc, hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
-
+
classPtr->hIcon = wc->hIcon;
classPtr->hIconSm = wc->hIconSm;
classPtr->hCursor = wc->hCursor;
@@ -707,7 +707,7 @@
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
-
+
classPtr->hIcon = (HICON16)wc->hIcon;
classPtr->hIconSm = (HICON16)wc->hIconSm;
classPtr->hCursor = (HCURSOR16)wc->hCursor;
@@ -740,7 +740,7 @@
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
-
+
classPtr->hIcon = (HICON16)wc->hIcon;
classPtr->hIconSm = (HICON16)wc->hIconSm;
classPtr->hCursor = (HCURSOR16)wc->hCursor;
@@ -1257,9 +1257,9 @@
CLASS *classPtr;
TRACE("%x %p %p\n",hInstance, name, wc);
-
+
if (!(atom = GlobalFindAtomA( name )) ||
- !(classPtr = CLASS_FindClassByAtom( atom, hInstance ))
+ !(classPtr = CLASS_FindClassByAtom( atom, hInstance ))
/*|| (hInstance != classPtr->hInstance) */ ) return FALSE;
wc->style = classPtr->style;
wc->lpfnWndProc = (WNDPROC)CLASS_GetProc( classPtr, WIN_PROC_32A );
@@ -1288,7 +1288,7 @@
CLASS *classPtr;
TRACE("%x %p %p\n",hInstance, name, wc);
-
+
if (!(atom = GlobalFindAtomW( name )) ||
!(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
(hInstance != classPtr->hInstance)) return FALSE;
@@ -1331,7 +1331,7 @@
CLASS *class = firstClass;
TRACE("%p\n",pClassEntry);
-
+
if (!pClassEntry->wNext) return FALSE;
for (i = 1; (i < pClassEntry->wNext) && class; i++) class = class->next;
if (!class)
diff --git a/windows/clipboard.c b/windows/clipboard.c
index 3a8a879..9927eda 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -132,7 +132,7 @@
*/
if ( hClipLock == hTaskCur )
bIsLocked = FALSE;
-
+
else if ( hTaskCur == hTaskClipOwner )
{
/* Check if we're currently executing inside a window procedure
@@ -143,7 +143,7 @@
*/
#if 0
MESSAGEQUEUE *queue = QUEUE_Current();
-
+
if ( queue
&& queue->smWaiting
&& queue->smWaiting->msg == WM_RENDERFORMAT
@@ -196,7 +196,7 @@
void CLIPBOARD_DeleteRecord(LPWINE_CLIPFORMAT lpFormat, BOOL bChange)
{
if( (lpFormat->wFormatID >= CF_GDIOBJFIRST &&
- lpFormat->wFormatID <= CF_GDIOBJLAST) || lpFormat->wFormatID == CF_BITMAP
+ lpFormat->wFormatID <= CF_GDIOBJLAST) || lpFormat->wFormatID == CF_BITMAP
|| lpFormat->wFormatID == CF_PALETTE)
{
if (lpFormat->hData32)
@@ -220,9 +220,9 @@
PostMessageA(hWndClipOwner, WM_TIMER,
(WPARAM)lpFormat->hDataSrc32, (LPARAM)CLIPBOARD_GlobalFreeProc);
}
-
+
if (lpFormat->hData16)
- /* HMETAFILE16 and HMETAFILE32 are apparently the same thing,
+ /* HMETAFILE16 and HMETAFILE32 are apparently the same thing,
and a shallow copy is enough to share a METAFILEPICT
structure between 16bit and 32bit clipboards. The MetaFile
should of course only be deleted once. */
@@ -234,7 +234,7 @@
GlobalFree16(lpFormat->hData16);
}
}
- else
+ else
{
if (lpFormat->hData32)
{
@@ -258,7 +258,7 @@
GlobalFree16(lpFormat->hData16);
}
- lpFormat->wDataPresent = 0;
+ lpFormat->wDataPresent = 0;
lpFormat->hData16 = 0;
lpFormat->hData32 = 0;
lpFormat->hDataSrc32 = 0;
@@ -272,7 +272,7 @@
*/
void CLIPBOARD_EmptyCache( BOOL bChange )
{
- LPWINE_CLIPFORMAT lpFormat = ClipFormats;
+ LPWINE_CLIPFORMAT lpFormat = ClipFormats;
while(lpFormat)
{
@@ -312,16 +312,16 @@
BOOL CLIPBOARD_IsCacheRendered()
{
LPWINE_CLIPFORMAT lpFormat = ClipFormats;
-
+
/* check if all formats were rendered */
while(lpFormat)
{
if( lpFormat->wDataPresent && !lpFormat->hData16 && !lpFormat->hData32 )
return FALSE;
-
+
lpFormat = lpFormat->NextFormat;
}
-
+
return TRUE;
}
@@ -356,7 +356,7 @@
HGLOBAL hGlobalDest;
PVOID pGlobalSrc, pGlobalDest;
DWORD cBytes;
-
+
if ( !hGlobalSrc )
return 0;
@@ -369,14 +369,14 @@
cBytes );
if ( !hGlobalDest )
return 0;
-
+
pGlobalSrc = GlobalLock(hGlobalSrc);
pGlobalDest = GlobalLock(hGlobalDest);
if ( !pGlobalSrc || !pGlobalDest )
return 0;
memcpy(pGlobalDest, pGlobalSrc, cBytes);
-
+
GlobalUnlock(hGlobalSrc);
GlobalUnlock(hGlobalDest);
@@ -404,7 +404,7 @@
* we must ask the driver to render the data to the clipboard cache.
*/
TRACE("enter format=%d\n", lpFormat->wFormatID);
- if ( !USER_Driver.pIsSelectionOwner()
+ if ( !USER_Driver.pIsSelectionOwner()
&& USER_Driver.pIsClipboardFormatAvailable( lpFormat->wFormatID ) )
{
if ( !USER_Driver.pGetClipboardData( lpFormat->wFormatID ) )
@@ -426,7 +426,7 @@
}
else
{
- WARN("\thWndClipOwner (%04x) is lost!\n",
+ WARN("\thWndClipOwner (%04x) is lost!\n",
hWndClipOwner);
CLIPBOARD_ReleaseOwner();
lpFormat->wDataPresent = 0;
@@ -502,10 +502,10 @@
*/
static LPWINE_CLIPFORMAT CLIPBOARD_RenderText( UINT wFormat )
{
- LPWINE_CLIPFORMAT lpSource = ClipFormats;
+ LPWINE_CLIPFORMAT lpSource = ClipFormats;
LPWINE_CLIPFORMAT lpTarget = NULL;
BOOL foundData = FALSE;
-
+
/* Asked for CF_TEXT */
if( wFormat == CF_TEXT)
{
@@ -588,7 +588,7 @@
}
}
if (!foundData)
- {
+ {
if ((wFormat == CF_TEXT) || (wFormat == CF_OEMTEXT))
{
lpSource = &ClipFormats[CF_UNICODETEXT-1];
@@ -608,9 +608,9 @@
if( lpTarget != lpSource && !lpTarget->hData16 && !lpTarget->hData32 )
{
INT src_chars, dst_chars, alloc_size;
- LPCSTR lpstrS;
+ LPCSTR lpstrS;
LPSTR lpstrT;
-
+
if (lpSource->hData32)
{
lpstrS = (LPSTR)GlobalLock(lpSource->hData32);
@@ -619,7 +619,7 @@
{
lpstrS = (LPSTR)GlobalLock16(lpSource->hData16);
}
-
+
if( !lpstrS ) return NULL;
/* Text always NULL terminated */
@@ -678,12 +678,12 @@
{
/* walk up to the specified format record */
- if( !(lpFormat = __lookup_format( lpFormat, wFormat )) )
+ if( !(lpFormat = __lookup_format( lpFormat, wFormat )) )
return 0;
lpFormat = lpFormat->NextFormat; /* right */
}
- while(TRUE)
+ while(TRUE)
{
if (lpFormat == NULL) return 0;
@@ -721,7 +721,7 @@
/**************************************************************************
- * WIN32 Clipboard implementation
+ * WIN32 Clipboard implementation
**************************************************************************/
/**************************************************************************
@@ -800,7 +800,7 @@
WARN("Clipboard not opened by calling task!\n");
return FALSE;
}
-
+
/* destroy private objects */
if (hWndClipOwner) SendMessageW( hWndClipOwner, WM_DESTROYCLIPBOARD, 0, 0 );
@@ -813,7 +813,7 @@
/* Save the current task */
hTaskClipOwner = GetCurrentTask();
-
+
/* Tell the driver to acquire the selection */
USER_Driver.pAcquireClipboard();
@@ -858,7 +858,7 @@
/* Pass on the request to the driver */
USER_Driver.pSetClipboardData(wFormat);
- if ( lpFormat->wDataPresent || lpFormat->hData16 || lpFormat->hData32 )
+ if ( lpFormat->wDataPresent || lpFormat->hData16 || lpFormat->hData32 )
{
CLIPBOARD_DeleteRecord(lpFormat, TRUE);
@@ -950,7 +950,7 @@
lpFormat->hData32 = CLIPBOARD_GlobalDupMem( hData );
else
lpFormat->hData32 = hData; /* 0 is legal, see WM_RENDERFORMAT */
-
+
lpFormat->hData16 = 0;
return lpFormat->hData32; /* Should we return lpFormat->hDataSrc32 */
@@ -962,7 +962,7 @@
*/
HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat )
{
- LPWINE_CLIPFORMAT lpRender = ClipFormats;
+ LPWINE_CLIPFORMAT lpRender = ClipFormats;
TRACE("(%04X)\n", wFormat);
@@ -982,7 +982,7 @@
lpRender = __lookup_format( ClipFormats, wFormat );
if( !lpRender || !CLIPBOARD_RenderFormat(lpRender) ) return 0;
}
-
+
/* Convert between 32 -> 16 bit data, if necessary */
if( lpRender->hData32 && !lpRender->hData16
&& CLIPBOARD_IsMemoryObject(wFormat) )
@@ -992,7 +992,7 @@
size = sizeof( METAFILEPICT16 );
else
size = GlobalSize(lpRender->hData32);
-
+
lpRender->hData16 = GlobalAlloc16(GMEM_ZEROINIT, size);
if( !lpRender->hData16 )
ERR("(%04X) -- not enough memory in 16b heap\n", wFormat);
@@ -1003,14 +1003,14 @@
FIXME("\timplement function CopyMetaFilePict32to16\n");
FIXME("\tin the appropriate file.\n");
#ifdef SOMEONE_IMPLEMENTED_ME
- CopyMetaFilePict32to16( GlobalLock16(lpRender->hData16),
+ CopyMetaFilePict32to16( GlobalLock16(lpRender->hData16),
GlobalLock(lpRender->hData32) );
#endif
}
else
{
- memcpy( GlobalLock16(lpRender->hData16),
- GlobalLock(lpRender->hData32),
+ memcpy( GlobalLock16(lpRender->hData16),
+ GlobalLock(lpRender->hData32),
size );
}
GlobalUnlock16(lpRender->hData16);
@@ -1018,7 +1018,7 @@
}
}
- TRACE("\treturning %04x (type %i)\n",
+ TRACE("\treturning %04x (type %i)\n",
lpRender->hData16, lpRender->wFormatID);
return lpRender->hData16;
}
@@ -1029,7 +1029,7 @@
*/
HANDLE WINAPI GetClipboardData( UINT wFormat )
{
- LPWINE_CLIPFORMAT lpRender = ClipFormats;
+ LPWINE_CLIPFORMAT lpRender = ClipFormats;
TRACE("(%08X)\n", wFormat);
@@ -1049,7 +1049,7 @@
lpRender = __lookup_format( ClipFormats, wFormat );
if( !lpRender || !CLIPBOARD_RenderFormat(lpRender) ) return 0;
}
-
+
/* Convert between 16 -> 32 bit data, if necessary */
if( lpRender->hData16 && !lpRender->hData32
&& CLIPBOARD_IsMemoryObject(wFormat) )
@@ -1066,21 +1066,21 @@
FIXME("\timplement function CopyMetaFilePict16to32\n");
FIXME("\tin the appropriate file.\n");
#ifdef SOMEONE_IMPLEMENTED_ME
- CopyMetaFilePict16to32( GlobalLock16(lpRender->hData32),
+ CopyMetaFilePict16to32( GlobalLock16(lpRender->hData32),
GlobalLock(lpRender->hData16) );
#endif
}
else
{
- memcpy( GlobalLock(lpRender->hData32),
- GlobalLock16(lpRender->hData16),
+ memcpy( GlobalLock(lpRender->hData32),
+ GlobalLock16(lpRender->hData16),
size );
}
GlobalUnlock(lpRender->hData32);
GlobalUnlock16(lpRender->hData16);
}
- TRACE("\treturning %04x (type %i)\n",
+ TRACE("\treturning %04x (type %i)\n",
lpRender->hData32, lpRender->wFormatID);
return lpRender->hData32;
}
@@ -1101,11 +1101,11 @@
INT WINAPI CountClipboardFormats(void)
{
INT FormatCount = 0;
- LPWINE_CLIPFORMAT lpFormat = ClipFormats;
+ LPWINE_CLIPFORMAT lpFormat = ClipFormats;
TRACE("()\n");
- while(TRUE)
+ while(TRUE)
{
if (lpFormat == NULL) break;
@@ -1170,8 +1170,8 @@
*/
UINT WINAPI RegisterClipboardFormatA( LPCSTR FormatName )
{
- LPWINE_CLIPFORMAT lpNewFormat;
- LPWINE_CLIPFORMAT lpFormat = ClipFormats;
+ LPWINE_CLIPFORMAT lpNewFormat;
+ LPWINE_CLIPFORMAT lpFormat = ClipFormats;
if (FormatName == NULL) return 0;
@@ -1179,14 +1179,14 @@
/* walk format chain to see if it's already registered */
- while(TRUE)
+ while(TRUE)
{
if ( !strcmp(lpFormat->Name,FormatName) )
{
lpFormat->wRefCount++;
return lpFormat->wFormatID;
}
-
+
if ( lpFormat->NextFormat == NULL ) break;
lpFormat = lpFormat->NextFormat;
@@ -1221,7 +1221,7 @@
/* Pass on the registration request to the driver */
USER_Driver.pRegisterClipboardFormat( FormatName );
-
+
return LastRegFormat++;
}
@@ -1265,7 +1265,7 @@
TRACE("(%04X, %p, %d) !\n", wFormat, retStr, maxlen);
- if (lpFormat == NULL || lpFormat->Name == NULL ||
+ if (lpFormat == NULL || lpFormat->Name == NULL ||
lpFormat->wFormatID < CF_REGFORMATBASE) return 0;
TRACE("Name='%s' !\n", lpFormat->Name);
@@ -1283,7 +1283,7 @@
INT ret;
LPSTR p = HeapAlloc( GetProcessHeap(), 0, maxlen );
if(p == NULL) return 0; /* FIXME: is this the correct failure value? */
-
+
ret = GetClipboardFormatNameA( wFormat, p, maxlen );
if (maxlen > 0 && !MultiByteToWideChar( CP_ACP, 0, p, -1, retStr, maxlen ))
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index 022b735..615bdee 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -101,7 +101,7 @@
* map_fileW
*
* Helper function to map a file to memory:
- * name - file name
+ * name - file name
* [RETURN] ptr - pointer to mapped file
*/
static void *map_fileW( LPCWSTR name )
@@ -149,12 +149,12 @@
}
/*************************************************************************
- * CURSORICON_FindCache
+ * CURSORICON_FindCache
*
* Given a handle, find the corresponding cache element
*
* PARAMS
- * Handle [I] handle to an Image
+ * Handle [I] handle to an Image
*
* RETURNS
* Success: The cache entry
@@ -247,7 +247,7 @@
{
ICONCACHE *freePtr = *ptr;
*ptr = freePtr->next;
-
+
GlobalFree16( freePtr->handle );
HeapFree( GetProcessHeap(), 0, freePtr );
continue;
@@ -266,7 +266,7 @@
static CURSORICONDIRENTRY *CURSORICON_FindBestIcon( CURSORICONDIR *dir, int width,
int height, int colors )
{
- int i;
+ int i;
CURSORICONDIRENTRY *entry, *bestEntry = NULL;
UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff;
UINT iTempXDiff, iTempYDiff, iTempColorDiff;
@@ -393,7 +393,7 @@
if ( *(LPDWORD)bits==0x46464952 ) /* "RIFF" */
{ LPBYTE pos = (LPBYTE) bits;
FIXME_(cursor)("Animated icons not correctly implemented! %p \n", bits);
-
+
for (;;)
{ if (*(LPDWORD)pos==0x6e6f6369) /* "icon" */
{ FIXME_(cursor)("icon entry found! %p\n", bits);
@@ -415,7 +415,7 @@
for (i=0; i < entries; i++)
size += bits->idEntries[i].dwDIBSize + (fCursor ? sizeof(POINT16): 0);
-
+
if (!(*ptr = HeapAlloc( GetProcessHeap(), 0,
entries * sizeof (CURSORICONDIRENTRY*)))) goto fail;
if (!(*res = HeapAlloc( GetProcessHeap(), 0, size))) goto fail;
@@ -447,7 +447,7 @@
_free += (*res)->idEntries[i].dwBytesInRes;
}
UnmapViewOfFile( bits );
- return TRUE;
+ return TRUE;
fail:
if (*res) HeapFree( GetProcessHeap(), 0, *res );
if (*ptr) HeapFree( GetProcessHeap(), 0, *ptr );
@@ -459,13 +459,13 @@
/**********************************************************************
* CURSORICON_CreateFromResource
*
- * Create a cursor or icon from in-memory resource template.
+ * Create a cursor or icon from in-memory resource template.
*
* FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something
* with cbSize parameter as well.
*/
static HGLOBAL16 CURSORICON_CreateFromResource( HINSTANCE16 hInstance, HGLOBAL16 hObj, LPBYTE bits,
- UINT cbSize, BOOL bIcon, DWORD dwVersion,
+ UINT cbSize, BOOL bIcon, DWORD dwVersion,
INT width, INT height, UINT loadflags )
{
static HDC hdcMem;
@@ -521,7 +521,7 @@
/* Make sure we have room for the monochrome bitmap later on.
* Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same
- * up to and including the biBitCount. In-memory icon resource
+ * up to and including the biBitCount. In-memory icon resource
* format is as follows:
*
* BITMAPINFOHEADER icHeader // DIB header
@@ -530,10 +530,10 @@
* BYTE icAND[] // DIB bits for AND mask
*/
- if ((pInfo = (BITMAPINFO *)HeapAlloc( GetProcessHeap(), 0,
+ if ((pInfo = (BITMAPINFO *)HeapAlloc( GetProcessHeap(), 0,
max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD)))))
- {
- memcpy( pInfo, bmi, size );
+ {
+ memcpy( pInfo, bmi, size );
pInfo->bmiHeader.biHeight /= 2;
/* Create the XOR bitmap */
@@ -611,11 +611,11 @@
if( !hAndBits ) DeleteObject( hXorBits );
}
- HeapFree( GetProcessHeap(), 0, pInfo );
+ HeapFree( GetProcessHeap(), 0, pInfo );
}
}
- if( !hXorBits || !hAndBits )
+ if( !hXorBits || !hAndBits )
{
WARN_(cursor)("\tunable to create an icon bitmap.\n");
return 0;
@@ -627,9 +627,9 @@
sizeXor = bmpXor.bmHeight * bmpXor.bmWidthBytes;
sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes;
- if (hObj) hObj = GlobalReAlloc16( hObj,
+ if (hObj) hObj = GlobalReAlloc16( hObj,
sizeof(CURSORICONINFO) + sizeXor + sizeAnd, GMEM_MOVEABLE );
- if (!hObj) hObj = GlobalAlloc16( GMEM_MOVEABLE,
+ if (!hObj) hObj = GlobalAlloc16( GMEM_MOVEABLE,
sizeof(CURSORICONINFO) + sizeXor + sizeAnd );
if (hObj)
{
@@ -669,7 +669,7 @@
HICON16 WINAPI CreateIconFromResourceEx16( LPBYTE bits, UINT16 cbSize, BOOL16 bIcon,
DWORD dwVersion, INT16 width, INT16 height, UINT16 cFlag )
{
- return CreateIconFromResourceEx(bits, cbSize, bIcon, dwVersion,
+ return CreateIconFromResourceEx(bits, cbSize, bIcon, dwVersion,
width, height, cFlag);
}
@@ -721,7 +721,7 @@
else
dirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestIcon(dir, width, height, colors);
bits = ptr[dirEntry->wResId-1];
- h = CURSORICON_CreateFromResource( 0, 0, bits, dirEntry->dwBytesInRes,
+ h = CURSORICON_CreateFromResource( 0, 0, bits, dirEntry->dwBytesInRes,
!fCursor, 0x00030000, width, height, loadflags);
HeapFree( GetProcessHeap(), 0, dir );
HeapFree( GetProcessHeap(), 0, ptr );
@@ -738,7 +738,7 @@
}
/* Normalize hInstance (must be uniquely represented for icon cache) */
-
+
if ( HIWORD( hInstance ) )
hInstance = MapHModuleLS( hInstance );
else
@@ -752,7 +752,7 @@
hGroupRsrc = hRsrc;
/* Find the best entry in the directory */
-
+
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
if (!(dir = (CURSORICONDIR*)LockResource( handle ))) return 0;
if (fCursor)
@@ -770,15 +770,15 @@
if (!(hRsrc = FindResourceW(hInstance,MAKEINTRESOURCEW(wResId),
fCursor ? RT_CURSORW : RT_ICONW ))) return 0;
-
+
/* If shared icon, check whether it was already loaded */
- if ( (loadflags & LR_SHARED)
+ if ( (loadflags & LR_SHARED)
&& (h = CURSORICON_FindSharedIcon( hInstance, hRsrc ) ) != 0 )
return h;
-
+
if (!(handle = LoadResource( hInstance, hRsrc ))) return 0;
bits = (LPBYTE)LockResource( handle );
- h = CURSORICON_CreateFromResource( 0, 0, bits, dwBytesInRes,
+ h = CURSORICON_CreateFromResource( 0, 0, bits, dwBytesInRes,
!fCursor, 0x00030000, width, height, loadflags);
FreeResource( handle );
@@ -815,12 +815,12 @@
}
/*************************************************************************
- * CURSORICON_ExtCopy
+ * CURSORICON_ExtCopy
*
* Copies an Image from the Cache if LR_COPYFROMRESOURCE is specified
*
* PARAMS
- * Handle [I] handle to an Image
+ * Handle [I] handle to an Image
* nType [I] Type of Handle (IMAGE_CURSOR | IMAGE_ICON)
* iDesiredCX [I] The Desired width of the Image
* iDesiredCY [I] The desired height of the Image
@@ -834,16 +834,16 @@
* LR_MONOCHROME should be implemented by CURSORICON_CreateFromResource.
* LR_COPYFROMRESOURCE will only work if the Image is in the Cache.
*
- *
+ *
*/
-HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,
- INT iDesiredCX, INT iDesiredCY,
+HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,
+ INT iDesiredCX, INT iDesiredCY,
UINT nFlags)
{
HGLOBAL16 hNew=0;
- TRACE_(icon)("Handle %u, uType %u, iDesiredCX %i, iDesiredCY %i, nFlags %u\n",
+ TRACE_(icon)("Handle %u, uType %u, iDesiredCX %i, iDesiredCY %i, nFlags %u\n",
Handle, nType, iDesiredCX, iDesiredCY, nFlags);
if(Handle == 0)
@@ -854,7 +854,7 @@
/* Best Fit or Monochrome */
if( (nFlags & LR_COPYFROMRESOURCE
&& (iDesiredCX > 0 || iDesiredCY > 0))
- || nFlags & LR_MONOCHROME)
+ || nFlags & LR_MONOCHROME)
{
ICONCACHE* pIconCache = CURSORICON_FindCache(Handle);
@@ -885,25 +885,25 @@
if(((nFlags & LR_MONOCHROME) && !(nFlags & LR_COPYFROMRESOURCE))
|| (iDesiredCX == 0 && iDesiredCY == 0))
{
- iDesiredCY = GetSystemMetrics(bIsIcon ?
+ iDesiredCY = GetSystemMetrics(bIsIcon ?
SM_CYICON : SM_CYCURSOR);
- iDesiredCX = GetSystemMetrics(bIsIcon ?
+ iDesiredCX = GetSystemMetrics(bIsIcon ?
SM_CXICON : SM_CXCURSOR);
}
- /* Retrieve the CURSORICONDIRENTRY
+ /* Retrieve the CURSORICONDIRENTRY
*/
- if (!(hMem = LoadResource( pIconCache->hModule ,
- pIconCache->hGroupRsrc)))
+ if (!(hMem = LoadResource( pIconCache->hModule ,
+ pIconCache->hGroupRsrc)))
{
return 0;
}
- if (!(pDir = (CURSORICONDIR*)LockResource( hMem )))
+ if (!(pDir = (CURSORICONDIR*)LockResource( hMem )))
{
return 0;
}
- /* Find Best Fit
+ /* Find Best Fit
*/
if(bIsIcon)
{
@@ -912,7 +912,7 @@
}
else
{
- pDirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestCursor(
+ pDirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestCursor(
pDir, iDesiredCX, iDesiredCY, 1);
}
@@ -920,24 +920,24 @@
dwBytesInRes = pDirEntry->dwBytesInRes;
FreeResource(hMem);
- TRACE_(icon)("ResID %u, BytesInRes %lu, Width %d, Height %d DX %d, DY %d\n",
- wResId, dwBytesInRes, pDirEntry->ResInfo.icon.bWidth,
+ TRACE_(icon)("ResID %u, BytesInRes %lu, Width %d, Height %d DX %d, DY %d\n",
+ wResId, dwBytesInRes, pDirEntry->ResInfo.icon.bWidth,
pDirEntry->ResInfo.icon.bHeight, iDesiredCX, iDesiredCY);
/* Get the Best Fit
*/
if (!(hRsrc = FindResourceW(pIconCache->hModule ,
- MAKEINTRESOURCEW(wResId), bIsIcon ? RT_ICONW : RT_CURSORW)))
+ MAKEINTRESOURCEW(wResId), bIsIcon ? RT_ICONW : RT_CURSORW)))
{
return 0;
}
- if (!(hMem = LoadResource( pIconCache->hModule , hRsrc )))
+ if (!(hMem = LoadResource( pIconCache->hModule , hRsrc )))
{
return 0;
}
pBits = (LPBYTE)LockResource( hMem );
-
+
if(nFlags & LR_DEFAULTSIZE)
{
iTargetCY = GetSystemMetrics(SM_CYICON);
@@ -946,7 +946,7 @@
/* Create a New Icon with the proper dimension
*/
- hNew = CURSORICON_CreateFromResource( 0, 0, pBits, dwBytesInRes,
+ hNew = CURSORICON_CreateFromResource( 0, 0, pBits, dwBytesInRes,
bIsIcon, 0x00030000, iTargetCX, iTargetCY, nFlags);
FreeResource(hMem);
}
@@ -972,11 +972,11 @@
{
hRet = CURSORICON_Copy( 0, hIcon );
-
+
pIcon = GlobalLock16(hRet);
pIcon->ptHotSpot.x = pIcon->ptHotSpot.y = 15;
-
+
GlobalUnlock16(hRet);
}
else
@@ -990,7 +990,7 @@
CURSORICONINFO cI;
- TRACE_(icon)("[%04x] %ix%i %ibpp (bogus %ibps)\n",
+ TRACE_(icon)("[%04x] %ix%i %ibpp (bogus %ibps)\n",
hIcon, pIcon->nWidth, pIcon->nHeight, pIcon->bBitsPerPixel, pIcon->nWidthBytes );
xor_width = BITMAP_GetWidthBytes( pIcon->nWidth, bpp );
@@ -1008,9 +1008,9 @@
for( iy = 0; iy < maxy; iy++ )
{
- unsigned shift = iy % 2;
+ unsigned shift = iy % 2;
- memcpy( pAndBits + iy * 4, (BYTE *)(pIcon + 1) + iy * and_width,
+ memcpy( pAndBits + iy * 4, (BYTE *)(pIcon + 1) + iy * and_width,
(and_width > 4) ? 4 : and_width );
for( ix = 0; ix < maxx; ix++ )
{
@@ -1146,33 +1146,33 @@
/***********************************************************************
* CreateIcon (USER32.@)
*
- * Creates an icon based on the specified bitmaps. The bitmaps must be
- * provided in a device dependent format and will be resized to
- * (SM_CXICON,SM_CYICON) and depth converted to match the screen's color
+ * Creates an icon based on the specified bitmaps. The bitmaps must be
+ * provided in a device dependent format and will be resized to
+ * (SM_CXICON,SM_CYICON) and depth converted to match the screen's color
* depth. The provided bitmaps must be top-down bitmaps.
- * Although Windows does not support 15bpp(*) this API must support it
+ * Although Windows does not support 15bpp(*) this API must support it
* for Winelib applications.
*
- * (*) Windows does not support 15bpp but it supports the 555 RGB 16bpp
+ * (*) Windows does not support 15bpp but it supports the 555 RGB 16bpp
* format!
*
* BUGS
*
* - The provided bitmaps are not resized!
- * - The documentation says the lpXORbits bitmap must be in a device
- * dependent format. But we must still resize it and perform depth
+ * - The documentation says the lpXORbits bitmap must be in a device
+ * dependent format. But we must still resize it and perform depth
* conversions if necessary.
* - I'm a bit unsure about the how the 'device dependent format' thing works.
- * I did some tests on windows and found that if you provide a 16bpp bitmap
- * in lpXORbits, then its format but be 565 RGB if the screen's bit depth
+ * I did some tests on windows and found that if you provide a 16bpp bitmap
+ * in lpXORbits, then its format but be 565 RGB if the screen's bit depth
* is 16bpp but it must be 555 RGB if the screen's bit depth is anything
- * else. I don't know if this is part of the GDI specs or if this is a
+ * else. I don't know if this is part of the GDI specs or if this is a
* quirk of the graphics card driver.
- * - You may think that we check whether the bit depths match or not
- * as an optimization. But the truth is that the conversion using
- * CreateDIBitmap does not work for some bit depth (e.g. 8bpp) and I have
+ * - You may think that we check whether the bit depths match or not
+ * as an optimization. But the truth is that the conversion using
+ * CreateDIBitmap does not work for some bit depth (e.g. 8bpp) and I have
* no idea why.
- * - I'm pretty sure that all the things we do in CreateIcon should
+ * - I'm pretty sure that all the things we do in CreateIcon should
* also be done in CreateIconIndirect...
*/
HICON WINAPI CreateIcon(
@@ -1304,8 +1304,8 @@
* DestroyIcon32 (USER32.@)
*
* This routine is actually exported from Win95 USER under the name
- * DestroyIcon32 ... The behaviour implemented here should mimic
- * the Win95 one exactly, especially the return values, which
+ * DestroyIcon32 ... The behaviour implemented here should mimic
+ * the Win95 one exactly, especially the return values, which
* depend on the setting of various flags.
*/
WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags )
@@ -1571,7 +1571,7 @@
*/
BOOL WINAPI GetClipCursor( RECT *rect )
{
- if (rect)
+ if (rect)
{
CopyRect( rect, &CURSOR_ClipRect );
return TRUE;
@@ -1628,7 +1628,7 @@
*/
INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon )
{
- return LookupIconIdFromDirectoryEx16( dir, bIcon,
+ return LookupIconIdFromDirectoryEx16( dir, bIcon,
bIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR),
bIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), bIcon ? 0 : LR_MONOCHROME );
}
@@ -1638,7 +1638,7 @@
*/
INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )
{
- return LookupIconIdFromDirectoryEx( dir, bIcon,
+ return LookupIconIdFromDirectoryEx( dir, bIcon,
bIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR),
bIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), bIcon ? 0 : LR_MONOCHROME );
}
@@ -1656,7 +1656,7 @@
switch(resType)
{
case RT_CURSOR16:
- return (WORD)LookupIconIdFromDirectoryEx16( lpDir, FALSE,
+ return (WORD)LookupIconIdFromDirectoryEx16( lpDir, FALSE,
GetSystemMetrics(SM_CXCURSOR), GetSystemMetrics(SM_CYCURSOR), LR_MONOCHROME );
case RT_ICON16:
return (WORD)LookupIconIdFromDirectoryEx16( lpDir, TRUE,
@@ -1674,14 +1674,14 @@
*/
HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule, HRSRC16 hRsrc )
{
- FIXME_(cursor)("(%04x,%04x,%04x): old 2.x resources are not supported!\n",
+ FIXME_(cursor)("(%04x,%04x,%04x): old 2.x resources are not supported!\n",
hResource, hModule, hRsrc);
return (HGLOBAL16)0;
}
/**********************************************************************
* LoadDIBIconHandler (USER.357)
- *
+ *
* RT_ICON resource loader, installed by USER_SignalProc when module
* is initialized.
*/
@@ -1689,7 +1689,7 @@
{
/* If hResource is zero we must allocate a new memory block, if it's
* non-zero but GlobalLock() returns NULL then it was discarded and
- * we have to recommit some memory, otherwise we just need to check
+ * we have to recommit some memory, otherwise we just need to check
* the block size. See LoadProc() in 16-bit SDK for more.
*/
@@ -1697,8 +1697,8 @@
if( hMemObj )
{
LPBYTE bits = (LPBYTE)GlobalLock16( hMemObj );
- hMemObj = CURSORICON_CreateFromResource( hModule, hMemObj, bits,
- SizeofResource16(hModule, hRsrc), TRUE, 0x00030000,
+ hMemObj = CURSORICON_CreateFromResource( hModule, hMemObj, bits,
+ SizeofResource16(hModule, hRsrc), TRUE, 0x00030000,
GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR );
}
return hMemObj;
@@ -1731,7 +1731,7 @@
TRACE_(cursor)("hRes=%04x\n",hResource);
- return CURSORICON_CreateFromResource( 0, 0, bits, 0, TRUE,
+ return CURSORICON_CreateFromResource( 0, 0, bits, 0, TRUE,
bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR );
}
@@ -1740,7 +1740,7 @@
*/
HCURSOR WINAPI LoadCursorW(HINSTANCE hInstance, LPCWSTR name)
{
- return LoadImageW( hInstance, name, IMAGE_CURSOR, 0, 0,
+ return LoadImageW( hInstance, name, IMAGE_CURSOR, 0, 0,
LR_SHARED | LR_DEFAULTSIZE );
}
@@ -1749,7 +1749,7 @@
*/
HCURSOR WINAPI LoadCursorA(HINSTANCE hInstance, LPCSTR name)
{
- return LoadImageA( hInstance, name, IMAGE_CURSOR, 0, 0,
+ return LoadImageA( hInstance, name, IMAGE_CURSOR, 0, 0,
LR_SHARED | LR_DEFAULTSIZE );
}
@@ -1758,7 +1758,7 @@
*/
HCURSOR WINAPI LoadCursorFromFileW (LPCWSTR name)
{
- return LoadImageW( 0, name, IMAGE_CURSOR, 0, 0,
+ return LoadImageW( 0, name, IMAGE_CURSOR, 0, 0,
LR_LOADFROMFILE | LR_DEFAULTSIZE );
}
@@ -1767,16 +1767,16 @@
*/
HCURSOR WINAPI LoadCursorFromFileA (LPCSTR name)
{
- return LoadImageA( 0, name, IMAGE_CURSOR, 0, 0,
+ return LoadImageA( 0, name, IMAGE_CURSOR, 0, 0,
LR_LOADFROMFILE | LR_DEFAULTSIZE );
}
-
+
/***********************************************************************
* LoadIconW (USER32.@)
*/
HICON WINAPI LoadIconW(HINSTANCE hInstance, LPCWSTR name)
{
- return LoadImageW( hInstance, name, IMAGE_ICON, 0, 0,
+ return LoadImageW( hInstance, name, IMAGE_ICON, 0, 0,
LR_SHARED | LR_DEFAULTSIZE );
}
@@ -1785,7 +1785,7 @@
*/
HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name)
{
- return LoadImageA( hInstance, name, IMAGE_ICON, 0, 0,
+ return LoadImageA( hInstance, name, IMAGE_ICON, 0, 0,
LR_SHARED | LR_DEFAULTSIZE );
}
@@ -1857,7 +1857,7 @@
sizeXor = bmpXor.bmHeight * bmpXor.bmWidthBytes;
sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes;
- hObj = GlobalAlloc16( GMEM_MOVEABLE,
+ hObj = GlobalAlloc16( GMEM_MOVEABLE,
sizeof(CURSORICONINFO) + sizeXor + sizeAnd );
if (hObj)
{
@@ -1927,7 +1927,7 @@
* Failure: FALSE
*/
BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
- INT cxWidth, INT cyWidth, UINT istep,
+ INT cxWidth, INT cyWidth, UINT istep,
HBRUSH hbr, UINT flags )
{
CURSORICONINFO *ptr = (CURSORICONINFO *)GlobalLock16 (hIcon);
@@ -2007,17 +2007,17 @@
HBITMAP hBitTemp = SelectObject( hMemDC, hAndBits );
if (flags & DI_MASK)
{
- if (DoOffscreen)
+ if (DoOffscreen)
StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,
hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND);
- else
+ else
StretchBlt (hdc, x0, y0, cxWidth, cyWidth,
hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCAND);
}
SelectObject( hMemDC, hXorBits );
if (flags & DI_IMAGE)
{
- if (DoOffscreen)
+ if (DoOffscreen)
StretchBlt (hDC_off, 0, 0, cxWidth, cyWidth,
hMemDC, 0, 0, ptr->nWidth, ptr->nHeight, SRCPAINT);
else
@@ -2077,8 +2077,8 @@
case 1: pix = pix >> 7; break;
case 4: pix = pix >> 4; break;
case 8: break;
- default:
- WARN_(resource)("(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount);
+ default:
+ WARN_(resource)("(%d): Unsupported depth\n", bmi->bmiHeader.biBitCount);
return;
}
if (pix >= colors) {
@@ -2095,19 +2095,19 @@
for (i=0; i<colors; i++) {
ptr = (RGBQUAD*)((char*)bmi->bmiColors+i*incr);
c_C = RGB(ptr->rgbRed, ptr->rgbGreen, ptr->rgbBlue);
- if (c_C == RGB(128, 128, 128)) {
+ if (c_C == RGB(128, 128, 128)) {
ptr->rgbRed = GetRValue(c_S);
ptr->rgbGreen = GetGValue(c_S);
ptr->rgbBlue = GetBValue(c_S);
- } else if (c_C == RGB(192, 192, 192)) {
+ } else if (c_C == RGB(192, 192, 192)) {
ptr->rgbRed = GetRValue(c_F);
ptr->rgbGreen = GetGValue(c_F);
ptr->rgbBlue = GetBValue(c_F);
- } else if (c_C == RGB(223, 223, 223)) {
+ } else if (c_C == RGB(223, 223, 223)) {
ptr->rgbRed = GetRValue(c_L);
ptr->rgbGreen = GetGValue(c_L);
ptr->rgbBlue = GetBValue(c_L);
- }
+ }
}
}
@@ -2187,7 +2187,7 @@
/**********************************************************************
* LoadImageA (USER32.@)
- *
+ *
* FIXME: implementation lacks some features, see LR_ defines in winuser.h
*/
diff --git a/windows/dce.c b/windows/dce.c
index 4d0d41c..ab395a9 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -19,9 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
- * Note: Visible regions of CS_OWNDC/CS_CLASSDC window DCs
- * have to be updated dynamically.
- *
+ * Note: Visible regions of CS_OWNDC/CS_CLASSDC window DCs
+ * have to be updated dynamically.
+ *
* Internal DCX flags:
*
* DCX_DCEEMPTY - dce is uninitialized
@@ -57,16 +57,16 @@
static void DCE_DumpCache(void)
{
DCE *dce;
-
+
USER_Lock();
dce = firstDCE;
-
+
DPRINTF("DCE:\n");
while( dce )
{
DPRINTF("\t[0x%08x] hWnd 0x%04x, dcx %08x, %s %s\n",
- (unsigned)dce, dce->hwndCurrent, (unsigned)dce->DCXflags,
- (dce->DCXflags & DCX_CACHE) ? "Cache" : "Owned",
+ (unsigned)dce, dce->hwndCurrent, (unsigned)dce->DCXflags,
+ (dce->DCXflags & DCX_CACHE) ? "Cache" : "Owned",
(dce->DCXflags & DCX_DCEBUSY) ? "InUse" : "" );
dce = dce->next;
}
@@ -82,7 +82,7 @@
DCE *DCE_AllocDCE( HWND hWnd, DCE_TYPE type )
{
DCE * dce;
-
+
if (!(dce = HeapAlloc( GetProcessHeap(), 0, sizeof(DCE) ))) return NULL;
if (!(dce->hDC = CreateDCA( "DISPLAY", NULL, NULL, NULL )))
{
@@ -110,7 +110,7 @@
SetHookFlags16(dce->hDC,DCHF_INVALIDATEVISRGN);
}
else dce->DCXflags = DCX_CACHE | DCX_DCEEMPTY;
-
+
USER_Lock();
dce->next = firstDCE;
firstDCE = dce;
@@ -180,10 +180,10 @@
{
if( pDCE->DCXflags & DCX_DCEBUSY ) /* shared cache DCE */
{
- /* FIXME: AFAICS we are doing the right thing here so
- * this should be a WARN. But this is best left as an ERR
- * because the 'application error' is likely to come from
- * another part of Wine (i.e. it's our fault after all).
+ /* FIXME: AFAICS we are doing the right thing here so
+ * this should be a WARN. But this is best left as an ERR
+ * because the 'application error' is likely to come from
+ * another part of Wine (i.e. it's our fault after all).
* We should change this to WARN when Wine is more stable
* (for 1.0?).
*/
@@ -244,7 +244,7 @@
dce->DCXflags &= ~DCX_DCEBUSY;
if (dce->DCXflags & DCX_DCEDIRTY)
{
- /* don't keep around invalidated entries
+ /* don't keep around invalidated entries
* because SetDCState() disables hVisRgn updates
* by removing dirty bit. */
@@ -277,7 +277,7 @@
TRACE("scope hwnd = %04x, (%i,%i - %i,%i)\n",
hwndScope, pRectUpdate->left,pRectUpdate->top,
pRectUpdate->right,pRectUpdate->bottom);
- if(TRACE_ON(dc))
+ if(TRACE_ON(dc))
DCE_DumpCache();
/* walk all DCEs and fixup non-empty entries */
@@ -328,7 +328,7 @@
/***********************************************************************
* DCE_ExcludeRgn
- *
+ *
* Translate given region from the wnd client to the DC coordinates
* and add it to the clipping region.
*/
@@ -371,7 +371,7 @@
BOOL bUpdateClipOrigin = FALSE;
HWND parent, full;
- TRACE("hwnd %04x, hrgnClip %04x, flags %08x\n",
+ TRACE("hwnd %04x, hrgnClip %04x, flags %08x\n",
hwnd, hrgnClip, (unsigned)flags);
if (!hwnd) hwnd = GetDesktopWindow();
@@ -425,7 +425,7 @@
/* find a suitable DCE */
- dcxFlags = flags & (DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN |
+ dcxFlags = flags & (DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN |
DCX_CACHE | DCX_WINDOW);
if (flags & DCX_CACHE)
@@ -453,9 +453,9 @@
((dce->DCXflags & (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN |
DCX_CACHE | DCX_WINDOW | DCX_PARENTCLIP)) == dcxFlags))
{
- TRACE("\tfound valid %08x dce [%04x], flags %08x\n",
+ TRACE("\tfound valid %08x dce [%04x], flags %08x\n",
(unsigned)dce, hwnd, (unsigned)dcxFlags );
- bUpdateVisRgn = FALSE;
+ bUpdateVisRgn = FALSE;
bUpdateClipOrigin = TRUE;
break;
}
@@ -463,14 +463,14 @@
}
if (!dce) dce = (dceEmpty) ? dceEmpty : dceUnused;
-
+
/* if there's no dce empty or unused, allocate a new one */
if (!dce)
{
dce = DCE_AllocDCE( 0, DCE_CACHE_DC );
}
}
- else
+ else
{
dce = wndPtr->dce;
if (dce && dce->hwndCurrent == hwnd)
@@ -545,8 +545,8 @@
* 1: Success
* 0: Failure
*/
-INT WINAPI ReleaseDC(
- HWND hwnd /* [in] Handle of window - ignored */,
+INT WINAPI ReleaseDC(
+ HWND hwnd /* [in] Handle of window - ignored */,
HDC hdc /* [in] Handle of device context */
) {
DCE * dce;
@@ -554,12 +554,12 @@
USER_Lock();
dce = firstDCE;
-
+
TRACE("%04x %04x\n", hwnd, hdc );
-
+
while (dce && (dce->hDC != hdc)) dce = dce->next;
- if ( dce )
+ if ( dce )
if ( dce->DCXflags & DCX_DCEBUSY )
nRet = DCE_ReleaseDC( dce );
@@ -571,7 +571,7 @@
/***********************************************************************
* DCHook (USER.362)
*
- * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags)..
+ * See "Undoc. Windows" for hints (DC, SetDCHook, SetHookFlags)..
*/
BOOL16 WINAPI DCHook16( HDC16 hDC, WORD code, DWORD data, LPARAM lParam )
{
@@ -637,12 +637,12 @@
USER_Lock();
dce = firstDCE;
-
+
while (dce && (dce->hDC != hDC)) dce = dce->next;
hwnd = dce ? dce->hwndCurrent : 0;
USER_Unlock();
-
+
return hwnd;
}
diff --git a/windows/defdlg.c b/windows/defdlg.c
index de11848..018348d 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -134,10 +134,10 @@
{
DWORD dlgcode=0; /* initialize just to avoid a warning */
if (hwndNew &&
- !((dlgcode=SendMessageW(hwndNew, WM_GETDLGCODE, 0, 0 ))
+ !((dlgcode=SendMessageW(hwndNew, WM_GETDLGCODE, 0, 0 ))
& (DLGC_UNDEFPUSHBUTTON | DLGC_BUTTON)))
return FALSE; /* Destination is not a push button */
-
+
if (dlgInfo->idResult) /* There's already a default pushbutton */
{
HWND hwndOld = GetDlgItem( hwndDlg, dlgInfo->idResult );
@@ -251,14 +251,14 @@
}
return DefWindowProcA( hwnd, msg, wParam, lParam );
- case WM_GETFONT:
+ case WM_GETFONT:
return dlgInfo->hUserFont;
case WM_CLOSE:
PostMessageA( hwnd, WM_COMMAND, IDCANCEL,
(LPARAM)GetDlgItem( hwnd, IDCANCEL ) );
return 0;
-
+
case WM_NOTIFYFORMAT:
return DefWindowProcA( hwnd, msg, wParam, lParam );
}
@@ -276,7 +276,7 @@
msg == WM_CTLCOLOR || msg == WM_COMPAREITEM ||
msg == WM_VKEYTOITEM || msg == WM_CHARTOITEM ||
msg == WM_QUERYDRAGICON || msg == WM_INITDIALOG)
- return fResult;
+ return fResult;
return GetWindowLongA( hwnd, DWL_MSGRESULT );
}
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 240a756..6d0b02c 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -160,9 +160,9 @@
SetTextColor( hDC, GetSysColor(COLOR_3DFACE));
SetBkColor( hDC, bk);
- /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT
+ /* if COLOR_WINDOW happens to be the same as COLOR_3DHILIGHT
* we better use 0x55aa bitmap brush to make scrollbar's background
- * look different from the window background.
+ * look different from the window background.
*/
if (bk == GetSysColor(COLOR_WINDOW)) {
return CACHE_GetPattern55AABrush();
@@ -373,9 +373,9 @@
case WM_NCRBUTTONUP:
/*
- * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked
- * in Windows), but what _should_ we do? According to MSDN :
- * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND
+ * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked
+ * in Windows), but what _should_ we do? According to MSDN :
+ * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND
* message to the window". When is it appropriate?
*/
break;
@@ -428,7 +428,7 @@
{
PAINTSTRUCT ps;
HDC hdc = BeginPaint( hwnd, &ps );
- if( hdc )
+ if( hdc )
{
HICON hIcon;
if (IsIconic(hwnd) && ((hIcon = GetClassLongW( hwnd, GCL_HICON))) )
@@ -467,7 +467,7 @@
if (ret) return ret;
}
- /* Caption clicks are handled by the NC_HandleNCLButtonDown() */
+ /* Caption clicks are handled by the NC_HandleNCLButtonDown() */
return (LOWORD(lParam) >= HTCLIENT) ? MA_ACTIVATE : MA_NOACTIVATE;
case WM_ACTIVATE:
@@ -516,7 +516,7 @@
case WM_CTLCOLOR:
return (LRESULT)DEFWND_ControlColor( (HDC)wParam, HIWORD(lParam) );
-
+
case WM_SETCURSOR:
if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)
{
@@ -545,7 +545,7 @@
iMenuSysKey = 1;
else
iMenuSysKey = 0;
-
+
iF10Key = 0;
if( wParam == VK_F4 ) /* try to close the window */
@@ -554,7 +554,7 @@
if (!(GetClassLongW( top, GCL_STYLE ) & CS_NOCLOSE))
PostMessageW( top, WM_SYSCOMMAND, SC_CLOSE, 0 );
}
- }
+ }
else if( wParam == VK_F10 )
iF10Key = 1;
else
@@ -577,7 +577,7 @@
{
PostMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0L );
break;
- }
+ }
if ((HIWORD(lParam) & KEYDATA_ALT) && wParam)
{
if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
@@ -585,7 +585,7 @@
SendMessageW( GetParent(hwnd), msg, wParam, lParam );
else
SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, wParam );
- }
+ }
else /* check for Ctrl-Esc */
if (wParam != VK_ESCAPE) MessageBeep(0);
break;
@@ -612,7 +612,7 @@
return -1;
case WM_DROPOBJECT:
- return DRAG_FILE;
+ return DRAG_FILE;
case WM_QUERYDROPOBJECT:
return (GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) != 0;
@@ -642,7 +642,7 @@
case WM_NOTIFYFORMAT:
if (IsWindowUnicode(hwnd)) return NFR_UNICODE;
else return NFR_ANSI;
-
+
case WM_QUERYOPEN:
case WM_QUERYENDSESSION:
return 1;
@@ -871,14 +871,14 @@
/***********************************************************************
* DefWindowProcW (USER32.@) Calls default window message handler
- *
- * Calls default window procedure for messages not processed
+ *
+ * Calls default window procedure for messages not processed
* by application.
*
* RETURNS
* Return value is dependent upon the message.
*/
-LRESULT WINAPI DefWindowProcW(
+LRESULT WINAPI DefWindowProcW(
HWND hwnd, /* [in] window procedure receiving message */
UINT msg, /* [in] message identifier */
WPARAM wParam, /* [in] first message parameter */
diff --git a/windows/dialog.c b/windows/dialog.c
index 1e31de0..453c8f0 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "wine/port.h"
+#include "wine/port.h"
#include <ctype.h>
#include <errno.h>
@@ -84,7 +84,7 @@
} DLG_TEMPLATE;
/* Radio button group */
-typedef struct
+typedef struct
{
UINT firstID;
UINT lastID;
@@ -141,7 +141,7 @@
if (IsWindowEnabled( hOwner ))
{
EnableWindow( hOwner, FALSE );
- return TRUE;
+ return TRUE;
}
else
return FALSE;
@@ -166,7 +166,7 @@
pSize->cx = xBaseUnit;
pSize->cy = yBaseUnit;
- if(!hDC) return FALSE;
+ if(!hDC) return FALSE;
if(hFont) hFontPrev = SelectFont(hDC, hFont);
if(!GetTextMetricsA(hDC, &tm)) return FALSE;
@@ -189,7 +189,7 @@
static BOOL DIALOG_GetCharSize( HFONT hFont, SIZE * pSize )
{
HDC hDC = GetDC(0);
- BOOL Success = DIALOG_GetCharSizeFromDC( hDC, hFont, pSize );
+ BOOL Success = DIALOG_GetCharSizeFromDC( hDC, hFont, pSize );
ReleaseDC(0, hDC);
return Success;
}
@@ -262,7 +262,7 @@
info->className = buffer;
p++;
}
- else
+ else
{
info->className = p;
p += strlen(p) + 1;
@@ -377,7 +377,7 @@
p += strlenW( (LPCWSTR)p ) + 1;
}
- TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n",
+ TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n",
debugstr_w( (LPCWSTR)info->className ),
debugstr_w( (LPCWSTR)info->windowName ),
info->id, info->x, info->y, info->cx, info->cy,
@@ -492,7 +492,7 @@
hwndDefButton = hwndCtrl;
dlgInfo->idResult = GetWindowLongA( hwndCtrl, GWL_ID );
}
- }
+ }
TRACE(" END\n" );
return TRUE;
}
@@ -790,7 +790,7 @@
if( !(template.style & DS_ABSALIGN) )
ClientToScreen( owner, (POINT *)&rect );
-
+
/* try to fit it into the desktop */
if( (dX = rect.left + rect.right + GetSystemMetrics(SM_CXDLGFRAME)
@@ -872,7 +872,7 @@
if ((GetFocus() == hwndPreInitFocus) &&
(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE))
{
- dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE);
+ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE);
if( dlgInfo->hwndFocus )
SetFocus( dlgInfo->hwndFocus );
}
@@ -1234,7 +1234,7 @@
| SWP_NOZORDER | SWP_NOACTIVATE | SWP_HIDEWINDOW);
/* unblock dialog loop */
- PostMessageA(hwnd, WM_NULL, 0, 0);
+ PostMessageA(hwnd, WM_NULL, 0, 0);
return TRUE;
}
@@ -1396,7 +1396,7 @@
return TRUE;
}
break;
-
+
case VK_RIGHT:
case VK_DOWN:
case VK_LEFT:
@@ -1404,7 +1404,7 @@
if (!(dlgCode & DLGC_WANTARROWS))
{
BOOL fPrevious = (wParam == VK_LEFT || wParam == VK_UP);
- HWND hwndNext =
+ HWND hwndNext =
GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious );
SendMessageA( hwndDlg, WM_NEXTDLGCTL, (WPARAM)hwndNext, 1 );
return TRUE;
@@ -1421,7 +1421,7 @@
DWORD dw = SendMessageW( hwndDlg, DM_GETDEFID, 0, 0 );
if (HIWORD(dw) == DC_HASDEFID)
{
- SendMessageA( hwndDlg, WM_COMMAND,
+ SendMessageA( hwndDlg, WM_COMMAND,
MAKEWPARAM( LOWORD(dw), BN_CLICKED ),
(LPARAM)GetDlgItem(hwndDlg, LOWORD(dw)));
}
@@ -1429,7 +1429,7 @@
{
SendMessageA( hwndDlg, WM_COMMAND, IDOK,
(LPARAM)GetDlgItem( hwndDlg, IDOK ) );
-
+
}
}
return TRUE;
@@ -1653,7 +1653,7 @@
char str[30];
char * endptr;
long result = 0;
-
+
if (translated) *translated = FALSE;
if (!SendDlgItemMessageA(hwnd, id, WM_GETTEXT, sizeof(str), (LPARAM)str))
return 0;
@@ -1698,8 +1698,8 @@
/***********************************************************************
* CheckRB
- *
- * Callback function used to check/uncheck radio buttons that fall
+ *
+ * Callback function used to check/uncheck radio buttons that fall
* within a specific range of IDs.
*/
static BOOL CALLBACK CheckRB(HWND hwndChild, LPARAM lParam)
@@ -1707,7 +1707,7 @@
LONG lChildID = GetWindowLongA(hwndChild, GWL_ID);
RADIOGROUP *lpRadioGroup = (RADIOGROUP *) lParam;
- if ((lChildID >= lpRadioGroup->firstID) &&
+ if ((lChildID >= lpRadioGroup->firstID) &&
(lChildID <= lpRadioGroup->lastID))
{
if (lChildID == lpRadioGroup->checkID)
@@ -1736,8 +1736,8 @@
radioGroup.firstID = min(min(firstID, lastID), checkID);
radioGroup.lastID = max(max(firstID, lastID), checkID);
radioGroup.checkID = checkID;
-
- return EnumChildWindows(hwndDlg, (WNDENUMPROC)CheckRB,
+
+ return EnumChildWindows(hwndDlg, (WNDENUMPROC)CheckRB,
(LPARAM)&radioGroup);
}
@@ -1840,7 +1840,7 @@
HWND retWnd = 0;
HWND hChildFirst = 0;
- if(!hwndCtrl)
+ if(!hwndCtrl)
{
hChildFirst = GetWindow(hwndDlg,GW_CHILD);
if(fPrevious) hChildFirst = GetWindow(hChildFirst,GW_HWNDLAST);
@@ -1912,7 +1912,7 @@
{
hwndDlg = WIN_GetFullHandle( hwndDlg );
hwndCtrl = WIN_GetFullHandle( hwndCtrl );
- return DIALOG_GetNextTabItem(hwndDlg,hwndDlg,hwndCtrl,fPrevious);
+ return DIALOG_GetNextTabItem(hwndDlg,hwndDlg,hwndCtrl,fPrevious);
}
/**********************************************************************
diff --git a/windows/driver.c b/windows/driver.c
index 02d250c..ff30f29 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -48,7 +48,7 @@
static LPWINE_DRIVER lpDrvItemList = NULL;
/* TODO list :
- * - LoadModule count and clean up is not handled correctly (it's not a
+ * - LoadModule count and clean up is not handled correctly (it's not a
* problem as long as FreeLibrary is not working correctly)
*/
@@ -62,7 +62,7 @@
static void WINE_UNUSED DRIVER_LoadStartupDrivers(void)
{
char str[256];
-
+
if (GetPrivateProfileStringA("drivers", NULL, "", str, sizeof(str), "SYSTEM.INI") < 2) {
ERR("Can't find drivers section in system.ini\n");
} else {
@@ -87,7 +87,7 @@
{
LPWINE_DRIVER lpDrv;
WORD count = 0;
-
+
for (lpDrv = lpDrvItemList; lpDrv; lpDrv = lpDrv->lpNextItem) {
if (lpDrv->hModule16 == lpNewDrv->hModule16) {
count++;
@@ -102,9 +102,9 @@
* From a hDrvr being 16 bits, returns the WINE internal structure.
*/
static LPWINE_DRIVER DRIVER_FindFromHDrvr16(HDRVR16 hDrvr)
-{
+{
LPWINE_DRIVER lpDrv;
-
+
for (lpDrv = lpDrvItemList; lpDrv; lpDrv = lpDrv->lpNextItem) {
if (lpDrv->hDriver16 == hDrvr) {
break;
@@ -116,10 +116,10 @@
/**************************************************************************
* DRIVER_SendMessage [internal]
*/
-static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
+static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
LPARAM lParam1, LPARAM lParam2)
{
- TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n",
+ TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n",
lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2);
return DRIVER_CallTo16_long_lwwll((FARPROC16)lpDrv->lpDrvProc, lpDrv->dwDriverID,
lpDrv->hDriver16, msg, lParam1, lParam2);
@@ -134,15 +134,15 @@
{
LPWINE_DRIVER lpDrv;
LRESULT retval = 0;
-
+
TRACE("(%04x, %04X, %08lX, %08lX)\n", hDriver, msg, lParam1, lParam2);
-
+
if ((lpDrv = DRIVER_FindFromHDrvr16(hDriver)) != NULL) {
retval = DRIVER_SendMessage(lpDrv, msg, lParam1, lParam2);
} else {
WARN("Bad driver handle %u\n", hDriver);
}
-
+
TRACE("retval = %ld\n", retval);
return retval;
}
@@ -160,7 +160,7 @@
DRIVER_SendMessage(lpDrv, DRV_DISABLE, 0L, 0L);
DRIVER_SendMessage(lpDrv, DRV_FREE, 0L, 0L);
}
-
+
if (lpDrv->lpPrevItem)
lpDrv->lpPrevItem->lpNextItem = lpDrv->lpNextItem;
else
@@ -197,7 +197,7 @@
LPWINE_DRIVER lpDrv = lpDrvItemList; /* find end of list */
while (lpDrv->lpNextItem != NULL)
lpDrv = lpDrv->lpNextItem;
-
+
lpDrv->lpNextItem = lpNewDrv;
lpNewDrv->lpPrevItem = lpDrv;
}
@@ -209,7 +209,7 @@
DRIVER_RemoveFromList(lpNewDrv);
return FALSE;
}
-
+
return TRUE;
}
@@ -226,7 +226,7 @@
DRIVERPROC16 lpProc;
LPCSTR lpSFN;
LPSTR ptr;
-
+
TRACE("('%s', %08lX);\n", lpFileName, lParam2);
if (strlen(lpFileName) < 1) return lpDrv;
@@ -240,7 +240,7 @@
while (*ptr == ' ') ptr++;
if (*ptr == '\0') ptr = NULL;
}
-
+
if ((hModule = LoadLibrary16(lpFileName)) < 32) goto exit;
if ((lpProc = (DRIVERPROC16)GetProcAddress16(hModule, "DRIVERPROC")) == NULL)
goto exit;
@@ -254,7 +254,7 @@
lstrcpynA(lpDrv->szAliasName, lpSFN, sizeof(lpDrv->szAliasName));
lpDrv->hModule16 = hModule;
lpDrv->lpDrvProc = lpProc;
-
+
if (!DRIVER_AddToList(lpDrv, (LPARAM)ptr, lParam2)) goto exit;
return lpDrv;
@@ -280,13 +280,13 @@
if (lpSectionName == NULL) {
strcpy(drvName, lpDriverName);
-
+
if ((lpDrv = DRIVER_TryOpenDriver16(drvName, lParam2)))
goto the_end;
/* in case hDriver is NULL, search in Drivers section */
lpSectionName = "Drivers";
}
- if (GetPrivateProfileStringA(lpSectionName, lpDriverName, "",
+ if (GetPrivateProfileStringA(lpSectionName, lpDriverName, "",
drvName, sizeof(drvName), "SYSTEM.INI") > 0) {
lpDrv = DRIVER_TryOpenDriver16(drvName, lParam2);
}
@@ -308,10 +308,10 @@
LPWINE_DRIVER lpDrv;
TRACE("(%04x, %08lX, %08lX);\n", hDrvr, lParam1, lParam2);
-
+
if ((lpDrv = DRIVER_FindFromHDrvr16(hDrvr)) != NULL) {
DRIVER_SendMessage(lpDrv, DRV_CLOSE, lParam1, lParam2);
-
+
if (DRIVER_RemoveFromList(lpDrv)) {
HeapFree(GetProcessHeap(), 0, lpDrv);
return TRUE;
@@ -329,9 +329,9 @@
{
LPWINE_DRIVER lpDrv;
HMODULE16 hModule = 0;
-
+
TRACE("(%04x);\n", hDrvr);
-
+
if ((lpDrv = DRIVER_FindFromHDrvr16(hDrvr)) != NULL) {
hModule = lpDrv->hModule16;
}
@@ -343,29 +343,29 @@
* DefDriverProc (USER.255)
* DefDriverProc16 (USER32.@)
*/
-LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
+LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
LPARAM lParam1, LPARAM lParam2)
{
TRACE("devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n",
dwDevID, hDriv, wMsg, lParam1, lParam2);
switch(wMsg) {
- case DRV_LOAD:
- case DRV_FREE:
+ case DRV_LOAD:
+ case DRV_FREE:
case DRV_ENABLE:
case DRV_DISABLE:
return (LRESULT)1L;
- case DRV_OPEN:
- case DRV_CLOSE:
+ case DRV_OPEN:
+ case DRV_CLOSE:
case DRV_QUERYCONFIGURE:
return (LRESULT)0L;
- case DRV_CONFIGURE:
- MessageBoxA(0, "Driver isn't configurable !", "Wine Driver", MB_OK);
+ case DRV_CONFIGURE:
+ MessageBoxA(0, "Driver isn't configurable !", "Wine Driver", MB_OK);
return (LRESULT)0L;
- case DRV_INSTALL:
- case DRV_REMOVE:
+ case DRV_INSTALL:
+ case DRV_REMOVE:
return DRV_SUCCESS;
- default:
+ default:
return (LRESULT)0L;
}
}
@@ -377,19 +377,19 @@
{
LPWINE_DRIVER lpDrv;
BOOL16 ret = FALSE;
-
+
TRACE("(%04x, %p);\n", hDrvr, lpDrvInfo);
-
- if (lpDrvInfo == NULL || lpDrvInfo->length != sizeof(DRIVERINFOSTRUCT16))
+
+ if (lpDrvInfo == NULL || lpDrvInfo->length != sizeof(DRIVERINFOSTRUCT16))
return FALSE;
-
+
if ((lpDrv = DRIVER_FindFromHDrvr16(hDrvr)) != NULL) {
lpDrvInfo->hDriver = lpDrv->hDriver16;
lpDrvInfo->hModule = lpDrv->hModule16;
lstrcpynA(lpDrvInfo->szAliasName, lpDrv->szAliasName, sizeof(lpDrvInfo->szAliasName));
ret = TRUE;
}
-
+
return ret;
}
@@ -400,16 +400,16 @@
{
HDRVR16 hRetDrv = 0;
LPWINE_DRIVER lpDrv;
-
+
TRACE("(%04x, %08lX);\n", hDrvr, dwFlags);
-
+
if (hDrvr == 0) {
if (lpDrvItemList == NULL) {
FIXME("drivers list empty !\n");
- /* FIXME: code was using DRIVER_LoadStartupDrivers(); before ?
- * I (EPP) don't quite understand this
+ /* FIXME: code was using DRIVER_LoadStartupDrivers(); before ?
+ * I (EPP) don't quite understand this
*/
- if (lpDrvItemList == NULL)
+ if (lpDrvItemList == NULL)
return 0;
}
lpDrv = lpDrvItemList;
@@ -426,7 +426,7 @@
}
}
}
-
+
hRetDrv = (lpDrv) ? lpDrv->hDriver16 : (HDRVR16)0;
TRACE("return %04x !\n", hRetDrv);
return hRetDrv;
diff --git a/windows/focus.c b/windows/focus.c
index 3d4db25..61898da 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -35,7 +35,7 @@
/*****************************************************************
- * FOCUS_SwitchFocus
+ * FOCUS_SwitchFocus
* pMsgQ is the queue whose perQData focus is to be modified
*/
void FOCUS_SwitchFocus( MESSAGEQUEUE *pMsgQ, HWND hFocusFrom, HWND hFocusTo )
@@ -112,13 +112,13 @@
/* Get the current focus window from the perQ data */
hWndFocus = PERQDATA_GetFocusWnd( pMsgQ->pQData );
-
+
if( hwnd == hWndFocus )
{
bRet = 1; /* Success */
goto CLEANUP; /* Nothing to do */
}
-
+
/* call hooks */
if( HOOK_CallHooksA( WH_CBT, HCBT_SETFOCUS, (WPARAM)hwnd, (LPARAM)hWndFocus) )
goto CLEANUP;
@@ -133,7 +133,7 @@
/* Get the current focus window from the perQ data */
hWndFocus = PERQDATA_GetFocusWnd( pMsgQ->pQData );
-
+
/* Change focus and send messages */
FOCUS_SwitchFocus( pMsgQ, hWndFocus, hwnd );
}
@@ -150,7 +150,7 @@
}
bRet = 1; /* Success */
-
+
CLEANUP:
/* Unlock the queues before returning */
diff --git a/windows/hook.c b/windows/hook.c
index 0f8bb6a..c9ab59d 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -77,7 +77,7 @@
{
LRESULT ret = HOOK_CallTo16_long_wwl( proc, code, wparam, lparam );
/* Grrr. While the hook procedure is supposed to have an LRESULT return
- value even in Win16, it seems that for those hook types where the
+ value even in Win16, it seems that for those hook types where the
return value is interpreted as BOOL, Windows doesn't actually check
the HIWORD ... Some buggy Win16 programs, notably WINFILE, rely on
that, because they neglect to clear DX ... */
@@ -674,7 +674,7 @@
data->next = HOOK_systemHooks[id - WH_MINHOOK];
HOOK_systemHooks[id - WH_MINHOOK] = handle;
}
- TRACE("Setting hook %d: ret=%04x [next=%04x]\n",
+ TRACE("Setting hook %d: ret=%04x [next=%04x]\n",
id, handle, data->next );
return (HHOOK)( handle? MAKELONG( handle, HOOK_MAGIC ) : 0 );
@@ -703,7 +703,7 @@
}
if (data->id == WH_JOURNALPLAYBACK) EnableHardwareInput16(TRUE);
-
+
/* Remove it from the linked list */
if (data->ownerQueue)
@@ -794,7 +794,7 @@
LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam,
LPARAM lParam )
{
- HANDLE16 hook;
+ HANDLE16 hook;
if (!(hook = HOOK_GetHook( id ))) return 0;
if (!(hook = HOOK_FindValidHook(hook))) return 0;
@@ -809,7 +809,7 @@
LRESULT HOOK_CallHooksA( INT id, INT code, WPARAM wParam,
LPARAM lParam )
{
- HANDLE16 hook;
+ HANDLE16 hook;
if (!(hook = HOOK_GetHook( id ))) return 0;
if (!(hook = HOOK_FindValidHook(hook))) return 0;
@@ -824,7 +824,7 @@
LRESULT HOOK_CallHooksW( INT id, INT code, WPARAM wParam,
LPARAM lParam )
{
- HANDLE16 hook;
+ HANDLE16 hook;
if (!(hook = HOOK_GetHook( id ))) return 0;
if (!(hook = HOOK_FindValidHook(hook))) return 0;
@@ -1082,7 +1082,7 @@
if (wHaveParamHigh == FALSE)
{
lpmsg16_32->wParamHigh = 0;
- /* WARNING: msg16_32->msg has to be the first variable in the struct */
+ /* WARNING: msg16_32->msg has to be the first variable in the struct */
return CallMsgFilter16(msg16_32, code);
}
else
diff --git a/windows/input.c b/windows/input.c
index 7e876ab..3b0dd95 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -2,7 +2,7 @@
* USER Input processing
*
* Copyright 1993 Bob Amstadt
- * Copyright 1996 Albrecht Kleine
+ * Copyright 1996 Albrecht Kleine
* Copyright 1997 David Faure
* Copyright 1998 Morten Welinder
* Copyright 1998 Ulrich Weigand
@@ -599,14 +599,14 @@
/**********************************************************************
* GetAsyncKeyState (USER32.@)
*
- * Determine if a key is or was pressed. retval has high-order
+ * Determine if a key is or was pressed. retval has high-order
* bit set to 1 if currently pressed, low-order bit set to 1 if key has
* been pressed.
*
* This uses the variable AsyncMouseButtonsStates and
* AsyncKeyStateTable (set in event.c) which have the mouse button
* number or key number (whichever is applicable) set to true if the
- * mouse or key had been depressed since the last call to
+ * mouse or key had been depressed since the last call to
* GetAsyncKeyState.
*/
SHORT WINAPI GetAsyncKeyState(INT nKey)
@@ -768,7 +768,7 @@
/***********************************************************************
* GetKeyboardLayout (USER32.@)
*
- * FIXME: - device handle for keyboard layout defaulted to
+ * FIXME: - device handle for keyboard layout defaulted to
* the language id. This is the way Windows default works.
* - the thread identifier (dwLayout) is also ignored.
*/
@@ -886,10 +886,10 @@
/***********************************************************************
* GetKeyboardLayoutList (USER32.@)
*
- * FIXME: Supports only the system default language and layout and
+ * FIXME: Supports only the system default language and layout and
* returns only 1 value.
*
- * Return number of values available if either input parm is
+ * Return number of values available if either input parm is
* 0, per MS documentation.
*
*/
@@ -928,7 +928,7 @@
{
TRACE_(keyboard)("(%s, %d)\n", pwszKLID, Flags);
ERR_(keyboard)("Only default system keyboard layout supported. Call ignored.\n");
- return 0;
+ return 0;
}
/***********************************************************************
@@ -937,7 +937,7 @@
HKL WINAPI LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags)
{
char buf[9];
-
+
WideCharToMultiByte( CP_ACP, 0, pwszKLID, -1, buf, sizeof(buf), NULL, NULL );
buf[8] = 0;
return LoadKeyboardLayoutA(buf, Flags);
@@ -948,7 +948,7 @@
TRACKMOUSEEVENT tme;
POINT pos; /* center of hover rectangle */
INT iHoverTime; /* elapsed time the cursor has been inside of the hover rect */
-} _TRACKINGLIST;
+} _TRACKINGLIST;
static _TRACKINGLIST TrackingList[10];
static int iTrackMax = 0;
@@ -986,8 +986,8 @@
/* see if we are tracking hovering for this hwnd */
if(TrackingList[i].tme.dwFlags & TME_HOVER) {
/* add the timer interval to the hovering time */
- TrackingList[i].iHoverTime+=iTimerInterval;
-
+ TrackingList[i].iHoverTime+=iTimerInterval;
+
/* has the cursor moved outside the rectangle centered around pos? */
if((abs(pos.x - TrackingList[i].pos.x) > (hoverwidth / 2.0))
|| (abs(pos.y - TrackingList[i].pos.y) > (hoverheight / 2.0)))
@@ -1016,7 +1016,7 @@
TrackingList[i] = TrackingList[--iTrackMax];
}
}
-
+
/* stop the timer if the tracking list is empty */
if(iTrackMax == 0) {
KillTimer(0, timer);
@@ -1068,24 +1068,24 @@
}
flags = ptme->dwFlags;
-
+
/* if HOVER_DEFAULT was specified replace this with the systems current value */
if(ptme->dwHoverTime == HOVER_DEFAULT)
SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &(ptme->dwHoverTime), 0);
GetCursorPos(&pos);
- hwnd = WindowFromPoint(pos);
+ hwnd = WindowFromPoint(pos);
if ( flags & TME_CANCEL ) {
flags &= ~ TME_CANCEL;
cancel = 1;
}
-
+
if ( flags & TME_HOVER ) {
flags &= ~ TME_HOVER;
hover = 1;
}
-
+
if ( flags & TME_LEAVE ) {
flags &= ~ TME_LEAVE;
leave = 1;
@@ -1107,7 +1107,7 @@
*ptme = TrackingList[i].tme;
else
ptme->dwFlags = 0;
-
+
return TRUE; /* return here, TME_QUERY is retrieving information */
}
@@ -1130,7 +1130,7 @@
(TrackingList[i].tme.dwFlags & TME_LEAVE)))
{
TrackingList[i] = TrackingList[--iTrackMax];
-
+
if(iTrackMax == 0) {
KillTimer(0, timer);
timer = 0;
@@ -1151,16 +1151,16 @@
TrackingList[i].tme.dwFlags |= TME_HOVER;
TrackingList[i].tme.dwHoverTime = ptme->dwHoverTime;
}
-
+
if(leave)
TrackingList[i].tme.dwFlags |= TME_LEAVE;
/* reset iHoverTime as per winapi specs */
- TrackingList[i].iHoverTime = 0;
-
+ TrackingList[i].iHoverTime = 0;
+
return TRUE;
}
- }
+ }
/* if the tracking list is full return FALSE */
if (iTrackMax == sizeof (TrackingList) / sizeof(*TrackingList)) {
diff --git a/windows/keyboard.c b/windows/keyboard.c
index fa1e5ff..50df439 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -2,7 +2,7 @@
* KEYBOARD driver
*
* Copyright 1993 Bob Amstadt
- * Copyright 1996 Albrecht Kleine
+ * Copyright 1996 Albrecht Kleine
* Copyright 1997 David Faure
* Copyright 1998 Morten Welinder
* Copyright 1998 Ulrich Weigand
@@ -55,14 +55,14 @@
/***********************************************************************
* Inquire (KEYBOARD.1)
*/
-WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo)
+WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo)
{
kbInfo->Begin_First_Range = 0;
kbInfo->End_First_Range = 0;
kbInfo->Begin_Second_Range = 0;
kbInfo->End_Second_Range = 0;
- kbInfo->StateSize = 16;
-
+ kbInfo->StateSize = 16;
+
return sizeof(KBINFO);
}
@@ -175,8 +175,8 @@
* FIXME : should do the above (return 2 for non matching deadchar+char combinations)
*
*/
-INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState,
- LPVOID lpChar, UINT16 flags)
+INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState,
+ LPVOID lpChar, UINT16 flags)
{
return ToAscii( virtKey, scanCode, lpKeyState, lpChar, flags );
}
diff --git a/windows/mdi.c b/windows/mdi.c
index 7d96174..bc0f87b 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -22,7 +22,7 @@
*
* Notes: Fairly complete implementation.
* Also, Excel and WinWord do _not_ use MDI so if you're trying
- * to fix them look elsewhere.
+ * to fix them look elsewhere.
*
* Notes on how the "More Windows..." is implemented:
*
@@ -110,7 +110,7 @@
#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */
/* "More Windows..." definitions */
-#define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..."
+#define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..."
option will appear under the Windows menu */
#define MDI_IDC_LISTBOX 100
#define MDI_IDS_MOREWINDOWS 13
@@ -246,10 +246,10 @@
id = GetWindowLongA( hWndChild, GWL_ID );
DeleteMenu(clientInfo->hWindowMenu,id,MF_BYCOMMAND);
- /* walk the rest of MDI children to prevent gaps in the id
+ /* walk the rest of MDI children to prevent gaps in the id
* sequence and in the menu child list */
- for( index = id+1; index <= clientInfo->nActiveChildren +
+ for( index = id+1; index <= clientInfo->nActiveChildren +
clientInfo->idFirstChild; index++ )
{
HWND hwnd = MDI_GetChildByID(client,index);
@@ -265,12 +265,12 @@
n = wsprintfW(buffer, format ,index - clientInfo->idFirstChild);
GetWindowTextW( hwnd, buffer + n, sizeof(buffer)/sizeof(WCHAR) - n );
- /* change menu if the current child is to be shown in the
+ /* change menu if the current child is to be shown in the
* "Windows" menu
*/
- if (index <= clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT)
+ if (index <= clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT)
ModifyMenuW(clientInfo->hWindowMenu ,index ,MF_BYCOMMAND | MF_STRING,
- index - 1 , buffer );
+ index - 1 , buffer );
}
/* We must restore the "More Windows..." option if there are enough children
@@ -335,10 +335,10 @@
INT nstagger;
RECT rect;
INT spacing = GetSystemMetrics(SM_CYCAPTION) +
- GetSystemMetrics(SM_CYFRAME) - 1;
+ GetSystemMetrics(SM_CYFRAME) - 1;
GetClientRect( hwnd, &rect );
- if( rect.bottom - rect.top - delta >= spacing )
+ if( rect.bottom - rect.top - delta >= spacing )
rect.bottom -= delta;
nstagger = (rect.bottom - rect.top)/(3 * spacing);
@@ -365,7 +365,7 @@
WARN("hmenuFrame is not a menu handle\n");
return 0L;
}
-
+
if (hmenuWindow && !IsMenu(hmenuWindow))
{
WARN("hmenuWindow is not a menu handle\n");
@@ -379,7 +379,7 @@
if( hmenuWindow && ci->hWindowMenu && hmenuWindow!=ci->hWindowMenu )
{
- /* delete menu items from ci->hWindowMenu
+ /* delete menu items from ci->hWindowMenu
* and add them to hmenuWindow */
INT i = GetMenuItemCount(ci->hWindowMenu) - 1;
@@ -426,10 +426,10 @@
}
/* remove separator */
- DeleteMenu(ci->hWindowMenu, i, MF_BYPOSITION);
+ DeleteMenu(ci->hWindowMenu, i, MF_BYPOSITION);
ci->hWindowMenu = hmenuWindow;
- }
+ }
if (hmenuFrame)
{
@@ -489,14 +489,14 @@
static HWND MDICreateChild( HWND parent, MDICLIENTINFO *ci,
LPMDICREATESTRUCTA cs, BOOL unicode )
{
- POINT pos[2];
+ POINT pos[2];
DWORD style = cs->style | (WS_CHILD | WS_CLIPSIBLINGS);
HWND hwnd, hwndMax = 0;
UINT wIDmenu = ci->idFirstChild + ci->nActiveChildren;
WND *wndParent;
static const WCHAR lpstrDef[] = {'j','u','n','k','!',0};
- TRACE("origin %i,%i - dim %i,%i, style %08lx\n",
+ TRACE("origin %i,%i - dim %i,%i, style %08lx\n",
cs->x, cs->y, cs->cx, cs->cy, cs->style);
/* calculate placement */
MDI_CalcDefaultChildPos(parent, ci->nTotalCreated++, pos, 0);
@@ -545,12 +545,12 @@
if(unicode)
{
MDICREATESTRUCTW *csW = (MDICREATESTRUCTW *)cs;
- hwnd = CreateWindowW( csW->szClass, csW->szTitle, style,
+ hwnd = CreateWindowW( csW->szClass, csW->szTitle, style,
csW->x, csW->y, csW->cx, csW->cy, parent,
(HMENU)wIDmenu, csW->hOwner, csW );
}
else
- hwnd = CreateWindowA( cs->szClass, cs->szTitle, style,
+ hwnd = CreateWindowA( cs->szClass, cs->szTitle, style,
cs->x, cs->y, cs->cx, cs->cy, parent,
(HMENU)wIDmenu, cs->hOwner, cs );
}
@@ -589,8 +589,8 @@
MDI_MenuModifyItem(parent, hwnd);
- /* Have we hit the "More Windows..." limit? If so, we must
- * add a "More Windows..." option
+ /* Have we hit the "More Windows..." limit? If so, we must
+ * add a "More Windows..." option
*/
if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
{
@@ -598,9 +598,9 @@
LoadStringW(GetModuleHandleA("USER32"), MDI_IDS_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
ModifyMenuW(ci->hWindowMenu,
- ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
- MF_BYCOMMAND | MF_STRING,
- ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
+ ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
+ MF_BYCOMMAND | MF_STRING,
+ ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
szTmp);
}
@@ -613,7 +613,7 @@
{
/* WS_VISIBLE is clear if a) the MDI client has
* MDIS_ALLCHILDSTYLES style and 2) the flag is cleared in the
- * MDICreateStruct. If so the created window is not shown nor
+ * MDICreateStruct. If so the created window is not shown nor
* activated.
*/
if (IsWindowVisible(hwnd)) ShowWindow(hwnd, SW_SHOW);
@@ -627,14 +627,14 @@
if( IsWindow(hwndMax) )
ShowWindow(hwndMax, SW_SHOWMAXIMIZED);
}
-
+
return hwnd;
}
/**********************************************************************
* MDI_ChildGetMinMaxInfo
*
- * Note: The rule here is that client rect of the maximized MDI child
+ * Note: The rule here is that client rect of the maximized MDI child
* is equal to the client rect of the MDI client window.
*/
static void MDI_ChildGetMinMaxInfo( HWND client, HWND hwnd, MINMAXINFO* lpMinMax )
@@ -649,17 +649,17 @@
lpMinMax->ptMaxSize.y = rect.bottom -= rect.top;
lpMinMax->ptMaxPosition.x = rect.left;
- lpMinMax->ptMaxPosition.y = rect.top;
+ lpMinMax->ptMaxPosition.y = rect.top;
- TRACE("max rect (%i,%i - %i, %i)\n",
+ TRACE("max rect (%i,%i - %i, %i)\n",
rect.left,rect.top,rect.right,rect.bottom);
}
/**********************************************************************
* MDI_SwitchActiveChild
- *
+ *
* Note: SetWindowPos sends WM_CHILDACTIVATE to the child window that is
- * being activated
+ * being activated
*/
static void MDI_SwitchActiveChild( HWND clientHwnd, HWND childHwnd,
BOOL bNextWindow )
@@ -678,11 +678,11 @@
if ( hwndTo != hwndPrev )
{
- SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0,
+ SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE );
if( bNextWindow && hwndPrev )
- SetWindowPos( hwndPrev, HWND_BOTTOM, 0, 0, 0, 0,
+ SetWindowPos( hwndPrev, HWND_BOTTOM, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
}
}
@@ -741,7 +741,7 @@
if (child && (!IsWindowEnabled( child ))) return 0;
- /* Don't activate if it is already active. Might happen
+ /* Don't activate if it is already active. Might happen
since ShowWindow DOES activate MDI children */
if (clientInfo->hwndActiveChild == child) return 0;
@@ -839,7 +839,7 @@
BitBlt(hDCDest, 0, 0, GetSystemMetrics(SM_CXSIZE), GetSystemMetrics(SM_CYSIZE),
hDCSrc, GetSystemMetrics(SM_CXSIZE), 0, SRCCOPY);
-
+
SelectObject(hDCSrc, hobjSrc);
DeleteObject(hbClose);
DeleteDC(hDCSrc);
@@ -896,7 +896,7 @@
/* walk the list (backwards) and move windows */
for (i = total - 1; i >= 0; i--)
{
- TRACE("move %04x to (%ld,%ld) size [%ld,%ld]\n",
+ TRACE("move %04x to (%ld,%ld) size [%ld,%ld]\n",
win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y);
MDI_CalcDefaultChildPos(client, n++, pos, delta);
@@ -1063,10 +1063,10 @@
if( !InsertMenuA(menu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
hSysPopup, (LPSTR)(DWORD)hSysMenuBitmap))
- {
+ {
TRACE("not inserted\n");
- DestroyMenu(hSysPopup);
- return 0;
+ DestroyMenu(hSysPopup);
+ return 0;
}
/* The close button is only present in Win 95 look */
@@ -1100,7 +1100,7 @@
TRACE("frame %04x,child %04x,nIt=%d,iId=%d\n",frame,hChild,nItems,iId);
if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
- return 0;
+ return 0;
/*
* Remove the system menu, If that menu is the icon of the window
@@ -1111,7 +1111,7 @@
menuInfo.fMask = MIIM_DATA | MIIM_TYPE;
GetMenuItemInfoW(menu,
- 0,
+ 0,
TRUE,
&menuInfo);
@@ -1143,7 +1143,7 @@
/**********************************************************************
* MDI_UpdateFrameText
*
- * used when child window is maximized/restored
+ * used when child window is maximized/restored
*
* Note: lpTitle can be NULL
*/
@@ -1164,7 +1164,7 @@
}
/* store new "default" title if lpTitle is not NULL */
- if (lpTitle)
+ if (lpTitle)
{
if (ci->frameTitle) HeapFree( GetProcessHeap(), 0, ci->frameTitle );
if ((ci->frameTitle = HeapAlloc( GetProcessHeap(), 0, (strlenW(lpTitle)+1)*sizeof(WCHAR))))
@@ -1241,7 +1241,7 @@
ci->idFirstChild = ccs->idFirstChild;
#undef ccs
}
- else
+ else
{
LPCLIENTCREATESTRUCT16 ccs = MapSL((SEGPTR)cs->lpCreateParams);
ci->hWindowMenu = ccs->hWindowMenu;
@@ -1322,7 +1322,7 @@
case WM_MDINEXT: /* lParam != 0 means previous window */
MDI_SwitchActiveChild( hwnd, WIN_GetFullHandle( (HWND)wParam ), !lParam );
break;
-
+
case WM_MDIRESTORE:
SendMessageW( (HWND)wParam, WM_SYSCOMMAND, SC_RESTORE, 0);
return 0;
@@ -1541,7 +1541,7 @@
SendMessageW(hwndMDIClient, message, wParam, lParam);
break;
- case WM_SETTEXT:
+ case WM_SETTEXT:
MDI_UpdateFrameText(hwnd, hwndMDIClient, MDI_REPAINTFRAME, (LPWSTR)lParam );
return 1; /* success. FIXME: check text length */
@@ -1559,7 +1559,7 @@
if (!IsIconic(hwnd) && ci->hwndActiveChild && !ci->hwndChildMaximized)
{
- /* control menu is between the frame system menu and
+ /* control menu is between the frame system menu and
* the first entry of menu bar */
WND *wndPtr = WIN_GetPtr(hwnd);
@@ -1981,7 +1981,7 @@
case SB_BOTH:
SCROLL_SetNCSbState( hwnd, vmin, vmax, vpos,
hmin, hmax, hpos);
- }
+ }
}
@@ -2017,30 +2017,30 @@
switch( wParam )
{
- case SB_LINEUP:
+ case SB_LINEUP:
newPos = curPos - shift;
break;
- case SB_LINEDOWN:
+ case SB_LINEDOWN:
newPos = curPos + shift;
break;
- case SB_PAGEUP:
+ case SB_PAGEUP:
newPos = curPos - length;
break;
- case SB_PAGEDOWN:
+ case SB_PAGEDOWN:
newPos = curPos + length;
break;
- case SB_THUMBPOSITION:
+ case SB_THUMBPOSITION:
newPos = LOWORD(lParam);
break;
- case SB_THUMBTRACK:
+ case SB_THUMBTRACK:
return;
- case SB_TOP:
+ case SB_TOP:
newPos = minPos;
break;
- case SB_BOTTOM:
+ case SB_BOTTOM:
newPos = maxPos;
break;
case SB_ENDSCROLL:
@@ -2050,14 +2050,14 @@
if( newPos > maxPos )
newPos = maxPos;
- else
+ else
if( newPos < minPos )
newPos = minPos;
SetScrollPos(hWnd, (uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ , newPos, TRUE);
if( uMsg == WM_VSCROLL )
- ScrollWindowEx(hWnd ,0 ,curPos - newPos, NULL, NULL, 0, NULL,
+ ScrollWindowEx(hWnd ,0 ,curPos - newPos, NULL, NULL, 0, NULL,
SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
else
ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL,
@@ -2231,8 +2231,8 @@
*
* Will swap the menu IDs for the given 2 positions.
* pos1 and pos2 are menu IDs
- *
- *
+ *
+ *
*/
static void MDI_SwapMenuItems(HWND parent, UINT pos1, UINT pos2)
diff --git a/windows/message.c b/windows/message.c
index 4e474a1..856bbb1 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -202,7 +202,7 @@
/***********************************************************************
* MSG_JournalPlayBackMsg
*
- * Get an EVENTMSG struct via call JOURNALPLAYBACK hook function
+ * Get an EVENTMSG struct via call JOURNALPLAYBACK hook function
*/
void MSG_JournalPlayBackMsg(void)
{
@@ -916,8 +916,8 @@
* different places :-( ), if you use turkish uncomment these and
* comment out the lines in iso-8859-2 and iso-8859-3 sections
* FIXME: should be dynamic according to chosen language
- * if/when Wine has turkish support.
- */
+ * if/when Wine has turkish support.
+ */
/* collision whith G( from iso-8859-3 !!! */
/* {'(', 'G', '\320'}, {'(', 'g', '\360'}, */ /* breve */
/* collision whith S, from iso-8859-2 !!! */
@@ -1079,7 +1079,7 @@
* parameter of the WM_TIMER message is not NULL, the lParam parameter
* points to the function that is called instead of the window
* procedure.
- *
+ *
* The message must be valid.
*
* RETURNS
@@ -1088,7 +1088,7 @@
*
* CONFORMANCE
*
- * ECMA-234, Win32
+ * ECMA-234, Win32
*
*/
LONG WINAPI DispatchMessageW( const MSG* msg )
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 788cdaf..7db5fc3 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -127,7 +127,7 @@
*/
break;
}
-
+
/* Position everything */
GetWindowRect(hwnd, &rect);
borheight = rect.bottom - rect.top;
@@ -135,18 +135,18 @@
GetClientRect(hwnd, &rect);
borheight -= rect.bottom - rect.top;
borwidth -= rect.right - rect.left;
-
+
/* Get the icon height */
GetWindowRect(GetDlgItem(hwnd, MSGBOX_IDICON), &rect);
MapWindowPoints(0, hwnd, (LPPOINT)&rect, 2);
iheight = rect.bottom - rect.top;
ileft = rect.left;
iwidth = rect.right - ileft;
-
+
hdc = GetDC(hwnd);
if (hFont)
hPrevFont = SelectObject(hdc, hFont);
-
+
/* Get the number of visible buttons and their size */
bh = bw = 1; /* Minimum button sizes */
for (buttons = 0, i = 1; i < 8; i++)
@@ -172,7 +172,7 @@
bh = bh * 2;
bw = bw * 2;
bspace = bw/3; /* Space between buttons */
-
+
/* Get the text size */
GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect);
rect.top = rect.left = rect.bottom = 0;
@@ -182,15 +182,15 @@
tleft = 2 * ileft + iwidth;
twidth = max((bw + bspace) * buttons + bspace - tleft, rect.right);
theight = rect.bottom;
-
+
if (hFont)
SelectObject(hdc, hPrevFont);
ReleaseDC(hItem, hdc);
-
+
tiheight = 16 + max(iheight, theight);
wwidth = tleft + twidth + ileft + borwidth;
wheight = 8 + tiheight + bh + borheight;
-
+
/* Resize the window */
SetWindowPos(hwnd, 0, 0, 0, wwidth, wheight,
SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
@@ -198,11 +198,11 @@
/* Position the icon */
SetWindowPos(GetDlgItem(hwnd, MSGBOX_IDICON), 0, ileft, (tiheight - iheight) / 2, 0, 0,
SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
-
+
/* Position the text */
SetWindowPos(GetDlgItem(hwnd, MSGBOX_IDTEXT), 0, tleft, (tiheight - theight) / 2, twidth, theight,
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW);
-
+
/* Position the buttons */
bpos = (wwidth - (bw + bspace) * buttons + bspace) / 2;
for (buttons = i = 0; i < 7; i++) {
@@ -234,7 +234,7 @@
}
if (lpmb->dwStyle & MB_APPLMODAL)
FIXME("app modal msgbox ! Not modal yet.\n");
-
+
return hFont;
}
@@ -246,13 +246,13 @@
*/
static LRESULT CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
WPARAM wParam, LPARAM lParam )
-{
+{
static HFONT hFont;
switch(message) {
case WM_INITDIALOG:
hFont = MSGBOX_OnInit(hwnd, (LPMSGBOXPARAMSA)lParam);
return 0;
-
+
case WM_COMMAND:
switch (wParam)
{
@@ -318,7 +318,7 @@
LPSTR titleA = HEAP_strdupWtoA( GetProcessHeap(), 0, title );
LPSTR textA = HEAP_strdupWtoA( GetProcessHeap(), 0, text );
INT ret;
-
+
WARN("Messagebox\n");
ret = MessageBoxA( hwnd, textA, titleA, type );
diff --git a/windows/multimon.c b/windows/multimon.c
index 4a4092f..895fe06 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -71,8 +71,8 @@
if (dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST))
return xPRIMARY_MONITOR;
- if (IsIconic(hWnd) ?
- GetWindowPlacement(hWnd, &wp) :
+ if (IsIconic(hWnd) ?
+ GetWindowPlacement(hWnd, &wp) :
GetWindowRect(hWnd, &wp.rcNormalPosition)) {
return MonitorFromRect(&wp.rcNormalPosition, dwFlags);
@@ -98,7 +98,7 @@
GetSystemMetrics(SM_CYSCREEN) );
lpMonitorInfo->rcWork = rcWork;
lpMonitorInfo->dwFlags = MONITORINFOF_PRIMARY;
-
+
if (lpMonitorInfo->cbSize >= sizeof(MONITORINFOEXA))
strcpy(((MONITORINFOEXA*)lpMonitorInfo)->szDevice, "DISPLAY");
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 1ca2b33..658b741 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -43,13 +43,13 @@
static HBITMAP hbitmapClose;
static const BYTE lpGrayMask[] = { 0xAA, 0xA0,
- 0x55, 0x50,
+ 0x55, 0x50,
0xAA, 0xA0,
- 0x55, 0x50,
+ 0x55, 0x50,
0xAA, 0xA0,
- 0x55, 0x50,
+ 0x55, 0x50,
0xAA, 0xA0,
- 0x55, 0x50,
+ 0x55, 0x50,
0xAA, 0xA0,
0x55, 0x50};
@@ -159,7 +159,7 @@
int adjust;
if(style & WS_ICONIC) return;
- if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) ==
+ if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) ==
WS_EX_STATICEDGE)
{
adjust = 1; /* for the outer frame always present */
@@ -173,7 +173,7 @@
if (style & WS_THICKFRAME)
adjust += ( GetSystemMetrics (SM_CXFRAME)
- GetSystemMetrics (SM_CXDLGFRAME)); /* The resize border */
- if ((style & (WS_BORDER|WS_DLGFRAME)) ||
+ if ((style & (WS_BORDER|WS_DLGFRAME)) ||
(exStyle & WS_EX_DLGMODALFRAME))
adjust++; /* The other border */
@@ -677,9 +677,9 @@
return HTMENU;
}
- /* Has to return HTNOWHERE if nothing was found
+ /* Has to return HTNOWHERE if nothing was found
Could happen when a window has a customized non client area */
- return HTNOWHERE;
+ return HTNOWHERE;
}
@@ -823,7 +823,7 @@
return HTMENU;
}
- /* Has to return HTNOWHERE if nothing was found
+ /* Has to return HTNOWHERE if nothing was found
Could happen when a window has a customized non client area */
return HTNOWHERE;
}
@@ -1084,7 +1084,7 @@
if (dlgFrame)
{
InflateRect( rect, -width, -height );
- }
+ }
else
{
INT decYOff = GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXSIZE) - 1;
@@ -1142,7 +1142,7 @@
* you LIKE thick borders in Win95/NT4.0 -- I've been working with
* them lately, but just to get this code right). Even so, it doesn't
* appear to be so. It's being worked on...
- *
+ *
* Revision history
* 06-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
* Original implementation (based on NC_DrawFrame)
@@ -1232,7 +1232,7 @@
{
if (!(hbitmapClose = LoadBitmapA( 0, MAKEINTRESOURCEA(OBM_OLD_CLOSE) ))) return;
}
-
+
if (GetWindowLongA( hwnd, GWL_EXSTYLE) & WS_EX_DLGMODALFRAME)
{
HBRUSH hbrushOld = SelectObject(hdc, GetSysColorBrush(COLOR_WINDOW) );
@@ -1330,7 +1330,7 @@
r.left += GetSystemMetrics(SM_CYCAPTION) - 1;
}
- if (style & WS_SYSMENU)
+ if (style & WS_SYSMENU)
{
UINT state;
@@ -1339,7 +1339,7 @@
state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
/* Draw a grayed close button if disabled and a normal one if SC_CLOSE is not there */
- NC_DrawCloseButton95 (hwnd, hdc, FALSE,
+ NC_DrawCloseButton95 (hwnd, hdc, FALSE,
((((state & MF_DISABLED) || (state & MF_GRAYED))) && (state != 0xFFFFFFFF)));
r.right -= GetSystemMetrics(SM_CYCAPTION) - 1;
@@ -1350,7 +1350,7 @@
NC_DrawMaxButton95( hwnd, hdc, FALSE, (!(style & WS_MAXIMIZEBOX)));
r.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-
+
NC_DrawMinButton95( hwnd, hdc, FALSE, (!(style & WS_MINIMIZEBOX)));
r.right -= GetSystemMetrics(SM_CXSIZE) + 1;
}
@@ -1397,7 +1397,7 @@
if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return;
has_menu = HAS_MENU(wndPtr);
dwStyle = wndPtr->dwStyle;
- dwExStyle = wndPtr->dwExStyle;
+ dwExStyle = wndPtr->dwExStyle;
flags = wndPtr->flags;
rectClient = wndPtr->rectClient;
rectWindow = wndPtr->rectWindow;
@@ -1475,7 +1475,7 @@
r.top++;
}
FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) );
- }
+ }
ReleaseDC( hwnd, hdc );
}
@@ -1522,7 +1522,7 @@
if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return;
has_menu = HAS_MENU(wndPtr);
dwStyle = wndPtr->dwStyle;
- dwExStyle = wndPtr->dwExStyle;
+ dwExStyle = wndPtr->dwExStyle;
flags = wndPtr->flags;
rectClient = wndPtr->rectClient;
rectWindow = wndPtr->rectWindow;
@@ -1599,7 +1599,7 @@
{
RECT r = rect;
r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);
-
+
TRACE("Calling DrawMenuBar with rect (%d, %d)-(%d, %d)\n",
r.left, r.top, r.right, r.bottom);
@@ -1626,7 +1626,7 @@
r.left = r.right - GetSystemMetrics(SM_CXVSCROLL) + 1;
r.top = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1;
FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) );
- }
+ }
ReleaseDC( hwnd, hdc );
}
@@ -1725,7 +1725,7 @@
return (LONG)SetCursor( LoadCursorA( 0, IDC_SIZENSA ) );
case HTTOPLEFT:
- case HTBOTTOMRIGHT:
+ case HTBOTTOMRIGHT:
return (LONG)SetCursor( LoadCursorA( 0, IDC_SIZENWSEA ) );
case HTTOPRIGHT:
@@ -1793,7 +1793,7 @@
/* Check if the sysmenu item for minimize is there */
state = GetMenuState(hSysMenu, SC_MINIMIZE, MF_BYCOMMAND);
-
+
paintButton = &NC_DrawMinButton95;
}
else
@@ -1804,7 +1804,7 @@
/* Check if the sysmenu item for maximize is there */
state = GetMenuState(hSysMenu, SC_MAXIMIZE, MF_BYCOMMAND);
-
+
paintButton = &NC_DrawMaxButton95;
}
@@ -1841,7 +1841,7 @@
if ((!pressed) || (state == 0xFFFFFFFF))
return;
- if (wParam == HTMINBUTTON)
+ if (wParam == HTMINBUTTON)
SendMessageA( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) );
else
SendMessageA( hwnd, WM_SYSCOMMAND,
@@ -1895,7 +1895,7 @@
if (!pressed) return;
- if (wParam == HTMINBUTTON)
+ if (wParam == HTMINBUTTON)
SendMessageA( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) );
else
SendMessageA( hwnd, WM_SYSCOMMAND,
@@ -1921,7 +1921,7 @@
return;
state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
-
+
/* If the item close of the sysmenu is disabled or not there do nothing */
if((state & MF_DISABLED) || (state & MF_GRAYED) || (state == 0xFFFFFFFF))
return;
@@ -2037,14 +2037,14 @@
if (TWEAK_WineLook == WIN31_LOOK)
NC_TrackMinMaxBox( hwnd, wParam );
else
- NC_TrackMinMaxBox95( hwnd, wParam );
+ NC_TrackMinMaxBox95( hwnd, wParam );
break;
case HTCLOSE:
if (TWEAK_WineLook >= WIN95_LOOK)
NC_TrackCloseButton95 (hwnd, wParam);
break;
-
+
case HTLEFT:
case HTRIGHT:
case HTTOP:
@@ -2079,7 +2079,7 @@
{
SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, lParam );
return 0;
- }
+ }
switch(wParam) /* Hit test */
{
@@ -2127,7 +2127,7 @@
case SC_MINIMIZE:
if (hwnd == GetForegroundWindow())
ShowOwnedPopups(hwnd,FALSE);
- ShowWindow( hwnd, SW_MINIMIZE );
+ ShowWindow( hwnd, SW_MINIMIZE );
break;
case SC_MAXIMIZE:
@@ -2169,7 +2169,7 @@
break;
case SC_TASKLIST:
- WinExec( "taskman.exe", SW_SHOWNORMAL );
+ WinExec( "taskman.exe", SW_SHOWNORMAL );
break;
case SC_SCREENSAVE:
@@ -2183,11 +2183,11 @@
FreeLibrary( hmodule );
}
}
- else
+ else
if (wParam == SC_PUTMARK)
TRACE_(shell)("Mark requested by user\n");
break;
-
+
case SC_HOTKEY:
case SC_ARRANGE:
case SC_NEXTWINDOW:
@@ -2212,21 +2212,21 @@
HBRUSH hOldBrush;
hMaskBmp = CreateBitmap (12, 10, 1, 1, lpGrayMask);
-
+
if(hMaskBmp == 0)
return FALSE;
-
+
SelectObject (hdcMask, hMaskBmp);
-
+
/* Draw the grayed bitmap using the mask */
hOldBrush = SelectObject (hdc, RGB(128, 128, 128));
BitBlt (hdc, x, y, 12, 10,
hdcMask, 0, 0, 0xB8074A);
-
+
/* Clean up */
SelectObject (hdc, hOldBrush);
DeleteObject(hMaskBmp);
DeleteDC (hdcMask);
-
+
return TRUE;
}
diff --git a/windows/painting.c b/windows/painting.c
index b7ae05b..1acf921 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -96,7 +96,7 @@
* WIN_HaveToDelayNCPAINT
*
* Currently, in the Wine painting mechanism, the WM_NCPAINT message
- * is generated as soon as a region intersecting the non-client area
+ * is generated as soon as a region intersecting the non-client area
* of a window is invalidated.
*
* This technique will work fine for all windows whose parents
@@ -108,7 +108,7 @@
* non-client area.
*
* This method looks at the current state of a window to determine
- * if the sending of the WM_NCPAINT message should be delayed until
+ * if the sending of the WM_NCPAINT message should be delayed until
* the BeginPaint call.
*
* PARAMS:
@@ -118,12 +118,12 @@
* function. This is a shortcut for the cases when
* we already know when to avoid scanning all the
* parents of a window. If you already know that this
- * window's NCPAINT should be delayed, set the
- * UNC_DELAY_NCPAINT flag for this parameter.
+ * window's NCPAINT should be delayed, set the
+ * UNC_DELAY_NCPAINT flag for this parameter.
*
* This shortcut behavior is implemented in the
* RDW_Paint() method.
- *
+ *
*/
static BOOL WIN_HaveToDelayNCPAINT( HWND hwnd, UINT uncFlags)
{
@@ -145,7 +145,7 @@
/*
* Scan all the parents of this window to find a window
* that doesn't have the WS_CLIPCHILDREN style and that
- * has an invalid region.
+ * has an invalid region.
*/
while ((hwnd = GetAncestor( hwnd, GA_PARENT )))
{
@@ -171,7 +171,7 @@
* NOTE: UNC_REGION is mainly for the RDW_Paint() chunk that sends WM_ERASEBKGND message.
* The trick is that when the returned region handle may be different from hRgn.
* In this case the old hRgn must be considered gone. BUT, if the returned value
- * is 1 then the hRgn is preserved and RDW_Paint() will have to get
+ * is 1 then the hRgn is preserved and RDW_Paint() will have to get
* a DC without extra clipping region.
*/
static HRGN WIN_UpdateNCRgn(WND* wnd, HRGN hRgn, UINT uncFlags )
@@ -180,7 +180,7 @@
HRGN hClip = 0;
HRGN hrgnRet = 0;
- TRACE_(nonclient)("hwnd %04x [%04x] hrgn %04x, unc %04x, ncf %i\n",
+ TRACE_(nonclient)("hwnd %04x [%04x] hrgn %04x, unc %04x, ncf %i\n",
wnd->hwndSelf, wnd->hrgnUpdate, hRgn, uncFlags, wnd->flags & WIN_NEEDS_NCPAINT);
/* desktop window doesn't have a nonclient area */
@@ -189,7 +189,7 @@
wnd->flags &= ~WIN_NEEDS_NCPAINT;
if( wnd->hrgnUpdate > 1 )
hrgnRet = REGION_CropRgn( hRgn, wnd->hrgnUpdate, NULL, NULL );
- else
+ else
{
hrgnRet = wnd->hrgnUpdate;
}
@@ -200,21 +200,21 @@
!(wnd->flags & WIN_NCACTIVATED) )
{
wnd->flags |= WIN_NCACTIVATED;
- uncFlags |= UNC_ENTIRE;
+ uncFlags |= UNC_ENTIRE;
}
/*
- * If the window's non-client area needs to be painted,
+ * If the window's non-client area needs to be painted,
*/
if ( ( wnd->flags & WIN_NEEDS_NCPAINT ) &&
!WIN_HaveToDelayNCPAINT(wnd->hwndSelf, uncFlags) )
{
RECT r2, r3;
- wnd->flags &= ~WIN_NEEDS_NCPAINT;
+ wnd->flags &= ~WIN_NEEDS_NCPAINT;
GETCLIENTRECTW( wnd, r );
- TRACE_(nonclient)( "\tclient box (%i,%i-%i,%i), hrgnUpdate %04x\n",
+ TRACE_(nonclient)( "\tclient box (%i,%i-%i,%i), hrgnUpdate %04x\n",
r.left, r.top, r.right, r.bottom, wnd->hrgnUpdate );
if( wnd->hrgnUpdate > 1 )
{
@@ -222,7 +222,7 @@
GetRgnBox( wnd->hrgnUpdate, &r2 );
UnionRect( &r3, &r2, &r );
- if( r3.left != r.left || r3.top != r.top ||
+ if( r3.left != r.left || r3.top != r.top ||
r3.right != r.right || r3.bottom != r.bottom ) /* it does */
{
/* crop hrgnUpdate, save old one in hClip - the only
@@ -238,7 +238,7 @@
GetRgnBox( wnd->hrgnUpdate, &r3 );
if( IsRectEmpty( &r3 ) )
{
- /* delete the update region since all invalid
+ /* delete the update region since all invalid
* parts were in the nonclient area */
DeleteObject( wnd->hrgnUpdate );
@@ -252,7 +252,7 @@
if(!hClip && wnd->hrgnUpdate ) goto copyrgn;
}
- else
+ else
if( wnd->hrgnUpdate == 1 )/* entire window */
{
if( uncFlags & UNC_UPDATE ) wnd->hrgnUpdate = CreateRectRgnIndirect( &r );
@@ -271,7 +271,7 @@
else
if( wnd->hrgnUpdate == 1 && (uncFlags & UNC_UPDATE) )
{
- GETCLIENTRECTW( wnd, r );
+ GETCLIENTRECTW( wnd, r );
wnd->hrgnUpdate = CreateRectRgnIndirect( &r );
if( uncFlags & UNC_REGION ) hrgnRet = 1;
}
@@ -311,7 +311,7 @@
/***********************************************************************
- * RDW_ValidateParent [RDW_UpdateRgns() helper]
+ * RDW_ValidateParent [RDW_UpdateRgns() helper]
*
* Validate the portions of parents that are covered by a validated child
* wndPtr = child
@@ -369,7 +369,7 @@
}
/***********************************************************************
- * RDW_UpdateRgns [RedrawWindow() helper]
+ * RDW_UpdateRgns [RedrawWindow() helper]
*
* Walks the window tree and adds/removes parts of the hRgn to/from update
* regions of windows that overlap it. Also, manages internal paint flags.
@@ -379,7 +379,7 @@
*/
static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecursLevel )
{
- /*
+ /*
* Called only when one of the following is set:
* (RDW_INVALIDATE | RDW_VALIDATE | RDW_INTERNALPAINT | RDW_NOINTERNALPAINT)
*/
@@ -406,8 +406,8 @@
CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate, hRgn, RGN_OR );
/* fall through */
case 0:
- wndPtr->hrgnUpdate = REGION_CropRgn( wndPtr->hrgnUpdate,
- wndPtr->hrgnUpdate ? wndPtr->hrgnUpdate : hRgn,
+ wndPtr->hrgnUpdate = REGION_CropRgn( wndPtr->hrgnUpdate,
+ wndPtr->hrgnUpdate ? wndPtr->hrgnUpdate : hRgn,
&r, NULL );
if( !bHadOne )
{
@@ -577,7 +577,7 @@
static HRGN RDW_Paint( WND* wndPtr, HRGN hrgn, UINT flags, UINT ex )
{
/* NOTE: wndPtr is locked by caller.
- *
+ *
* FIXME: Windows uses WM_SYNCPAINT to cut down the number of intertask
* SendMessage() calls. This is a comment inside DefWindowProc() source
* from 16-bit SDK:
@@ -616,10 +616,10 @@
UINT dcx = DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN | DCX_WINDOWPAINT | DCX_CACHE;
HRGN hrgnRet;
- hrgnRet = WIN_UpdateNCRgn(wndPtr,
- hrgn,
- UNC_REGION | UNC_CHECK |
- ((ex & RDW_EX_DELAY_NCPAINT) ? UNC_DELAY_NCPAINT : 0) );
+ hrgnRet = WIN_UpdateNCRgn(wndPtr,
+ hrgn,
+ UNC_REGION | UNC_CHECK |
+ ((ex & RDW_EX_DELAY_NCPAINT) ? UNC_DELAY_NCPAINT : 0) );
if( hrgnRet )
{
@@ -627,9 +627,9 @@
if( wndPtr->flags & WIN_NEEDS_ERASEBKGND )
{
if( bIcon ) dcx |= DCX_WINDOW;
- else
+ else
if( hrgnRet )
- OffsetRgn( hrgnRet, wndPtr->rectWindow.left - wndPtr->rectClient.left,
+ OffsetRgn( hrgnRet, wndPtr->rectWindow.left - wndPtr->rectClient.left,
wndPtr->rectWindow.top - wndPtr->rectClient.top);
else
dcx &= ~DCX_INTERSECTRGN;
@@ -704,7 +704,7 @@
else
SetRectEmpty( &r );
TRACE( "%04x (%04x) %s %d,%d-%d,%d %04x flags=%04x\n",
- hwnd, wndPtr->hrgnUpdate, rectUpdate ? "rect" : "NULL", r.left,
+ hwnd, wndPtr->hrgnUpdate, rectUpdate ? "rect" : "NULL", r.left,
r.top, r.right, r.bottom, hrgnUpdate, flags );
}
}
@@ -736,8 +736,8 @@
{
if( wndPtr->hrgnUpdate )
hRgn = REGION_CropRgn( 0, hrgnUpdate, NULL, &pt );
- else
- wndPtr->hrgnUpdate = REGION_CropRgn( 0, hrgnUpdate, &r, &pt );
+ else
+ wndPtr->hrgnUpdate = REGION_CropRgn( 0, hrgnUpdate, &r, &pt );
}
else if( rectUpdate )
{
@@ -782,7 +782,7 @@
}
else /* entire window or client depending on RDW_FRAME */
{
- if( flags & RDW_FRAME )
+ if( flags & RDW_FRAME )
hRgn = 1;
else
{
@@ -888,7 +888,7 @@
GetClientRect( hwnd, rect );
if (erase) RedrawWindow( hwnd, NULL, 0, RDW_FRAME | RDW_ERASENOW | RDW_NOCHILDREN );
}
- else
+ else
SetRectEmpty( rect );
}
retvalue = (wndPtr->hrgnUpdate >= 1);
@@ -953,7 +953,7 @@
if( wndPtr->hrgnUpdate > 1 )
{
CombineRgn(hrgn, wndPtr->hrgnUpdate, 0, RGN_COPY);
- OffsetRgn(hrgn, wndPtr->rectWindow.left - wndPtr->rectClient.left,
+ OffsetRgn(hrgn, wndPtr->rectWindow.left - wndPtr->rectClient.left,
wndPtr->rectWindow.top - wndPtr->rectClient.top );
}
@@ -963,7 +963,7 @@
DeleteObject( hrgn );
WIN_ReleaseWndPtr(wndPtr);
return ret;
- }
+ }
WIN_ReleaseWndPtr(wndPtr);
return GetClipBox( hdc, &rect );
}
@@ -1028,7 +1028,7 @@
BOOL WINAPI InvertRect( HDC hdc, const RECT *rect )
{
return PatBlt( hdc, rect->left, rect->top,
- rect->right - rect->left, rect->bottom - rect->top,
+ rect->right - rect->left, rect->bottom - rect->top,
DSTINVERT );
}
@@ -1043,7 +1043,7 @@
if ( (r.right <= r.left) || (r.bottom <= r.top) ) return 0;
if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0;
-
+
PatBlt( hdc, r.left, r.top, 1,
r.bottom - r.top, PATCOPY );
PatBlt( hdc, r.right - 1, r.top, 1,
@@ -1135,7 +1135,7 @@
BOOL retval;
INT cx = rc->right - rc->left;
INT cy = rc->bottom - rc->top;
-
+
switch(opcode)
{
case DST_TEXT:
@@ -1152,7 +1152,7 @@
memdc = CreateCompatibleDC(hdc);
if(!memdc) return FALSE;
hbmsave = (HBITMAP)SelectObject(memdc, (HBITMAP)lp);
- if(!hbmsave)
+ if(!hbmsave)
{
DeleteDC(memdc);
return FALSE;
@@ -1161,7 +1161,7 @@
SelectObject(memdc, hbmsave);
DeleteDC(memdc);
return retval;
-
+
case DST_COMPLEX:
if(func) {
BOOL bRet;
@@ -1220,14 +1220,14 @@
retval = GetTextExtentPoint32A(hdc, (LPSTR)lp, len, &s);
if(!retval) return FALSE;
break;
-
+
case DST_ICON:
ici = (CURSORICONINFO *)GlobalLock16((HGLOBAL16)lp);
if(!ici) return FALSE;
s.cx = ici->nWidth;
s.cy = ici->nHeight;
GlobalUnlock16((HGLOBAL16)lp);
- break;
+ break;
case DST_BITMAP:
if(!GetObjectA((HBITMAP)lp, sizeof(bm), &bm))
@@ -1235,11 +1235,11 @@
s.cx = bm.bmWidth;
s.cy = bm.bmHeight;
break;
-
+
case DST_COMPLEX: /* cx and cy must be set in this mode */
return FALSE;
}
-
+
if(!cx) cx = s.cx;
if(!cy) cy = s.cy;
}
@@ -1267,7 +1267,7 @@
hbm = (HBITMAP)NULL; hbmsave = (HBITMAP)NULL;
memdc = (HDC)NULL; hbsave = (HBRUSH)NULL;
retval = FALSE; /* assume failure */
-
+
/* From here on we must use "goto cleanup" when something goes wrong */
hbm = CreateBitmap(cx, cy, 1, 1, NULL);
if(!hbm) goto cleanup;
@@ -1290,7 +1290,7 @@
tmp = PAINTING_DrawStateJam(memdc, opcode, func, lp, len, &rc, dtflags, unicode);
if(hfsave) SelectObject(memdc, hfsave);
if(!tmp) goto cleanup;
-
+
/* This state cause the image to be dithered */
if(flags & DSS_UNION)
{
@@ -1329,12 +1329,12 @@
}
hbsave = (HBRUSH)SelectObject(hdc, hbr);
-
+
if(!BitBlt(hdc, x, y, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup;
-
+
retval = TRUE; /* We succeeded */
-
-cleanup:
+
+cleanup:
SetTextColor(hdc, fg);
SetBkColor(hdc, bg);
diff --git a/windows/queue.c b/windows/queue.c
index 5f0b6d4..88d2f74 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -101,9 +101,9 @@
static PERQUEUEDATA * PERQDATA_CreateInstance(void)
{
PERQUEUEDATA *pQData;
-
+
BOOL16 bIsWin16 = 0;
-
+
TRACE_(msg)("()\n");
/* Share a single instance of perQData for all 16 bit tasks */
@@ -137,7 +137,7 @@
/* Save perQData globally for 16 bit tasks */
if ( bIsWin16 )
pQDataWin16 = pQData;
-
+
return pQData;
}
@@ -331,7 +331,7 @@
CloseHandle( queue->server_queue );
GlobalFree16( queue->self );
}
-
+
HeapUnlock( GetProcessHeap() );
}
}
@@ -378,10 +378,10 @@
msgQueue->self = hQueue;
msgQueue->lockCount = 1;
msgQueue->magic = QUEUE_MAGIC;
-
+
/* Create and initialize our per queue data */
msgQueue->pQData = bCreatePerQData ? PERQDATA_CreateInstance() : NULL;
-
+
return hQueue;
}
@@ -471,7 +471,7 @@
ERR_(msg)("failed!\n");
return FALSE;
}
-
+
/* Link new queue into list */
queuePtr = QUEUE_Lock( hQueue );
queuePtr->teb = NtCurrentTeb();
@@ -480,7 +480,7 @@
SetThreadQueue16( 0, hQueue );
NtCurrentTeb()->queue = hQueue;
HeapUnlock( GetProcessHeap() );
-
+
QUEUE_Unlock( queuePtr );
}
@@ -525,13 +525,13 @@
/***********************************************************************
* GetMessagePos (USER.119)
* GetMessagePos (USER32.@)
- *
+ *
* The GetMessagePos() function returns a long value representing a
* cursor position, in screen coordinates, when the last message
* retrieved by the GetMessage() function occurs. The x-coordinate is
* in the low-order word of the return value, the y-coordinate is in
* the high-order word. The application can use the MAKEPOINT()
- * macro to obtain a POINT structure from the return value.
+ * macro to obtain a POINT structure from the return value.
*
* For the current cursor position, use GetCursorPos().
*
@@ -571,7 +571,7 @@
* CONFORMANCE
*
* ECMA-234, Win32
- *
+ *
*/
LONG WINAPI GetMessageTime(void)
{
@@ -608,7 +608,7 @@
* TODO:
* 1. Reset the Key State (currenly per thread key state is not maintained)
*/
-BOOL WINAPI AttachThreadInput(
+BOOL WINAPI AttachThreadInput(
DWORD idAttach, /* [in] Thread to attach */
DWORD idAttachTo, /* [in] Thread to attach to */
BOOL fAttach) /* [in] Attach or detach */
@@ -627,7 +627,7 @@
*/
if ( HOOK_IsHooked( WH_JOURNALRECORD ) )
goto CLEANUP;
-
+
/* Retrieve message queues corresponding to the thread id's */
pTgtMsgQ = QUEUE_Lock( GetThreadQueue16( idAttach ) );
pSrcMsgQ = QUEUE_Lock( GetThreadQueue16( idAttachTo ) );
@@ -645,7 +645,7 @@
{
/* First release the target threads perQData */
PERQDATA_Release( pTgtMsgQ->pQData );
-
+
/* Share a reference to the source threads perQDATA */
PERQDATA_Addref( pSrcMsgQ->pQData );
pTgtMsgQ->pQData = pSrcMsgQ->pQData;
@@ -658,7 +658,7 @@
{
/* First release the target threads perQData */
PERQDATA_Release( pTgtMsgQ->pQData );
-
+
/* Give the target thread its own private perQDATA once more */
pTgtMsgQ->pQData = PERQDATA_CreateInstance();
}
@@ -667,7 +667,7 @@
/* TODO: Reset the Key State */
bRet = 1; /* Success */
-
+
CLEANUP:
/* Unlock the queues before returning */
@@ -675,6 +675,6 @@
QUEUE_Unlock( pSrcMsgQ );
if ( pTgtMsgQ )
QUEUE_Unlock( pTgtMsgQ );
-
+
return bRet;
}
diff --git a/windows/rect.c b/windows/rect.c
index 73ffe0e..bba18ef 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -145,7 +145,7 @@
rect->left += x;
rect->right += x;
rect->top += y;
- rect->bottom += y;
+ rect->bottom += y;
}
@@ -158,7 +158,7 @@
rect->left += x;
rect->right += x;
rect->top += y;
- rect->bottom += y;
+ rect->bottom += y;
return TRUE;
}
@@ -255,7 +255,7 @@
dest->left = min( src1->left, src2->left );
dest->right = max( src1->right, src2->right );
dest->top = min( src1->top, src2->top );
- dest->bottom = max( src1->bottom, src2->bottom );
+ dest->bottom = max( src1->bottom, src2->bottom );
}
}
return TRUE;
@@ -286,7 +286,7 @@
dest->left = min( src1->left, src2->left );
dest->right = max( src1->right, src2->right );
dest->top = min( src1->top, src2->top );
- dest->bottom = max( src1->bottom, src2->bottom );
+ dest->bottom = max( src1->bottom, src2->bottom );
}
}
return TRUE;
diff --git a/windows/scroll.c b/windows/scroll.c
index ac215dc..976e4aa 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -64,7 +64,7 @@
/*************************************************************************
* ScrollDC (USER32.@)
- *
+ *
* Only the hrgnUpdate is return in device coordinate.
* rcUpdate must be returned in logical coordinate to comply with win API.
*
diff --git a/windows/spy.c b/windows/spy.c
index ad5b656..2467e42 100644
--- a/windows/spy.c
+++ b/windows/spy.c
@@ -2,7 +2,7 @@
* Message spying routines
*
* Copyright 1994, Bob Amstadt
- * 1995, Alex Korobka
+ * 1995, Alex Korobka
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -41,8 +41,8 @@
static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] =
{
"WM_NULL", /* 0x00 */
- "WM_CREATE",
- "WM_DESTROY",
+ "WM_CREATE",
+ "WM_DESTROY",
"WM_MOVE",
"wm_sizewait",
"WM_SIZE",
@@ -90,38 +90,38 @@
"WM_CHARTOITEM",
"WM_SETFONT", /* 0x30 */
"WM_GETFONT",
- "WM_SETHOTKEY",
- "WM_GETHOTKEY",
- "wm_filesyschange",
+ "WM_SETHOTKEY",
+ "WM_GETHOTKEY",
+ "wm_filesyschange",
"wm_isactiveicon",
"wm_queryparkicon",
"WM_QUERYDRAGICON",
"wm_querysavestate",
- "WM_COMPAREITEM",
+ "WM_COMPAREITEM",
"wm_testing",
- NULL,
- "wm_otherwindowcreated",
- "wm_otherwindowdestroyed",
+ NULL,
+ "wm_otherwindowcreated",
+ "wm_otherwindowdestroyed",
"wm_activateshellwindow",
NULL,
NULL, /* 0x40 */
- "wm_compacting", NULL, NULL,
- "WM_COMMNOTIFY", NULL,
+ "wm_compacting", NULL, NULL,
+ "WM_COMMNOTIFY", NULL,
"WM_WINDOWPOSCHANGING", /* 0x0046 */
"WM_WINDOWPOSCHANGED", /* 0x0047 */
- "WM_POWER", NULL,
- "WM_COPYDATA",
- "WM_CANCELJOURNAL", NULL, NULL,
+ "WM_POWER", NULL,
+ "WM_COPYDATA",
+ "WM_CANCELJOURNAL", NULL, NULL,
"WM_NOTIFY", NULL,
/* 0x0050 */
"WM_INPUTLANGCHANGEREQUEST",
- "WM_INPUTLANGCHANGE",
- "WM_TCARD",
- "WM_HELP",
- "WM_USERCHANGED",
- "WM_NOTIFYFORMAT", NULL, NULL,
+ "WM_INPUTLANGCHANGE",
+ "WM_TCARD",
+ "WM_HELP",
+ "WM_USERCHANGED",
+ "WM_NOTIFYFORMAT", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 0x0060 */
@@ -130,11 +130,11 @@
/* 0x0070 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
- "WM_CONTEXTMENU",
- "WM_STYLECHANGING",
- "WM_STYLECHANGED",
- "WM_DISPLAYCHANGE",
+ NULL, NULL, NULL,
+ "WM_CONTEXTMENU",
+ "WM_STYLECHANGING",
+ "WM_STYLECHANGED",
+ "WM_DISPLAYCHANGE",
"WM_GETICON",
"WM_SETICON", /* 0x0080 */
@@ -145,7 +145,7 @@
"WM_NCPAINT", /* 0x0085 */
"WM_NCACTIVATE", /* 0x0086 */
"WM_GETDLGCODE", /* 0x0087 */
- "WM_SYNCPAINT",
+ "WM_SYNCPAINT",
"WM_SYNCTASK", NULL, NULL, NULL, NULL, NULL, NULL,
/* 0x0090 */
@@ -421,10 +421,10 @@
"WM_ENTERMENULOOP", /* 0x0211 */
"WM_EXITMENULOOP", /* 0x0212 */
"WM_NEXTMENU", /* 0x0213 */
- "WM_SIZING",
+ "WM_SIZING",
"WM_CAPTURECHANGED",
"WM_MOVING", NULL,
- "WM_POWERBROADCAST",
+ "WM_POWERBROADCAST",
"WM_DEVICECHANGE", NULL, NULL, NULL, NULL, NULL, NULL,
"WM_MDICREATE", /* 0x0220 */
@@ -438,22 +438,22 @@
"WM_MDIICONARRANGE", /* 0x0228 */
"WM_MDIGETACTIVE", /* 0x0229 */
- "WM_DROPOBJECT",
- "WM_QUERYDROPOBJECT",
+ "WM_DROPOBJECT",
+ "WM_QUERYDROPOBJECT",
"WM_BEGINDRAG",
"WM_DRAGLOOP",
"WM_DRAGSELECT",
"WM_DRAGMOVE",
-
+
/* 0x0230*/
"WM_MDISETMENU", /* 0x0230 */
"WM_ENTERSIZEMOVE", /* 0x0231 */
"WM_EXITSIZEMOVE", /* 0x0232 */
"WM_DROPFILES", /* 0x0233 */
- "WM_MDIREFRESHMENU", NULL, NULL, NULL,
+ "WM_MDIREFRESHMENU", NULL, NULL, NULL,
/* 0x0238*/
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
+
/* 0x0240 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -461,7 +461,7 @@
/* 0x0250 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
+
/* 0x0260 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -492,18 +492,18 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"WM_CUT", /* 0x0300 */
- "WM_COPY",
- "WM_PASTE",
- "WM_CLEAR",
- "WM_UNDO",
- "WM_RENDERFORMAT",
- "WM_RENDERALLFORMATS",
+ "WM_COPY",
+ "WM_PASTE",
+ "WM_CLEAR",
+ "WM_UNDO",
+ "WM_RENDERFORMAT",
+ "WM_RENDERALLFORMATS",
"WM_DESTROYCLIPBOARD",
- "WM_DRAWCLIPBOARD",
- "WM_PAINTCLIPBOARD",
- "WM_VSCROLLCLIPBOARD",
- "WM_SIZECLIPBOARD",
- "WM_ASKCBFORMATNAME",
+ "WM_DRAWCLIPBOARD",
+ "WM_PAINTCLIPBOARD",
+ "WM_VSCROLLCLIPBOARD",
+ "WM_SIZECLIPBOARD",
+ "WM_ASKCBFORMATNAME",
"WM_CHANGECBCHAIN",
"WM_HSCROLLCLIPBOARD",
"WM_QUERYNEWPALETTE", /* 0x030f*/
@@ -511,10 +511,10 @@
"WM_PALETTEISCHANGING",
"WM_PALETTECHANGED",
"WM_HOTKEY", /* 0x0312 */
- NULL, NULL, NULL, NULL,
- "WM_PRINT",
- "WM_PRINTCLIENT",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ "WM_PRINT",
+ "WM_PRINTCLIENT",
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -570,23 +570,23 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
"WM_COALESCE_LAST", /* 0x039F */
-
+
/* 0x03a0 */
- "MM_JOY1MOVE",
- "MM_JOY2MOVE",
- "MM_JOY1ZMOVE",
- "MM_JOY2ZMOVE",
+ "MM_JOY1MOVE",
+ "MM_JOY2MOVE",
+ "MM_JOY1ZMOVE",
+ "MM_JOY2ZMOVE",
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* 0x03b0 */
- NULL, NULL, NULL, NULL, NULL,
- "MM_JOY1BUTTONDOWN",
- "MM_JOY2BUTTONDOWN",
+ NULL, NULL, NULL, NULL, NULL,
+ "MM_JOY1BUTTONDOWN",
+ "MM_JOY2BUTTONDOWN",
"MM_JOY1BUTTONUP",
"MM_JOY2BUTTONUP",
"MM_MCINOTIFY",
- NULL,
+ NULL,
"MM_WOM_OPEN",
"MM_WOM_CLOSE",
"MM_WOM_DONE",
@@ -620,7 +620,7 @@
"WM_DDE_EXECUTE", /* 0x3E8 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
+
/* 0x03f0 */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -1279,41 +1279,41 @@
/* number. (First method prefered.) */
static const USER_MSG rebar_array[] = {
- USM(RB_INSERTBANDA, 0),
- USM(RB_DELETEBAND, 0),
- USM(RB_GETBARINFO, 0),
- USM(RB_SETBARINFO, 0),
- USM(RB_GETBANDINFO, 0),
- USM(RB_SETBANDINFOA, 0),
- USM(RB_SETPARENT, 0),
- USM(RB_HITTEST, 0),
- USM(RB_GETRECT, 0),
- USM(RB_INSERTBANDW, 0),
- USM(RB_SETBANDINFOW, 0),
- USM(RB_GETBANDCOUNT, 0),
- USM(RB_GETROWCOUNT, 0),
- USM(RB_GETROWHEIGHT, 0),
- USM(RB_IDTOINDEX, 0),
- USM(RB_GETTOOLTIPS, 0),
- USM(RB_SETTOOLTIPS, 0),
- USM(RB_SETBKCOLOR, 0),
- USM(RB_GETBKCOLOR, 0),
- USM(RB_SETTEXTCOLOR, 0),
- USM(RB_GETTEXTCOLOR, 0),
- USM(RB_SIZETORECT, 0),
- USM(RB_BEGINDRAG, 0),
- USM(RB_ENDDRAG, 0),
- USM(RB_DRAGMOVE, 0),
- USM(RB_GETBARHEIGHT, 0),
- USM(RB_GETBANDINFOW, 0),
- USM(RB_GETBANDINFOA, 0),
- USM(RB_MINIMIZEBAND, 0),
- USM(RB_MAXIMIZEBAND, 0),
- USM(RB_GETBANDBORDERS, 0),
- USM(RB_SHOWBAND, 0),
- USM(RB_SETPALETTE, 0),
- USM(RB_GETPALETTE, 0),
- USM(RB_MOVEBAND, 0),
+ USM(RB_INSERTBANDA, 0),
+ USM(RB_DELETEBAND, 0),
+ USM(RB_GETBARINFO, 0),
+ USM(RB_SETBARINFO, 0),
+ USM(RB_GETBANDINFO, 0),
+ USM(RB_SETBANDINFOA, 0),
+ USM(RB_SETPARENT, 0),
+ USM(RB_HITTEST, 0),
+ USM(RB_GETRECT, 0),
+ USM(RB_INSERTBANDW, 0),
+ USM(RB_SETBANDINFOW, 0),
+ USM(RB_GETBANDCOUNT, 0),
+ USM(RB_GETROWCOUNT, 0),
+ USM(RB_GETROWHEIGHT, 0),
+ USM(RB_IDTOINDEX, 0),
+ USM(RB_GETTOOLTIPS, 0),
+ USM(RB_SETTOOLTIPS, 0),
+ USM(RB_SETBKCOLOR, 0),
+ USM(RB_GETBKCOLOR, 0),
+ USM(RB_SETTEXTCOLOR, 0),
+ USM(RB_GETTEXTCOLOR, 0),
+ USM(RB_SIZETORECT, 0),
+ USM(RB_BEGINDRAG, 0),
+ USM(RB_ENDDRAG, 0),
+ USM(RB_DRAGMOVE, 0),
+ USM(RB_GETBARHEIGHT, 0),
+ USM(RB_GETBANDINFOW, 0),
+ USM(RB_GETBANDINFOA, 0),
+ USM(RB_MINIMIZEBAND, 0),
+ USM(RB_MAXIMIZEBAND, 0),
+ USM(RB_GETBANDBORDERS, 0),
+ USM(RB_SHOWBAND, 0),
+ USM(RB_SETPALETTE, 0),
+ USM(RB_GETPALETTE, 0),
+ USM(RB_MOVEBAND, 0),
{0,0,0} };
static const USER_MSG toolbar_array[] = {
@@ -1323,9 +1323,9 @@
USM(TB_HIDEBUTTON ,0),
USM(TB_INDETERMINATE ,0),
USM(TB_MARKBUTTON ,0),
- USM(TB_ISBUTTONENABLED ,0),
- USM(TB_ISBUTTONCHECKED ,0),
- USM(TB_ISBUTTONPRESSED ,0),
+ USM(TB_ISBUTTONENABLED ,0),
+ USM(TB_ISBUTTONCHECKED ,0),
+ USM(TB_ISBUTTONPRESSED ,0),
USM(TB_ISBUTTONHIDDEN ,0),
USM(TB_ISBUTTONINDETERMINATE ,0),
USM(TB_ISBUTTONHIGHLIGHTED ,0),
@@ -1340,7 +1340,7 @@
USM(TB_COMMANDTOINDEX ,0),
USM(TB_SAVERESTOREA ,0),
USM(TB_CUSTOMIZE ,0),
- USM(TB_ADDSTRINGA ,0),
+ USM(TB_ADDSTRINGA ,0),
USM(TB_GETITEMRECT ,0),
USM(TB_BUTTONSTRUCTSIZE ,0),
USM(TB_SETBUTTONSIZE ,0),
@@ -1387,7 +1387,7 @@
USM(TB_GETANCHORHIGHLIGHT ,0),
USM(TB_GETBUTTONTEXTW ,0),
USM(TB_SAVERESTOREW ,0),
- USM(TB_ADDSTRINGW ,0),
+ USM(TB_ADDSTRINGW ,0),
USM(TB_MAPACCELERATORA ,0),
USM(TB_GETINSERTMARK ,0),
USM(TB_SETINSERTMARK ,0),
@@ -1481,12 +1481,12 @@
/* locate the correct 'value'. */
static const SPY_NOTIFY spnfy_array[] = {
/* common 0U to 0U-99U */
- SPNFY(NM_OUTOFMEMORY, NMHDR),
- SPNFY(NM_CLICK, NMHDR),
+ SPNFY(NM_OUTOFMEMORY, NMHDR),
+ SPNFY(NM_CLICK, NMHDR),
SPNFY(NM_DBLCLK, NMHDR),
- SPNFY(NM_RETURN, NMHDR),
+ SPNFY(NM_RETURN, NMHDR),
SPNFY(NM_RCLICK, NMHDR),
- SPNFY(NM_RDBLCLK, NMHDR),
+ SPNFY(NM_RDBLCLK, NMHDR),
SPNFY(NM_SETFOCUS, NMHDR),
SPNFY(NM_KILLFOCUS, NMHDR),
SPNFY(NM_CUSTOMDRAW, NMCUSTOMDRAW),
@@ -1496,7 +1496,7 @@
SPNFY(NM_RELEASEDCAPTURE, NMHDR),
SPNFY(NM_SETCURSOR, NMMOUSE),
SPNFY(NM_CHAR, NMCHAR),
- SPNFY(NM_TOOLTIPSCREATED, NMTOOLTIPSCREATED),
+ SPNFY(NM_TOOLTIPSCREATED, NMTOOLTIPSCREATED),
/* Listview 0U-100U to 0U-199U */
SPNFY(LVN_ITEMCHANGING, NMLISTVIEW),
SPNFY(LVN_ITEMCHANGED, NMLISTVIEW),
@@ -1613,7 +1613,7 @@
SPNFY(TBN_GETINFOTIPW, NMTBGETINFOTIPW),
SPNFY(TBN_GETBUTTONINFOW, NMTOOLBARW),
/* Up/Down 0U-721U to 0U-740U */
- SPNFY(UDN_DELTAPOS, NMHDR),
+ SPNFY(UDN_DELTAPOS, NMHDR),
/* Month Calendar 0U-750U to 0U-759U */
/* ******************* WARNING ***************************** */
/* The following appear backwards but needs to be this way. */
@@ -1631,9 +1631,9 @@
/* Thank you MS for your obvious quality control!! */
/* ******************* WARNING ***************************** */
/* Date/Time 0U-760U to 0U-799U */
- /* SPNFY(MCN_SELECT, NMHDR), */
- /* SPNFY(MCN_GETDAYSTATE, NMHDR), */
- /* SPNFY(MCN_SELCHANGE, NMHDR), */
+ /* SPNFY(MCN_SELECT, NMHDR), */
+ /* SPNFY(MCN_GETDAYSTATE, NMHDR), */
+ /* SPNFY(MCN_SELCHANGE, NMHDR), */
/* ******************* WARNING ***************************** */
/* The following appear backwards but needs to be this way. */
/* The reason is that MS (and us) define the MCNs as */
@@ -1642,20 +1642,20 @@
/* TBN_FIRST - n */
/* The only place that this is important is in this list */
/* ******************* WARNING ***************************** */
- SPNFY(DTN_FORMATQUERYW, NMHDR),
- SPNFY(DTN_FORMATW, NMHDR),
- SPNFY(DTN_WMKEYDOWNW, NMHDR),
- SPNFY(DTN_USERSTRINGW, NMHDR),
- SPNFY(MCN_SELECT, NMHDR),
- SPNFY(MCN_GETDAYSTATE, NMHDR),
- SPNFY(MCN_SELCHANGE, NMHDR),
- SPNFY(DTN_CLOSEUP, NMHDR),
- SPNFY(DTN_DROPDOWN, NMHDR),
- SPNFY(DTN_FORMATQUERYA, NMHDR),
- SPNFY(DTN_FORMATA, NMHDR),
- SPNFY(DTN_WMKEYDOWNA, NMHDR),
- SPNFY(DTN_USERSTRINGA, NMHDR),
- SPNFY(DTN_DATETIMECHANGE, NMHDR),
+ SPNFY(DTN_FORMATQUERYW, NMHDR),
+ SPNFY(DTN_FORMATW, NMHDR),
+ SPNFY(DTN_WMKEYDOWNW, NMHDR),
+ SPNFY(DTN_USERSTRINGW, NMHDR),
+ SPNFY(MCN_SELECT, NMHDR),
+ SPNFY(MCN_GETDAYSTATE, NMHDR),
+ SPNFY(MCN_SELCHANGE, NMHDR),
+ SPNFY(DTN_CLOSEUP, NMHDR),
+ SPNFY(DTN_DROPDOWN, NMHDR),
+ SPNFY(DTN_FORMATQUERYA, NMHDR),
+ SPNFY(DTN_FORMATA, NMHDR),
+ SPNFY(DTN_WMKEYDOWNA, NMHDR),
+ SPNFY(DTN_USERSTRINGA, NMHDR),
+ SPNFY(DTN_DATETIMECHANGE, NMHDR),
/* ComboBoxEx 0U-800U to 0U-830U */
SPNFY(CBEN_GETDISPINFOA, NMCOMBOBOXEXA),
SPNFY(CBEN_INSERTITEM, NMCOMBOBOXEXA),
@@ -1677,7 +1677,7 @@
SPNFY(RBN_DELETEDBAND, NMREBAR),
SPNFY(RBN_CHILDSIZE, NMREBARCHILDSIZE),
/* IP Adderss 0U-860U to 0U-879U */
- SPNFY(IPN_FIELDCHANGED, NMHDR),
+ SPNFY(IPN_FIELDCHANGED, NMHDR),
/* Status bar 0U-880U to 0U-899U */
SPNFY(SBN_SIMPLEMODECHANGE, NMHDR),
/* Pager 0U-900U to 0U-950U */
@@ -1842,8 +1842,8 @@
strcmpW(cc_array[i].classname, sp_e->wnd_class) !=0) i++;
if (!cc_array[i].classname) return;
- /* TRACE("process class %s, first %p, last %p\n",
- debugstr_w(cc_array[i].classname), cc_array[i].classmsg,
+ /* TRACE("process class %s, first %p, last %p\n",
+ debugstr_w(cc_array[i].classname), cc_array[i].classmsg,
cc_array[i].lastmsg); */
p = SPY_Bsearch_Msg (cc_array[i].classmsg, cc_array[i].lastmsg,
sp_e->msgnum);
@@ -1857,7 +1857,7 @@
/***********************************************************************
* SPY_GetWndName
*
- * Sets the value of "wnd_name" and "wnd_class" members of the
+ * Sets the value of "wnd_name" and "wnd_class" members of the
* instance structure.
*
*/
@@ -1866,7 +1866,7 @@
DWORD save_error;
INT len;
- /* save and restore error code over the next call */
+ /* save and restore error code over the next call */
save_error = GetLastError();
GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)/sizeof(WCHAR));
SetLastError(save_error);
@@ -1887,7 +1887,7 @@
/***********************************************************************
* SPY_GetMsgName
*
- * **** External function ****
+ * **** External function ****
*
* Get message name
*/
@@ -2008,7 +2008,7 @@
{
LPRECT rc = (LPRECT) sp_e->lParam;
if (rc) {
- TRACE("lParam rect (%d,%d)-(%d,%d)\n",
+ TRACE("lParam rect (%d,%d)-(%d,%d)\n",
rc->left, rc->top, rc->right, rc->bottom);
}
break;
@@ -2035,7 +2035,7 @@
{
LPINT ptmin = (LPINT) sp_e->wParam;
LPINT ptmax = (LPINT) sp_e->lParam;
- if (ptmin && ptmax)
+ if (ptmin && ptmax)
TRACE("min=%d max=%d\n", *ptmin, *ptmax);
else if (ptmin)
TRACE("min=%d max=n/a\n", *ptmin);
@@ -2045,24 +2045,24 @@
}
case WM_DRAWITEM:
if (!enter) break;
- {
+ {
DRAWITEMSTRUCT *lpdis = (DRAWITEMSTRUCT*) sp_e->lParam;
- TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
+ TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
lpdis->CtlType, lpdis->CtlID);
- TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
+ TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
lpdis->itemID, lpdis->itemAction, lpdis->itemState);
TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
- lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left,
+ lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left,
lpdis->rcItem.top, lpdis->rcItem.right,
lpdis->rcItem.bottom, lpdis->itemData);
}
break;
case WM_MEASUREITEM:
- {
+ {
MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) sp_e->lParam;
- TRACE("MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
+ TRACE("MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
lpmis->CtlType, lpmis->CtlID);
- TRACE("itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n",
+ TRACE("itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n",
lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight);
TRACE("itemData=0x%08lx\n", lpmis->itemData);
}
@@ -2070,7 +2070,7 @@
case WM_WINDOWPOSCHANGED:
if (!enter) break;
case WM_WINDOWPOSCHANGING:
- {
+ {
WINDOWPOS *lpwp = (WINDOWPOS *)sp_e->lParam;
TRACE("WINDOWPOS hwnd=0x%04x, after=0x%04x, at (%d,%d) w=%d h=%d, flags=0x%08x\n",
lpwp->hwnd, lpwp->hwndInsertAfter, lpwp->x, lpwp->y,
@@ -2080,10 +2080,10 @@
case WM_STYLECHANGED:
if (!enter) break;
case WM_STYLECHANGING:
- {
+ {
LPSTYLESTRUCT ss = (LPSTYLESTRUCT) sp_e->lParam;
TRACE("STYLESTRUCT: StyleOld=0x%08lx, StyleNew=0x%08lx\n",
- ss->styleOld, ss->styleNew);
+ ss->styleOld, ss->styleNew);
}
break;
case WM_NCCALCSIZE:
@@ -2095,14 +2095,14 @@
break;
case WM_NOTIFY:
/* if (!enter) break; */
- {
+ {
NMHDR * pnmh = (NMHDR*) sp_e->lParam;
UINT *q, dumplen;
const SPY_NOTIFY *p;
WCHAR from_class[60];
DWORD save_error;
- p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array,
+ p = SPY_Bsearch_Notify (&spnfy_array[0], end_spnfy_array,
pnmh->code);
if (p) {
TRACE("NMHDR hwndFrom=0x%08x idFrom=0x%08x code=%s<0x%08x>, extra=0x%x\n",
@@ -2111,12 +2111,12 @@
/* for CUSTOMDRAW, dump all the data for TOOLBARs */
if (pnmh->code == NM_CUSTOMDRAW) {
- /* save and restore error code over the next call */
+ /* save and restore error code over the next call */
save_error = GetLastError();
- GetClassNameW(pnmh->hwndFrom, from_class,
+ GetClassNameW(pnmh->hwndFrom, from_class,
sizeof(from_class)/sizeof(WCHAR));
SetLastError(save_error);
- if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0)
+ if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0)
dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR);
}
if (dumplen > 0) {
@@ -2133,7 +2133,7 @@
SPY_DumpMem ("MSG lParam", (UINT *)sp_e->lParam, sp_e->data_len);
break;
}
-
+
}
/***********************************************************************
* SPY_EnterMessage
@@ -2165,7 +2165,7 @@
case SPY_DISPATCHMESSAGE:
TRACE("%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n",
- indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
+ indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, wParam, lParam);
break;
@@ -2194,7 +2194,7 @@
SPY_DumpStructure(&sp_e, TRUE);
}
}
- break;
+ break;
case SPY_DEFWNDPROC16:
if( SPY_ExcludeDWP ) return;
@@ -2262,7 +2262,7 @@
indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg,
sp_e.msg_name, lReturn );
SPY_DumpStructure(&sp_e, FALSE);
- break;
+ break;
case SPY_RESULT_INVALIDHWND16:
WARN(" %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n",
@@ -2348,7 +2348,7 @@
p--;
end_spnfy_array = p;
- /* find last good entry in each common control message array
+ /* find last good entry in each common control message array
* and save addr for b-search.
*/
i = 0;
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 83f8383..47a6398 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -162,7 +162,7 @@
if (SysColorPens[index])
{
SYSCOLOR_MakeObjectSystem(SysColorPens[index], FALSE);
- DeleteObject( SysColorPens[index] );
+ DeleteObject( SysColorPens[index] );
}
SysColorPens[index] = CreatePen( PS_SOLID, 1, color );
SYSCOLOR_MakeObjectSystem(SysColorPens[index], TRUE);
@@ -193,7 +193,7 @@
{
DWORD dwDataSize = sizeof(buffer);
if (!(RegQueryValueExA(hKey,(LPSTR)p[i*2], 0, 0, buffer, &dwDataSize)))
- if (sscanf( buffer, "%d %d %d", &r, &g, &b ) == 3)
+ if (sscanf( buffer, "%d %d %d", &r, &g, &b ) == 3)
bOk = TRUE;
}
@@ -203,13 +203,13 @@
if (sscanf( buffer, " %d %d %d", &r, &g, &b ) == 3)
bOk = TRUE;
}
-
+
/* last chance, take the default */
if (!bOk)
{ int iNumColors = sscanf( p[i*2+1], " %d %d %d", &r, &g, &b );
assert (iNumColors==3);
}
-
+
SYSCOLOR_SetColor( i, RGB(r,g,b) );
}
if (!bNoReg)
@@ -290,7 +290,7 @@
* SetSysColorsTemp (USER32.@)
*
* UNDOCUMENTED !!
- *
+ *
* Called by W98SE desk.cpl Control Panel Applet:
* handle = SetSysColorsTemp(ptr, ptr, nCount); ("set" call)
* result = SetSysColorsTemp(NULL, NULL, handle); ("restore" call)
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index 0b3b7da..047170e 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -40,13 +40,13 @@
*
* Convert a a dimension value that was obtained from the registry. These are
* quoted as being "twips" values if negative and pixels if positive.
- * See for example
+ * See for example
* MSDN Library - April 2001 -> Resource Kits ->
* Windows 2000 Resource Kit Reference ->
* Technical Reference to the Windows 2000 Registry ->
* HKEY_CURRENT_USE -> Control Panel -> Desktop -> WindowMetrics
*
- * This is written as a function to prevent repeated evaluation of the
+ * This is written as a function to prevent repeated evaluation of the
* argument.
*/
inline static int RegistryTwips2Pixels(int x)
@@ -107,9 +107,9 @@
* SM_CYMENU x-1 x Already fixed
* SM_CYFULLSCREEN x-1 x
* SM_CXFRAME Fixed July 6, 2001 - Bill Medland
- *
+ *
* (collides with TWEAK_WineLook sometimes,
- * so changing anything might be difficult)
+ * so changing anything might be difficult)
*
* Starting at Win95 there are now a large number or Registry entries in the
* [WindowMetrics] section that are probably relevant here.
@@ -231,7 +231,7 @@
sysMetrics[SM_CYMINIMIZED] = 24;
/* FIXME: How do I calculate these? */
- sysMetrics[SM_CXMAXTRACK] =
+ sysMetrics[SM_CXMAXTRACK] =
sysMetrics[SM_CXSCREEN] + 4 + 2 * sysMetrics[SM_CXFRAME];
sysMetrics[SM_CYMAXTRACK] =
sysMetrics[SM_CYSCREEN] + 4 + 2 * sysMetrics[SM_CYFRAME];
diff --git a/windows/sysparams.c b/windows/sysparams.c
index f7fce71..a23f61c 100644
--- a/windows/sysparams.c
+++ b/windows/sysparams.c
@@ -356,7 +356,7 @@
SendMessageA(HWND_BROADCAST, WM_SETTINGCHANGE,
uiAction, (LPARAM) "");
}
- else
+ else
{
/* FIXME notify other wine processes with internal message */
}
@@ -543,9 +543,9 @@
BOOL ret = TRUE;
unsigned spi_idx = 0;
-
+
TRACE("(%u, %u, %p, %u)\n", uiAction, uiParam, pvParam, fWinIni);
-
+
switch (uiAction)
{
case SPI_GETBEEP: /* 1 */
@@ -553,12 +553,12 @@
if (!spi_loaded[spi_idx])
{
char buf[5];
-
+
if (SYSPARAMS_Load( SPI_SETBEEP_REGKEY, SPI_SETBEEP_VALNAME, buf ))
beep_active = !strcasecmp( "Yes", buf );
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = beep_active;
break;
@@ -595,7 +595,7 @@
((INT *)pvParam)[1] = mouse_threshold2;
((INT *)pvParam)[2] = mouse_speed;
break;
-
+
case SPI_SETMOUSE: /* 4 */
{
char buf[10];
@@ -656,7 +656,7 @@
if (SYSPARAMS_Save( SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME,
buf, fWinIni ))
{
- if (uiParam > 0)
+ if (uiParam > 0)
{
border = uiParam;
spi_loaded[spi_idx] = TRUE;
@@ -718,7 +718,7 @@
if (!spi_loaded[spi_idx])
{
char buf[10];
-
+
if (SYSPARAMS_Load( SPI_ICONHORIZONTALSPACING_REGKEY,
SPI_ICONHORIZONTALSPACING_VALNAME, buf ))
{
@@ -782,7 +782,7 @@
ret = FALSE;
break;
}
-
+
case SPI_GETSCREENSAVEACTIVE: /* 16 */
*(BOOL *)pvParam = USER_Driver.pGetScreenSaveActive();
break;
@@ -799,7 +799,7 @@
buf, fWinIni );
break;
}
-
+
case SPI_GETGRIDGRANULARITY: /* 18 */
spi_idx = SPI_SETGRIDGRANULARITY_IDX;
if (!spi_loaded[spi_idx])
@@ -810,7 +810,7 @@
SPI_SETGRIDGRANULARITY_VALNAME,
buf ))
grid_granularity = atoi( buf );
-
+
spi_loaded[spi_idx] = TRUE;
}
*(INT *)pvParam = grid_granularity;
@@ -844,8 +844,8 @@
if ((INT16)uiParam == -1)
{
char buffer[256];
- GetProfileStringA( "Desktop", "Pattern",
- "170 85 170 85 170 85 170 85",
+ GetProfileStringA( "Desktop", "Pattern",
+ "170 85 170 85 170 85 170 85",
buffer, sizeof(buffer) );
ret = DESKTOP_SetPattern( (LPSTR)buffer );
} else
@@ -865,7 +865,7 @@
int i = atoi( buf );
if ( (i >= 0) && (i <= 3)) keyboard_delay = i;
}
-
+
spi_loaded[spi_idx] = TRUE;
}
*(INT *)pvParam = keyboard_delay;
@@ -898,7 +898,7 @@
if (!spi_loaded[spi_idx])
{
char buf[10];
-
+
if (SYSPARAMS_Load( SPI_ICONVERTICALSPACING_REGKEY,
SPI_ICONVERTICALSPACING_VALNAME, buf ))
{
@@ -926,7 +926,7 @@
else
ret = FALSE;
}
-
+
break;
case SPI_GETICONTITLEWRAP: /* 25 */
@@ -940,7 +940,7 @@
icon_title_wrap = atoi(buf);
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = icon_title_wrap;
break;
@@ -961,14 +961,14 @@
ret = FALSE;
break;
}
-
+
case SPI_GETMENUDROPALIGNMENT: /* 27 */
spi_idx = SPI_SETMENUDROPALIGNMENT_IDX;
if (!spi_loaded[spi_idx])
{
char buf[5];
-
+
if (SYSPARAMS_Load( SPI_SETMENUDROPALIGNMENT_REGKEY,
SPI_SETMENUDROPALIGNMENT_VALNAME, buf ))
{
@@ -976,7 +976,7 @@
}
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = GetSystemMetrics( SM_MENUDROPALIGNMENT );
break;
@@ -1048,7 +1048,7 @@
SYSPARAMS_GetGUIFont( &lfDefault );
GetProfileStringA( "Desktop", "IconTitleFaceName",
- lfDefault.lfFaceName,
+ lfDefault.lfFaceName,
lpLogFont->lfFaceName, LF_FACESIZE );
lpLogFont->lfHeight = -GetProfileIntA( "Desktop", "IconTitleSize", 13 );
lpLogFont->lfWidth = 0;
@@ -1113,7 +1113,7 @@
/* the action is disabled */
ret = FALSE;
break;
-
+
case SPI_SETDRAGFULLWINDOWS: /* 37 WINVER >= 0x0400 */
{
char buf[5];
@@ -1143,18 +1143,18 @@
drag_full_windows = atoi(buf);
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = drag_full_windows;
break;
case SPI_GETNONCLIENTMETRICS: /* 41 WINVER >= 0x400 */
{
LPNONCLIENTMETRICSA lpnm = (LPNONCLIENTMETRICSA)pvParam;
-
+
if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
{
LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont);
-
+
/* clear the struct, so we have 'sane' members */
memset(
(char *)pvParam + sizeof(lpnm->cbSize),
@@ -1180,11 +1180,11 @@
/* 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",
+ lpnm->iMenuHeight = GetProfileIntA( "Desktop", "MenuHeight",
(TWEAK_WineLook > WIN31_LOOK) ? 13 : 27 );
- GetProfileStringA( "Desktop", "MenuFont",
- (TWEAK_WineLook > WIN31_LOOK) ? lpnm->lfCaptionFont.lfFaceName : "System",
+ GetProfileStringA( "Desktop", "MenuFont",
+ (TWEAK_WineLook > WIN31_LOOK) ? lpnm->lfCaptionFont.lfFaceName : "System",
lpLogFont->lfFaceName, LF_FACESIZE );
lpLogFont->lfHeight = -GetProfileIntA( "Desktop", "MenuFontSize", 13 );
@@ -1270,7 +1270,7 @@
SetRect( &work_area, 0, 0,
GetSystemMetrics( SM_CXSCREEN ),
GetSystemMetrics( SM_CYSCREEN ) );
-
+
if (SYSPARAMS_Load( SPI_SETWORKAREA_REGKEY,
SPI_SETWORKAREA_VALNAME,
buf ))
@@ -1353,7 +1353,7 @@
if (!spi_loaded[spi_idx])
{
char buf[10];
-
+
if (SYSPARAMS_Load( SPI_SETSHOWSOUNDS_REGKEY,
SPI_SETSHOWSOUNDS_VALNAME, buf ))
{
@@ -1361,7 +1361,7 @@
}
spi_loaded[spi_idx] = TRUE;
}
-
+
*(INT *)pvParam = GetSystemMetrics( SM_SHOWSOUNDS );
break;
@@ -1466,7 +1466,7 @@
break;
}
WINE_SPI_FIXME(SPI_SETSOUNDSENTRY); /* 65 */
-
+
case SPI_GETHIGHCONTRAST: /* 66 WINVER >= 0x400 */
{
LPHIGHCONTRASTA lpHighContrastA = (LPHIGHCONTRASTA)pvParam;
@@ -1496,7 +1496,7 @@
keyboard_pref = atoi(buf);
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = keyboard_pref;
break;
@@ -1529,7 +1529,7 @@
screen_reader = atoi(buf);
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = screen_reader;
break;
@@ -1554,7 +1554,7 @@
case SPI_GETANIMATION: /* 72 WINVER >= 0x400 */
{
LPANIMATIONINFO lpAnimInfo = (LPANIMATIONINFO)pvParam;
-
+
/* Tell it "disabled" */
if (lpAnimInfo->cbSize == sizeof(ANIMATIONINFO))
lpAnimInfo->iMinAnimate = 0; /* Minimise and restore animation is disabled (nonzero == enabled) */
@@ -1580,7 +1580,7 @@
WINE_SPI_FIXME(SPI_GETPOWEROFFACTIVE); /* 84 WINVER >= 0x400 */
WINE_SPI_FIXME(SPI_SETLOWPOWERACTIVE); /* 85 WINVER >= 0x400 */
WINE_SPI_FIXME(SPI_SETPOWEROFFACTIVE); /* 86 WINVER >= 0x400 */
-
+
WINE_SPI_FIXME(SPI_SETCURSORS); /* 87 WINVER >= 0x400 */
WINE_SPI_FIXME(SPI_SETICONS); /* 88 WINVER >= 0x400 */
@@ -1596,7 +1596,7 @@
WINE_SPI_FIXME(SPI_SETMOUSETRAILS); /* 93 WINVER >= 0x400 */
WINE_SPI_FIXME(SPI_GETMOUSETRAILS); /* 94 WINVER >= 0x400 */
-
+
case SPI_SETSCREENSAVERRUNNING: /* 97 WINVER >= 0x400 */
{
/* SPI_SCREENSAVERRUNNING is an alias for SPI_SETSCREENSAVERRUNNING */
@@ -1632,9 +1632,9 @@
*(UINT *)pvParam = 400; /* default for menu dropdowns */
break;
WINE_SPI_FIXME(SPI_SETMOUSEHOVERTIME); /* 103 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
-
+
case SPI_GETWHEELSCROLLLINES: /* 104 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
- *(UINT *)pvParam = 3; /* default for num scroll lines */
+ *(UINT *)pvParam = 3; /* default for num scroll lines */
break;
WINE_SPI_FIXME(SPI_SETWHEELSCROLLLINES); /* 105 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
@@ -1651,13 +1651,13 @@
if (!spi_loaded[spi_idx])
{
char buf[5];
-
+
if (SYSPARAMS_Load( SPI_SETSCREENSAVERRUNNING_REGKEY,
SPI_SETSCREENSAVERRUNNING_VALNAME, buf ))
screensaver_running = atoi( buf );
spi_loaded[spi_idx] = TRUE;
}
-
+
*(BOOL *)pvParam = screensaver_running;
break;
@@ -1695,7 +1695,7 @@
if (ret)
SYSPARAMS_NotifyChange( uiAction, fWinIni );
return ret;
-
+
#undef WINE_SPI_FIXME
#undef WINE_SPI_WARN
}
@@ -1710,7 +1710,7 @@
BOOL16 ret;
TRACE("(%u, %u, %p, %u)\n", uAction, uParam, lpvParam, fuWinIni);
-
+
switch (uAction)
{
case SPI_GETBEEP: /* 1 */
@@ -1774,7 +1774,7 @@
ret = SystemParametersInfoA( uAction, uParam, lpvParam, fuWinIni );
break;
}
-
+
case SPI_GETWORKAREA: /* 48 WINVER >= 0x400 */
{
RECT tmp;
@@ -1783,7 +1783,7 @@
CONV_RECT32TO16( &tmp, (RECT16 *)lpvParam );
break;
}
-
+
case SPI_GETMOUSEHOVERWIDTH: /* 98 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
case SPI_GETMOUSEHOVERHEIGHT: /* 100 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
case SPI_GETMOUSEHOVERTIME: /* 102 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */
@@ -1811,7 +1811,7 @@
BOOL ret;
TRACE("(%u, %u, %p, %u)\n", uiAction, uiParam, pvParam, fuWinIni);
-
+
switch (uiAction)
{
case SPI_SETDESKWALLPAPER: /* 20 */
@@ -1890,7 +1890,7 @@
ret = FALSE;
break;
}
-
+
default:
ret = SystemParametersInfoA( uiAction, uiParam, pvParam, fuWinIni );
break;
diff --git a/windows/timer.c b/windows/timer.c
index f4e8a55..4ba0c3c 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -79,7 +79,7 @@
TIMER *pTimer;
EnterCriticalSection( &csTimer );
-
+
for (i = NB_TIMERS, pTimer = TimersArray; i > 0; i--, pTimer++)
if ((pTimer->hwnd == hwnd) && pTimer->timeout)
TIMER_ClearTimer( pTimer );
@@ -99,11 +99,11 @@
TIMER *pTimer;
EnterCriticalSection( &csTimer );
-
+
for (i = NB_TIMERS, pTimer = TimersArray; i > 0; i--, pTimer++)
if ((pTimer->hq == hqueue) && pTimer->timeout)
TIMER_ClearTimer( pTimer );
-
+
LeaveCriticalSection( &csTimer );
}
@@ -127,11 +127,11 @@
if (!timeout)
{ /* timeout==0 is a legal argument UB 990821*/
WARN("Timeout== 0 not implemented, using timeout=1\n");
- timeout=1;
+ timeout=1;
}
EnterCriticalSection( &csTimer );
-
+
/* Check if there's already a timer with the same hwnd and id */
for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
@@ -145,7 +145,7 @@
if ( i == NB_TIMERS )
{
/* Find a free timer */
-
+
for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
if (!pTimer->timeout) break;
@@ -158,7 +158,7 @@
}
if (!hwnd) id = i + 1;
-
+
if (proc) WINPROC_SetProc( &winproc, proc, type, WIN_PROC_TIMER );
SERVER_START_REQ( set_win_timer )
@@ -181,12 +181,12 @@
pTimer->timeout = timeout;
pTimer->proc = winproc;
- TRACE("Timer added: %p, %04x, %04x, %04x, %08lx\n",
+ TRACE("Timer added: %p, %04x, %04x, %04x, %08lx\n",
pTimer, pTimer->hwnd, pTimer->msg, pTimer->id,
(DWORD)pTimer->proc );
LeaveCriticalSection( &csTimer );
-
+
if (!id) return TRUE;
else return id;
}
@@ -199,7 +199,7 @@
{
int i;
TIMER * pTimer;
-
+
SERVER_START_REQ( kill_win_timer )
{
req->win = hwnd;
@@ -210,9 +210,9 @@
SERVER_END_REQ;
EnterCriticalSection( &csTimer );
-
+
/* Find the timer */
-
+
for (i = 0, pTimer = TimersArray; i < NB_TIMERS; i++, pTimer++)
if ((pTimer->hwnd == hwnd) && (pTimer->id == id) &&
(pTimer->timeout != 0)) break;
@@ -229,9 +229,9 @@
/* Delete the timer */
TIMER_ClearTimer( pTimer );
-
+
LeaveCriticalSection( &csTimer );
-
+
return TRUE;
}
@@ -292,7 +292,7 @@
UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
TIMERPROC16 proc )
{
- TRACE("%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( WIN_Handle32(hwnd), id, timeout, (WNDPROC16)proc,
WIN_PROC_16, TRUE );
@@ -305,7 +305,7 @@
UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
TIMERPROC proc )
{
- TRACE("%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc, WIN_PROC_32A, TRUE );
}
diff --git a/windows/user.c b/windows/user.c
index 1abf7d9..d7864c2 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -2,7 +2,7 @@
* Misc. USER functions
*
* Copyright 1993 Robert J. Amstadt
- * 1996 Alex Korobka
+ * 1996 Alex Korobka
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -166,7 +166,7 @@
* SignalProc32 (USER.391)
* UserSignalProc (USER32.@)
*
- * For comments about the meaning of uCode and dwFlags
+ * For comments about the meaning of uCode and dwFlags
* see PROCESS_CallUserSignalProc.
*
*/
@@ -278,7 +278,7 @@
MESSAGE("\tflags=");_dump_CDS_flags(flags);MESSAGE("\n");
if (devmode==NULL)
FIXME_(system)(" devmode=NULL (return to default mode)\n");
- else if ( (devmode->dmBitsPerPel != GetSystemMetrics(SM_WINE_BPP))
+ else if ( (devmode->dmBitsPerPel != GetSystemMetrics(SM_WINE_BPP))
|| (devmode->dmPelsHeight != GetSystemMetrics(SM_CYSCREEN))
|| (devmode->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) )
@@ -290,9 +290,9 @@
FIXME_(system)(" width=%ld\n",devmode->dmPelsWidth);
if (devmode->dmFields & DM_PELSHEIGHT)
FIXME_(system)(" height=%ld\n",devmode->dmPelsHeight);
- FIXME_(system)(" (Putting X in this mode beforehand might help)\n");
+ FIXME_(system)(" (Putting X in this mode beforehand might help)\n");
/* we don't, but the program ... does not need to know */
- return DISP_CHANGE_SUCCESSFUL;
+ return DISP_CHANGE_SUCCESSFUL;
}
return DISP_CHANGE_SUCCESSFUL;
}
@@ -309,7 +309,7 @@
/***********************************************************************
* ChangeDisplaySettingsExA (USER32.@)
*/
-LONG WINAPI ChangeDisplaySettingsExA(
+LONG WINAPI ChangeDisplaySettingsExA(
LPCSTR devname, LPDEVMODEA devmode, HWND hwnd, DWORD flags,
LPARAM lparam
) {
@@ -329,9 +329,9 @@
FIXME_(system)(" width=%ld\n",devmode->dmPelsWidth);
if (devmode->dmFields & DM_PELSHEIGHT)
FIXME_(system)(" height=%ld\n",devmode->dmPelsHeight);
- FIXME_(system)(" (Putting X in this mode beforehand might help)\n");
+ FIXME_(system)(" (Putting X in this mode beforehand might help)\n");
/* we don't, but the program ... does not need to know */
- return DISP_CHANGE_SUCCESSFUL;
+ return DISP_CHANGE_SUCCESSFUL;
}
return DISP_CHANGE_SUCCESSFUL;
}
@@ -415,7 +415,7 @@
* EnumDisplaySettingsExA (USER32.@)
*/
BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum,
- LPDEVMODEA lpDevMode, DWORD dwFlags)
+ LPDEVMODEA lpDevMode, DWORD dwFlags)
{
TRACE_(system)("(%s,%lu,%p,%08lx): stub\n",
debugstr_a(lpszDeviceName), iModeNum, lpDevMode, dwFlags);
@@ -427,7 +427,7 @@
* EnumDisplaySettingsExW (USER32.@)
*/
BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum,
- LPDEVMODEW lpDevMode, DWORD dwFlags)
+ LPDEVMODEW lpDevMode, DWORD dwFlags)
{
TRACE_(system)("(%s,%lu,%p,%08lx): stub\n",
debugstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags);
@@ -500,7 +500,7 @@
case USUD_LOCALHEAP:
return USER_HeapSel;
case USUD_FIRSTCLASS:
- FIXME_(local)("return a pointer to the first window class.\n");
+ FIXME_(local)("return a pointer to the first window class.\n");
return (DWORD)-1;
default:
WARN_(local)("wReqType %04x (unknown)", wReqType);
diff --git a/windows/win.c b/windows/win.c
index 6f21aba..f88d1e1 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -872,7 +872,7 @@
else
{
/* neither x nor cx are default. Check the y values .
- * In the trace we see Outlook and Outlook Express using
+ * In the trace we see Outlook and Outlook Express using
* cy set to CW_USEDEFAULT when opening the address book.
*/
if (cs->cy == CW_USEDEFAULT || cs->cy == CW_USEDEFAULT16) {
@@ -1912,15 +1912,15 @@
* code using illegal offset value. Hopefully this is
* what those programs really expect.
*/
- if (type == WIN_PROC_16 &&
+ if (type == WIN_PROC_16 &&
wndPtr->cbWndExtra >= 4 &&
offset == wndPtr->cbWndExtra - sizeof(WORD))
{
INT offset2 = wndPtr->cbWndExtra - sizeof(LONG);
-
+
ERR( "- replaced invalid offset %d with %d\n",
offset, offset2 );
-
+
retvalue = *(LONG *)(((char *)wndPtr->wExtra) + offset2);
WIN_ReleasePtr( wndPtr );
return retvalue;
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 49c6bbc..e6123dd 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -83,7 +83,7 @@
int size,dsize,nlen;
- if(!WM_WINHELP)
+ if(!WM_WINHELP)
{
WM_WINHELP=RegisterWindowMessageA("WM_WINHELP");
if(!WM_WINHELP)
diff --git a/windows/winpos.c b/windows/winpos.c
index 228a95f..98b8bd3 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -122,7 +122,7 @@
if( lpPos )
{
- if( IsWindow(lpPos->hwndIconTitle) )
+ if( IsWindow(lpPos->hwndIconTitle) )
DestroyWindow( lpPos->hwndIconTitle );
HeapFree( GetProcessHeap(), 0, lpPos );
}
@@ -823,10 +823,10 @@
*/
BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy,
BOOL repaint )
-{
+{
int flags = SWP_NOZORDER | SWP_NOACTIVATE;
if (!repaint) flags |= SWP_NOREDRAW;
- TRACE("%04x %d,%d %dx%d %d\n",
+ TRACE("%04x %d,%d %dx%d %d\n",
hwnd, x, y, cx, cy, repaint );
return SetWindowPos( hwnd, 0, x, y, cx, cy, flags );
}
@@ -840,7 +840,7 @@
atomInternalPos );
if( !lpPos )
{
- /* this happens when the window is minimized/maximized
+ /* this happens when the window is minimized/maximized
* for the first time (rectWindow is not adjusted yet) */
lpPos = HeapAlloc( GetProcessHeap(), 0, sizeof(INTERNALPOS) );
@@ -852,11 +852,11 @@
*(UINT*)&lpPos->ptIconPos = *(UINT*)&lpPos->ptMaxPos = 0xFFFFFFFF;
}
- if( wnd->dwStyle & WS_MINIMIZE )
+ if( wnd->dwStyle & WS_MINIMIZE )
CONV_POINT32TO16( &pt, &lpPos->ptIconPos );
- else if( wnd->dwStyle & WS_MAXIMIZE )
+ else if( wnd->dwStyle & WS_MAXIMIZE )
CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
- else if( restoreRect )
+ else if( restoreRect )
CONV_RECT32TO16( restoreRect, &lpPos->rectNormal );
return lpPos;
@@ -1016,7 +1016,7 @@
LPPOINT16 ptIcon )
{
WINDOWPLACEMENT16 wndpl;
- if (GetWindowPlacement16( hwnd, &wndpl ))
+ if (GetWindowPlacement16( hwnd, &wndpl ))
{
if (rectWnd) *rectWnd = wndpl.rcNormalPosition;
if (ptIcon) *ptIcon = wndpl.ptMinPosition;
@@ -1095,7 +1095,7 @@
if( wndpl->flags & WPF_SETMINPOSITION && !EMPTYPOINT(lpPos->ptIconPos))
SetWindowPos( hwnd, 0, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
- }
+ }
else if( pWnd->dwStyle & WS_MAXIMIZE )
{
if( !EMPTYPOINT(lpPos->ptMaxPos) )
@@ -1288,7 +1288,7 @@
/* if prev wnd is minimized redraw icon title */
if( IsIconic( hwndPrevActive ) ) WINPOS_RedrawIconTitle(hwndPrevActive);
- /* managed windows will get ConfigureNotify event */
+ /* managed windows will get ConfigureNotify event */
if (wndPtr && !(wndPtr->dwStyle & WS_CHILD) && !(wndPtr->dwExStyle & WS_EX_MANAGED))
{
/* check Z-order and bring hWnd to the top */
@@ -1297,9 +1297,9 @@
tmp = GetWindow( tmp, GW_HWNDNEXT );
if( tmp != hWnd )
- SetWindowPos(hWnd, HWND_TOP, 0,0,0,0,
+ SetWindowPos(hWnd, HWND_TOP, 0,0,0,0,
SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
- if (!IsWindow(hWnd))
+ if (!IsWindow(hWnd))
goto CLEANUP;
}
@@ -1336,7 +1336,7 @@
}
HeapFree( GetProcessHeap(), 0, list );
}
-
+
if (hWnd && !IsWindow(hWnd)) goto CLEANUP;
}
@@ -1367,13 +1367,13 @@
HWND hOldFocus = PERQDATA_GetFocusWnd( pNewActiveQueue->pQData );
if ( !hOldFocus || GetAncestor( hOldFocus, GA_ROOT ) != hwndActive )
- FOCUS_SwitchFocus( pNewActiveQueue, hOldFocus,
+ FOCUS_SwitchFocus( pNewActiveQueue, hOldFocus,
(wndPtr && (wndPtr->dwStyle & WS_MINIMIZE))?
0 : hwndActive );
}
- if ( pOldActiveQueue &&
- ( !pNewActiveQueue ||
+ if ( pOldActiveQueue &&
+ ( !pNewActiveQueue ||
pNewActiveQueue->pQData != pOldActiveQueue->pQData ) )
{
HWND hOldFocus = PERQDATA_GetFocusWnd( pOldActiveQueue->pQData );
@@ -1391,7 +1391,7 @@
if( IsIconic(hwndActive) ) WINPOS_RedrawIconTitle(hwndActive);
bRet = (hWnd == hwndActive); /* Success? */
-
+
CLEANUP: /* Unlock the message queues before returning */
if ( pNewActiveQueue )
@@ -1544,7 +1544,7 @@
HDWP handle;
DWP *pDWP;
- if (count < 0)
+ if (count < 0)
{
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
@@ -1700,7 +1700,7 @@
* | | |-> tooltips_class32
* | |
* | |-> SysHeader32
- * |
+ * |
* |-> ProxyTarget
*/
HWND WINAPI SetShellWindowEx ( HWND hwndProgman, HWND hwndListView )
@@ -1714,7 +1714,7 @@
/***********************************************************************
* SetTaskmanWindow (USER32.@)
* NOTES
- * hwnd = MSTaskSwWClass
+ * hwnd = MSTaskSwWClass
* |-> SysTabControl32
*/
HWND WINAPI SetTaskmanWindow ( HWND hwnd )
diff --git a/windows/winproc.c b/windows/winproc.c
index 48dea55..36ec375 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -424,10 +424,10 @@
*
* 3) timer -> wp - SetTimer()
*
- * Initially, winproc of the window points to the current winproc
- * thunk of its class. Subclassing prepends a new thunk to the
- * window winproc chain at the head of the list. Thus, window thunk
- * list includes class thunks and the latter are preserved when the
+ * Initially, winproc of the window points to the current winproc
+ * thunk of its class. Subclassing prepends a new thunk to the
+ * window winproc chain at the head of the list. Thus, window thunk
+ * list includes class thunks and the latter are preserved when the
* window is destroyed.
*
*/
@@ -476,7 +476,7 @@
break;
}
}
-
+
/* WPF_CLASS thunk terminates window thunk list */
if ((*ppPrev)->user != user) break;
ppPrev = &(*ppPrev)->next;
@@ -568,7 +568,7 @@
*
* FIXME:
* WM_GETTEXT/WM_SETTEXT and static control with SS_ICON style:
- * the first four bytes are the handle of the icon
+ * the first four bytes are the handle of the icon
* when the WM_SETTEXT message has been used to set the icon
*/
INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plparam )
@@ -603,7 +603,7 @@
case WM_NCCREATE:
case WM_CREATE:
{
- struct s
+ struct s
{ CREATESTRUCTW cs; /* new structure */
LPCWSTR lpszName; /* allocated Name */
LPCWSTR lpszClass; /* allocated Class */
@@ -743,7 +743,7 @@
case WM_NCCREATE:
case WM_CREATE:
{
- struct s
+ struct s
{ CREATESTRUCTW cs; /* new structure */
LPWSTR lpszName; /* allocated Name */
LPWSTR lpszClass; /* allocated Class */
@@ -1360,7 +1360,7 @@
case WM_SIZECLIPBOARD:
FIXME_(msg)("message %04x needs translation\n",msg16 );
return -1;
- case WM_DDE_INITIATE:
+ case WM_DDE_INITIATE:
case WM_DDE_TERMINATE:
case WM_DDE_UNADVISE:
case WM_DDE_REQUEST:
@@ -1398,7 +1398,7 @@
switch (flag)
{
case 0:
- if (hi)
+ if (hi)
{
MESSAGE("DDE_ACK: neither atom nor handle!!!\n");
hi = 0;
@@ -2144,7 +2144,7 @@
case WM_STYLECHANGING:
case WM_STYLECHANGED:
return -1;
- case WM_DDE_INITIATE:
+ case WM_DDE_INITIATE:
case WM_DDE_TERMINATE:
case WM_DDE_UNADVISE:
case WM_DDE_REQUEST:
@@ -2179,7 +2179,7 @@
switch (flag)
{
case 0:
- if (hi)
+ if (hi)
{
MESSAGE("DDE_ACK: neither atom nor handle!!!\n");
hi = 0;
@@ -2212,7 +2212,7 @@
* Unmap a message that was mapped from 32-bit Ansi to 16-bit.
*/
void WINPROC_UnmapMsg32ATo16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam,
- MSGPARAM16* p16 )
+ MSGPARAM16* p16 )
{
switch(msg)
{
@@ -2723,7 +2723,7 @@
func = WINPROC_GetProc( (HWINDOWPROC)proc, WIN_PROC_16 );
return WINPROC_CallWndProc16( func, hwnd, msg, wParam, lParam );
#endif
-
+
switch(proc->type)
{
case WIN_PROC_16:
@@ -2765,9 +2765,9 @@
*
* CONFORMANCE
*
- * ECMA-234, Win32
+ * ECMA-234, Win32
*/
-LRESULT WINAPI CallWindowProcA(
+LRESULT WINAPI CallWindowProcA(
WNDPROC func, /* [in] window procedure */
HWND hwnd, /* [in] target window */
UINT msg, /* [in] message */
