[PATCH 4/5] winex11: Get rid of some trailing spaces.
Henri Verbeet
hverbeet at codeweavers.com
Sun Oct 9 12:01:21 CDT 2011
---
dlls/winex11.drv/brush.c | 6 +++---
dlls/winex11.drv/clipboard.c | 28 ++++++++++++++--------------
dlls/winex11.drv/desktop.c | 8 ++++----
dlls/winex11.drv/dib.c | 4 ++--
dlls/winex11.drv/dib_convert.c | 2 +-
dlls/winex11.drv/event.c | 12 ++++++------
dlls/winex11.drv/keyboard.c | 2 +-
dlls/winex11.drv/opengl.c | 26 +++++++++++++-------------
dlls/winex11.drv/palette.c | 10 +++++-----
dlls/winex11.drv/scroll.c | 4 ++--
dlls/winex11.drv/settings.c | 20 ++++++++++----------
dlls/winex11.drv/xdnd.c | 2 +-
dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++----------------
dlls/winex11.drv/xrender.c | 12 ++++++------
dlls/winex11.drv/xvidmode.c | 8 ++++----
15 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c
index d0fdb8d..172871c 100644
--- a/dlls/winex11.drv/brush.c
+++ b/dlls/winex11.drv/brush.c
@@ -115,7 +115,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth)
if (!ditherImage)
{
ditherImage = X11DRV_DIB_CreateXImage( MATRIX_SIZE, MATRIX_SIZE, depth );
- if (!ditherImage)
+ if (!ditherImage)
{
ERR("Could not create dither image\n");
return 0;
@@ -163,7 +163,7 @@ static Pixmap BRUSH_DitherMono( COLORREF color )
static const char gray_dither[][2] = {{ 0x1, 0x0 }, /* DKGRAY */
{ 0x2, 0x1 }, /* GRAY */
{ 0x1, 0x3 }, /* LTGRAY */
- };
+ };
int gray = (30 * GetRValue(color) + 59 * GetGValue(color) + 11 * GetBValue(color)) / 100;
int idx = gray * (sizeof gray_dither/sizeof gray_dither[0] + 1)/256 - 1;
Pixmap pixmap;
@@ -171,7 +171,7 @@ static Pixmap BRUSH_DitherMono( COLORREF color )
TRACE("color=%06x -> gray=%x\n", color, gray);
wine_tsx11_lock();
- pixmap = XCreateBitmapFromData( gdi_display, root_window,
+ pixmap = XCreateBitmapFromData( gdi_display, root_window,
gray_dither[idx],
2, 2 );
wine_tsx11_unlock();
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index caf2406..173a38d 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -459,7 +459,7 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr
/* allocate storage for new format entry */
lpNewFormat = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT));
- if(lpNewFormat == NULL)
+ if (!lpNewFormat)
{
WARN("No more memory for a new format!\n");
return NULL;
@@ -593,9 +593,9 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData)
TRACE("%04x\n", lpData->wFormatID);
if ((lpData->wFormatID >= CF_GDIOBJFIRST &&
- lpData->wFormatID <= CF_GDIOBJLAST) ||
- lpData->wFormatID == CF_BITMAP ||
- lpData->wFormatID == CF_DIB ||
+ lpData->wFormatID <= CF_GDIOBJLAST) ||
+ lpData->wFormatID == CF_BITMAP ||
+ lpData->wFormatID == CF_DIB ||
lpData->wFormatID == CF_PALETTE)
{
if (lpData->hData)
@@ -781,7 +781,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedFormat(Display *display, LPWINE_CL
if (wFormatID == CF_UNICODETEXT || wFormatID == CF_TEXT || wFormatID == CF_OEMTEXT)
bret = X11DRV_CLIPBOARD_RenderSynthesizedText(display, wFormatID);
- else
+ else
{
switch (wFormatID)
{
@@ -869,7 +869,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma
src_chars = strlen(lpstrS) + 1;
/* Calculate number of characters in the destination buffer */
- dst_chars = CLIPBOARD_ConvertText(lpSource->wFormatID, lpstrS,
+ dst_chars = CLIPBOARD_ConvertText(lpSource->wFormatID, lpstrS,
src_chars, wFormatID, NULL, 0);
if (!dst_chars)
@@ -1907,7 +1907,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p
/* We found at least one Window's format that mapps to the property.
* Continue looking for more.
*
- * If more than one property map to a Window's format then we use the first
+ * If more than one property map to a Window's format then we use the first
* one and ignore the rest.
*/
while (lpFormat)
@@ -1988,7 +1988,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO
if (selectionAcquired & (S_PRIMARY | S_CLIPBOARD))
{
- ERR("Received request to cache selection but process is owner=(%08x)\n",
+ ERR("Received request to cache selection but process is owner=(%08x)\n",
(unsigned) selectionWindow);
return -1; /* Prevent self request */
}
@@ -2045,7 +2045,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO
/* Read the TARGETS property contents */
wine_tsx11_lock();
if(XGetWindowProperty(display, xe.xselection.requestor, xe.xselection.property,
- 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets,
+ 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets,
&remain, (unsigned char**)&targetList) != Success)
{
wine_tsx11_unlock();
@@ -2148,8 +2148,8 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA
else if (xe.xselection.property != None)
{
/*
- * Read the contents of the X selection property
- * into WINE's clipboard cache and converting the
+ * Read the contents of the X selection property
+ * into WINE's clipboard cache and converting the
* data format if necessary.
*/
HANDLE hData = lpData->lpFormat->lpDrvImportFunc(display, xe.xselection.requestor,
@@ -2545,8 +2545,8 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow)
/*
* It's important that the selection get acquired from the thread
- * that owns the clipboard window. The primary reason is that we know
- * it is running a message loop and therefore can process the
+ * that owns the clipboard window. The primary reason is that we know
+ * it is running a message loop and therefore can process the
* X selection events.
*/
if (hWndClipWindow &&
@@ -2594,7 +2594,7 @@ int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow)
/**************************************************************************
* X11DRV_EmptyClipboard
*
- * Empty cached clipboard data.
+ * Empty cached clipboard data.
*/
void CDECL X11DRV_EmptyClipboard(BOOL keepunowned)
{
diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c
index acba18b..56fbfd2 100644
--- a/dlls/winex11.drv/desktop.c
+++ b/dlls/winex11.drv/desktop.c
@@ -77,7 +77,7 @@ static int X11DRV_desktop_GetCurrentMode(void)
for (i=0; i<dd_mode_count; i++)
{
if ( (screen_width == dd_modes[i].dwWidth) &&
- (screen_height == dd_modes[i].dwHeight) &&
+ (screen_height == dd_modes[i].dwHeight) &&
(dwBpp == dd_modes[i].dwBPP))
return i;
}
@@ -116,9 +116,9 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
xinerama_init( width, height );
/* initialize the available resolutions */
- dd_modes = X11DRV_Settings_SetHandlers("desktop",
- X11DRV_desktop_GetCurrentMode,
- X11DRV_desktop_SetCurrentMode,
+ dd_modes = X11DRV_Settings_SetHandlers("desktop",
+ X11DRV_desktop_GetCurrentMode,
+ X11DRV_desktop_SetCurrentMode,
NUM_DESKTOP_MODES+2, 1);
make_modes();
X11DRV_Settings_AddDepthModes();
diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index 4593d9a..86797a7 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -102,7 +102,7 @@ enum Rle_EscapeCodes
static INT X11DRV_DIB_Coerce(X_PHYSBITMAP *,INT);
-/*
+/*
Some of the following helper functions are duplicated in
dlls/gdi/dib.c
*/
@@ -239,7 +239,7 @@ static unsigned int X11DRV_DIB_GetColorCount(const BITMAPINFO *info)
static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2)
{
- return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) >
+ return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) >
(c2.rgbRed * c2.rgbRed + c2.rgbGreen * c2.rgbGreen + c2.rgbBlue * c2.rgbBlue);
}
diff --git a/dlls/winex11.drv/dib_convert.c b/dlls/winex11.drv/dib_convert.c
index 0bca50d..5ece5e1 100644
--- a/dlls/winex11.drv/dib_convert.c
+++ b/dlls/winex11.drv/dib_convert.c
@@ -822,7 +822,7 @@ static void convert_888_to_0888_asis(int width, int height,
DWORD* dstpixel;
int x,y;
int w1, w2, w3;
-
+
w1 = min( (INT_PTR)srcbits & 3, width);
w2 = ( width - w1) / 4;
w3 = ( width - w1) & 3;
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 00915cf..3ad0765 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -498,7 +498,7 @@ DWORD EVENT_x11_time_to_win32_time(Time time)
}
else
{
- /* If we got an event in the 'future', then our clock is clearly wrong.
+ /* If we got an event in the 'future', then our clock is clearly wrong.
If we got it more than 10000 ms in the future, then it's most likely
that the clock has wrapped. */
@@ -674,7 +674,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
{
XClientMessageEvent xev;
xev = *event;
-
+
TRACE("NET_WM Ping\n");
wine_tsx11_lock();
xev.window = DefaultRootWindow(xev.display);
@@ -1277,7 +1277,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt )
RECT tempRect;
if (!IsWindowEnabled(hQueryWnd)) return 0;
-
+
GetWindowRect(hQueryWnd, &tempRect);
if(!PtInRect(&tempRect, *lpPt)) return 0;
@@ -1300,7 +1300,7 @@ static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt )
}
if(!(GetWindowLongA( hQueryWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)) return 0;
-
+
ScreenToClient(hQueryWnd, lpPt);
return hQueryWnd;
@@ -1336,10 +1336,10 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
if( x < 0 || y < 0 ||
x > (data->whole_rect.right - data->whole_rect.left) ||
y > (data->whole_rect.bottom - data->whole_rect.top) )
- {
+ {
bAccept = GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES;
x = 0;
- y = 0;
+ y = 0;
}
else
{
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 47317e6..514b4b7 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -842,7 +842,7 @@ static const char main_key_th[MAIN_LEN][4] =
"qQæð","wWä\"","eEÓ®","rR¾±","tTи","yYÑí","uUÕê","iIó","oO¹Ï","pPÂ","[{º°","]}Å,",
"aA¿Ä","sS˦","dD¡¯","fF´â","gGà¬","hHéç","jJèë","kKÒÉ","lLÊÈ",";:Ç«","\'\"§.","\\|£¥",
"zZ¼(","xX»)","cCá©","vVÍÎ","bBÚ","nN×ì","mM·?",",<Á²",".>ãÌ","/?½Æ"
-};
+};
/*** VNC keyboard layout */
static const WORD main_key_scan_vnc[MAIN_LEN] =
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 5515cd1..f4305e5 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -414,7 +414,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
done:
if(vis) XFree(vis);
if(ctx) {
- pglXMakeCurrent(gdi_display, None, NULL);
+ pglXMakeCurrent(gdi_display, None, NULL);
pglXDestroyContext(gdi_display, ctx);
}
if (win != root) XDestroyWindow( gdi_display, win );
@@ -676,7 +676,7 @@ static BOOL describeDrawable(X11DRV_PDEVICE *physDev) {
static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuffer* pbuf) {
int nAttribs = 0;
- unsigned cur = 0;
+ unsigned cur = 0;
int pop;
int drawattrib = 0;
int nvfloatattrib = GLX_DONT_CARE;
@@ -852,7 +852,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf
case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV:
case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV:
pop = iWGLAttr[++cur];
- /** cannot be converted, see direct handling on
+ /** cannot be converted, see direct handling on
* - wglGetPixelFormatAttribivARB
* TODO: wglChoosePixelFormat
*/
@@ -1835,7 +1835,7 @@ BOOL X11DRV_wglDeleteContext(HGLRC hglrc)
*
* For OpenGL32 wglGetCurrentReadDCARB.
*/
-static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void)
+static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void)
{
HDC ret = 0;
Wine_GLContext *ctx = NtCurrentTeb()->glContext;
@@ -2479,7 +2479,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat,
object->fmt = fmt;
PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth);
- PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight);
+ PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight);
while (piAttribList && 0 != *piAttribList) {
int attr_v;
switch (*piAttribList) {
@@ -2812,7 +2812,7 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt
*piValue = WGL_NO_TEXTURE_ARB;
} else {
if (!use_render_texture_emulation) {
- SetLastError(ERROR_INVALID_DATA);
+ SetLastError(ERROR_INVALID_DATA);
return GL_FALSE;
}
switch (object->texture_target) {
@@ -3032,11 +3032,11 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
switch (curWGLAttr) {
case WGL_NUMBER_PIXEL_FORMATS_ARB:
- piValues[i] = nWGLFormats;
+ piValues[i] = nWGLFormats;
continue;
case WGL_SUPPORT_OPENGL_ARB:
- piValues[i] = GL_TRUE;
+ piValues[i] = GL_TRUE;
continue;
case WGL_ACCELERATION_ARB:
@@ -3099,7 +3099,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp);
if (hTest) goto get_error;
if (GLX_COLOR_INDEX_BIT == tmp) {
- piValues[i] = GL_FALSE;
+ piValues[i] = GL_FALSE;
continue;
}
hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &tmp);
@@ -3235,8 +3235,8 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF
hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, piValues + i);
if (hTest) goto get_error;
curGLXAttr = 0;
- } else {
- piValues[i] = GL_FALSE;
+ } else {
+ piValues[i] = GL_FALSE;
}
}
wine_tsx11_unlock();
@@ -3821,9 +3821,9 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev)
BOOL destroy_glxpixmap(Display *display, XID glxpixmap)
{
- wine_tsx11_lock();
+ wine_tsx11_lock();
pglXDestroyGLXPixmap(display, glxpixmap);
- wine_tsx11_unlock();
+ wine_tsx11_unlock();
return TRUE;
}
diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c
index 3e11a3d..88bd17a 100644
--- a/dlls/winex11.drv/palette.c
+++ b/dlls/winex11.drv/palette.c
@@ -866,10 +866,10 @@ static int X11DRV_SysPaletteLookupPixel( COLORREF col, BOOL skipReserved )
return best;
}
-
+
static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2)
{
- return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) >
+ return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) >
(c2.rgbRed * c2.rgbRed + c2.rgbGreen * c2.rgbGreen + c2.rgbBlue * c2.rgbBlue);
}
@@ -947,7 +947,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
case 0x10: /* DIBINDEX */
color = X11DRV_PALETTE_GetColor( physDev, color );
break;
-
+
case 1: /* PALETTEINDEX */
if (!GetPaletteEntries( hPal, idx, 1, &entry ))
{
@@ -1231,7 +1231,7 @@ UINT X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary )
prev_mapping = palette_get_mapping( hpal );
if (prev_mapping)
mapping = HeapReAlloc( GetProcessHeap(), 0, prev_mapping, sizeof(int)*num_entries);
- else
+ else
mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int)*num_entries);
if(mapping == NULL) {
@@ -1275,7 +1275,7 @@ UINT X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary )
/* forbid future mappings to this entry */
flag |= PC_SYS_RESERVED;
}
-
+
if (! (entries[i].peFlags & PC_NOCOLLAPSE) ) {
/* try to collapse identical colors */
index = X11DRV_LookupSysPaletteExact( entries[i].peRed, entries[i].peGreen, entries[i].peBlue );
diff --git a/dlls/winex11.drv/scroll.c b/dlls/winex11.drv/scroll.c
index 9daad56..c66e619 100644
--- a/dlls/winex11.drv/scroll.c
+++ b/dlls/winex11.drv/scroll.c
@@ -92,7 +92,7 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll,
CombineRgn( visrgn, visrgn, clipRgn, RGN_AND);
/* only those pixels in the scroll rectangle that remain in the clipping
* rect are scrolled. */
- if( lprcClip)
+ if (lprcClip)
rcClip = *lprcClip;
else
GetClipBox( hdc, &rcClip);
@@ -147,7 +147,7 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll,
code = X11DRV_END_EXPOSURES;
ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code,
sizeof(ExpRgn), (LPSTR)&ExpRgn );
- /* Intersect clip and scroll rectangles, allowing NULL values */
+ /* Intersect clip and scroll rectangles, allowing NULL values */
if( lprcScroll)
if( lprcClip)
IntersectRect( &rcClip, lprcClip, lprcScroll);
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index aa1d92f..fada789 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -36,8 +36,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11settings);
/*
- * The DDHALMODEINFO type is used to hold all the mode information.
- * This is done because the array of DDHALMODEINFO structures must be
+ * The DDHALMODEINFO type is used to hold all the mode information.
+ * This is done because the array of DDHALMODEINFO structures must be
* created for use by DirectDraw anyway.
*/
static LPDDHALMODEINFO dd_modes = NULL;
@@ -71,10 +71,10 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,
if (reserve_depths)
/* leave room for other depths */
dd_max_modes = (3+1)*(nmodes);
- else
+ else
dd_max_modes = nmodes;
- if (dd_modes)
+ if (dd_modes)
{
TRACE("Destroying old display modes array\n");
HeapFree(GetProcessHeap(), 0, dd_modes);
@@ -106,7 +106,7 @@ void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigne
info->dwGBitMask = 0;
info->dwBBitMask = 0;
info->dwAlphaBitMask = 0;
- TRACE("initialized mode %d: %dx%dx%d @%d Hz (%s)\n",
+ TRACE("initialized mode %d: %dx%dx%d @%d Hz (%s)\n",
dd_mode_count, width, height, bpp, freq, handler_name);
dd_mode_count++;
}
@@ -125,7 +125,7 @@ void X11DRV_Settings_AddDepthModes(void)
{
for (i=0; i < existing_modes; i++)
{
- X11DRV_Settings_AddOneMode(dd_modes[i].dwWidth, dd_modes[i].dwHeight,
+ X11DRV_Settings_AddOneMode(dd_modes[i].dwWidth, dd_modes[i].dwHeight,
depths[j], dd_modes[i].wRefreshRate);
}
}
@@ -157,9 +157,9 @@ static LONG X11DRV_nores_SetCurrentMode(int mode)
/* default handler only gets the current X desktop resolution */
void X11DRV_Settings_Init(void)
{
- X11DRV_Settings_SetHandlers("NoRes",
- X11DRV_nores_GetCurrentMode,
- X11DRV_nores_SetCurrentMode,
+ X11DRV_Settings_SetHandlers("NoRes",
+ X11DRV_nores_GetCurrentMode,
+ X11DRV_nores_SetCurrentMode,
1, 0);
X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60);
}
@@ -311,7 +311,7 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo
else
{
TRACE("mode %d -- %dx%dx%dbpp (%s)\n", n,
- devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel,
+ devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel,
handler_name);
}
return TRUE;
diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c
index f503884..b06c449 100644
--- a/dlls/winex11.drv/xdnd.c
+++ b/dlls/winex11.drv/xdnd.c
@@ -840,7 +840,7 @@ static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI)
for (i = 0; encodedURI[i]; ++i)
{
if (encodedURI[i] == '%')
- {
+ {
if (encodedURI[i+1] && encodedURI[i+2])
{
char buffer[3];
diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 0aea463..3c1923e 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -117,15 +117,15 @@ static void make_modes(void)
{
for (j=0; j < real_xrandr_rates_count[i]; j++)
{
- X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width,
- real_xrandr_sizes[i].height,
+ X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width,
+ real_xrandr_sizes[i].height,
0, real_xrandr_rates[i][j]);
}
}
else
{
- X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width,
- real_xrandr_sizes[i].height,
+ X11DRV_Settings_AddOneMode(real_xrandr_sizes[i].width,
+ real_xrandr_sizes[i].height,
0, 0);
}
}
@@ -140,7 +140,7 @@ static int X11DRV_XRandR_GetCurrentMode(void)
short rate;
unsigned int i;
int res = -1;
-
+
wine_tsx11_lock();
root = RootWindow (gdi_display, DefaultScreen(gdi_display));
sc = pXRRGetScreenInfo (gdi_display, root);
@@ -183,14 +183,14 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode)
size = pXRRConfigCurrentConfiguration (sc, &rot);
mode = mode%real_xrandr_modes_count;
- TRACE("Changing Resolution to %dx%d @%d Hz\n",
- dd_modes[mode].dwWidth,
- dd_modes[mode].dwHeight,
- dd_modes[mode].wRefreshRate);
+ TRACE("Changing Resolution to %dx%d @%d Hz\n",
+ dd_modes[mode].dwWidth,
+ dd_modes[mode].dwHeight,
+ dd_modes[mode].wRefreshRate);
for (i = 0; i < real_xrandr_sizes_count; i++)
{
- if ( (dd_modes[mode].dwWidth == real_xrandr_sizes[i].width ) &&
+ if ( (dd_modes[mode].dwWidth == real_xrandr_sizes[i].width ) &&
(dd_modes[mode].dwHeight == real_xrandr_sizes[i].height) )
{
size = i;
@@ -201,9 +201,9 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode)
if (dd_modes[mode].wRefreshRate == real_xrandr_rates[i][j])
{
rate = real_xrandr_rates[i][j];
- TRACE("Resizing X display to %dx%d @%d Hz\n",
+ TRACE("Resizing X display to %dx%d @%d Hz\n",
dd_modes[mode].dwWidth, dd_modes[mode].dwHeight, rate);
- stat = pXRRSetScreenConfigAndRate (gdi_display, sc, root,
+ stat = pXRRSetScreenConfigAndRate (gdi_display, sc, root,
size, rot, rate, CurrentTime);
break;
}
@@ -211,7 +211,7 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode)
}
else
{
- TRACE("Resizing X display to %dx%d <default Hz>\n",
+ TRACE("Resizing X display to %dx%d <default Hz>\n",
dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);
stat = pXRRSetScreenConfig (gdi_display, sc, root, size, rot, CurrentTime);
}
@@ -288,9 +288,9 @@ void X11DRV_XRandR_Init(void)
real_xrandr_modes_count = nmodes;
TRACE("XRandR modes: count=%d\n", nmodes);
- dd_modes = X11DRV_Settings_SetHandlers("XRandR",
- X11DRV_XRandR_GetCurrentMode,
- X11DRV_XRandR_SetCurrentMode,
+ dd_modes = X11DRV_Settings_SetHandlers("XRandR",
+ X11DRV_XRandR_GetCurrentMode,
+ X11DRV_XRandR_SetCurrentMode,
nmodes, 1);
make_modes();
X11DRV_Settings_AddDepthModes();
diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 33ad4bd..94e78e0 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -730,7 +730,7 @@ static int LookupEntry(LFANDSIZE *plfsz)
static void FreeEntry(int entry)
{
int i, format;
-
+
for(format = 0; format < AA_MAXVALUE; format++) {
gsCacheEntryFormat * formatEntry;
@@ -804,7 +804,7 @@ static int AllocEntry(void)
}
TRACE("Growing cache\n");
-
+
if (glyphsetCache)
glyphsetCache = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
glyphsetCache,
@@ -1613,10 +1613,10 @@ static void SharpGlyphMono(struct xrender_physdev *physDev, INT x, INT y,
src = srcLine;
srcLine += stride;
w = width;
-
+
bitsMask = 0x80; /* FreeType is always MSB first */
bits = *src++;
-
+
xspan = x;
while (w)
{
@@ -1678,7 +1678,7 @@ static void SharpGlyphGray(struct xrender_physdev *physDev, INT x, INT y,
src = srcLine;
srcLine += stride;
w = width;
-
+
bits = *src++;
xspan = x;
while (w)
@@ -1788,7 +1788,7 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf
src_r = GetField(color, r_shift, r_len);
src_g = GetField(color, g_shift, g_len);
src_b = GetField(color, b_shift, b_len);
-
+
for(; height--; y++)
{
mask = maskLine;
diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index 1f13737..2961803 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -147,7 +147,7 @@ static LONG X11DRV_XF86VM_SetCurrentMode(int mode)
mode = mode % real_xf86vm_mode_count;
wine_tsx11_lock();
- TRACE("Resizing X display to %dx%d\n",
+ TRACE("Resizing X display to %dx%d\n",
real_xf86vm_modes[mode]->hdisplay, real_xf86vm_modes[mode]->vdisplay);
pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), real_xf86vm_modes[mode]);
#if 0 /* it is said that SetViewPort causes problems with some X servers */
@@ -234,9 +234,9 @@ void X11DRV_XF86VM_Init(void)
real_xf86vm_mode_count = nmodes;
- dd_modes = X11DRV_Settings_SetHandlers("XF86VidMode",
- X11DRV_XF86VM_GetCurrentMode,
- X11DRV_XF86VM_SetCurrentMode,
+ dd_modes = X11DRV_Settings_SetHandlers("XF86VidMode",
+ X11DRV_XF86VM_GetCurrentMode,
+ X11DRV_XF86VM_SetCurrentMode,
nmodes, 1);
/* convert modes to DDHALMODEINFO format */
--
1.7.3.4
More information about the wine-patches
mailing list