aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin')
-rw-r--r--xorg-server/hw/xwin/InitInput.c2
-rwxr-xr-xxorg-server/hw/xwin/InitOutput.c10
-rw-r--r--xorg-server/hw/xwin/win.h2
-rw-r--r--xorg-server/hw/xwin/winSetAppUserModelID.c2
-rw-r--r--xorg-server/hw/xwin/wincmap.c2
-rw-r--r--xorg-server/hw/xwin/winconfig.c10
-rw-r--r--xorg-server/hw/xwin/wincreatewnd.c4
-rw-r--r--xorg-server/hw/xwin/wincursor.c10
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/windialogs.c12
-rw-r--r--xorg-server/hw/xwin/winlayouts.h2
-rw-r--r--xorg-server/hw/xwin/winmsgwindow.c5
-rw-r--r--xorg-server/hw/xwin/winmultiwindowicons.c4
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winmultiwindowshape.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winmultiwindowwindow.c20
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwm.c2
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwndproc.c4
-rw-r--r--xorg-server/hw/xwin/winprefs.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winprefslex.l2
-rw-r--r--xorg-server/hw/xwin/winprefsyacc.y11
-rwxr-xr-xxorg-server/hw/xwin/winscrinit.c4
-rw-r--r--xorg-server/hw/xwin/winshaddd.c8
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winshadddnl.c6
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winshadgdi.c10
-rw-r--r--xorg-server/hw/xwin/winwin32rootlesswndproc.c2
-rw-r--r--xorg-server/hw/xwin/winwindowswm.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winwndproc.c8
26 files changed, 72 insertions, 76 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index a4344b82f..754610569 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -52,7 +52,7 @@ DeviceIntPtr g_pwinKeyboard;
/*
* All of our keys generate up and down transition notifications,
* so all of our keys can be used as modifiers.
- *
+ *
* An example of a modifier is mapping the A key to the Control key.
* A has to be a legal modifier. I think.
*/
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 9e9491df8..4e099d294 100755
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -635,9 +635,9 @@ OsVendorPreInit(int argc, char *argv[])
if (!g_fLogInited) {
/* keep this order. If LogInit fails it calls Abort which then calls
- * ddxGiveUp where LogInit is called again and creates an infinite
- * recursion. If we set g_fLogInited to TRUE before the init we
- * avoid the second call
+ * ddxGiveUp where LogInit is called again and creates an infinite
+ * recursion. If we set g_fLogInited to TRUE before the init we
+ * avoid the second call
*/
g_fLogInited = TRUE;
g_pszLogFile = LogInit(g_pszLogFile, NULL);
@@ -907,7 +907,7 @@ ddxUseMsg(void)
/* See Porting Layer Definition - p. 20 */
/*
* Do any global initialization, then initialize each screen.
- *
+ *
* NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv
*/
@@ -1027,7 +1027,7 @@ winCheckDisplayNumber(void)
int nDisp;
HANDLE mutex;
char name[MAX_PATH];
- char *pszPrefix = '\0';
+ const char *pszPrefix = '\0';
OSVERSIONINFO osvi = { 0 };
/* Check display range */
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 6563a6509..c4847670e 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -671,7 +671,7 @@ extern FARPROC g_fpDirectDrawCreateClipper;
winPrivWinPtr pWinPriv = winGetWindowPriv(pWin)
/*
- * wrapper macros
+ * wrapper macros
*/
#define _WIN_WRAP(priv, real, mem, func) {\
priv->mem = real->mem; \
diff --git a/xorg-server/hw/xwin/winSetAppUserModelID.c b/xorg-server/hw/xwin/winSetAppUserModelID.c
index 3c449a3a8..f2f135e55 100644
--- a/xorg-server/hw/xwin/winSetAppUserModelID.c
+++ b/xorg-server/hw/xwin/winSetAppUserModelID.c
@@ -91,7 +91,7 @@ winSetAppUserModelID(HWND hWnd, const char *AppID)
return;
}
- winDebug("winSetAppUserMOdelID - hwnd 0x%08x appid '%s'\n", hWnd, AppID);
+ winDebug("winSetAppUserMOdelID - hwnd 0x%p appid '%s'\n", hWnd, AppID);
hr = g_pSHGetPropertyStoreForWindow(hWnd, &IID_IPropertyStore,
(void **) &pps);
diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c
index 4275265be..32ab59460 100644
--- a/xorg-server/hw/xwin/wincmap.c
+++ b/xorg-server/hw/xwin/wincmap.c
@@ -256,7 +256,7 @@ winCreateColormap(ColormapPtr pmap)
* FIXME: This is some evil hackery to help in handling some X clients
* that expect the top pixel to be white. This "help" only lasts until
* some client overwrites the top colormap entry.
- *
+ *
* We don't want to actually allocate the top entry, as that causes
* problems with X clients that need 7 planes (128 colors) in the default
* colormap, such as Magic 7.1.
diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c
index 95b95bc73..2b5b0e827 100644
--- a/xorg-server/hw/xwin/winconfig.c
+++ b/xorg-server/hw/xwin/winconfig.c
@@ -238,7 +238,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
XkbGetRulesDflts(&g_winInfo.xkb);
/*
- * Query the windows autorepeat settings and change the xserver defaults.
+ * Query the windows autorepeat settings and change the xserver defaults.
*/
{
int kbd_delay;
@@ -276,7 +276,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
layoutNum = strtoul(layoutName, (char **) NULL, 16);
if ((layoutNum & 0xffff) == 0x411) {
/* The japanese layouts know a lot of different IMEs which all have
- different layout numbers set. Map them to a single entry.
+ different layout numbers set. Map them to a single entry.
Same might apply for chinese, korean and other symbol languages
too */
layoutNum = (layoutNum & 0xffff);
@@ -355,7 +355,7 @@ winConfigKeyboard(DeviceIntPtr pDevice)
kbdfrom = X_CMDLINE;
/*
- * Until the layout code is finished, I search for the keyboard
+ * Until the layout code is finished, I search for the keyboard
* device and configure the server with it.
*/
@@ -656,7 +656,7 @@ winSetPercentOption(void *optlist, const char *name, double deflt)
/*
* Compare two strings for equality. This is caseinsensitive and
- * The characters '_', ' ' (space) and '\t' (tab) are treated as
+ * The characters '_', ' ' (space) and '\t' (tab) are treated as
* not existing.
*/
@@ -699,7 +699,7 @@ winNameCompare(const char *s1, const char *s2)
#ifdef XWIN_XF86CONFIG
/*
- * Find the named option in the list.
+ * Find the named option in the list.
* @return the pointer to the option record, or NULL if not found.
*/
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index ffffd7127..60f0a61ff 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -164,8 +164,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
&& !pScreenInfo->fMultiWindow
#endif
) {
- /* Try to handle startup via run.exe. run.exe instructs Windows to
- * hide all created windows. Detect this case and make sure the
+ /* Try to handle startup via run.exe. run.exe instructs Windows to
+ * hide all created windows. Detect this case and make sure the
* window is shown nevertheless */
STARTUPINFO startupInfo;
diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c
index 55c304f04..c303d511d 100644
--- a/xorg-server/hw/xwin/wincursor.c
+++ b/xorg-server/hw/xwin/wincursor.c
@@ -105,7 +105,7 @@ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
MapWindowPoints(pScreenPriv->hwndScreen,
HWND_DESKTOP, (LPPOINT) &rcClient, 2);
- /*
+ /*
* Update the Windows cursor position so that we don't
* immediately warp back to the current position.
*/
@@ -168,7 +168,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
pCursor->bits->width, pCursor->bits->height,
pCursor->bits->xhot, pCursor->bits->yhot);
- /* We can use only White and Black, so calc brightness of color
+ /* We can use only White and Black, so calc brightness of color
* Also check if the cursor is inverted */
dForeY = BRIGHTNESS(pCursor->fore);
dBackY = BRIGHTNESS(pCursor->back);
@@ -183,8 +183,8 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
pCursor->bits->width, pCursor->bits->height);
}
- /* Get the number of bytes required to store the whole cursor image
- * This is roughly (sm_cx * sm_cy) / 8
+ /* Get the number of bytes required to store the whole cursor image
+ * This is roughly (sm_cx * sm_cy) / 8
* round up to 8 pixel boundary so we can convert whole bytes */
nBytes =
bits_to_bytes(pScreenPriv->cursor.sm_cx) * pScreenPriv->cursor.sm_cy;
@@ -198,7 +198,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
memset(pAnd, 0xFF, nBytes);
pXor = calloc(1, nBytes);
- /* Convert the X11 bitmap to a win32 bitmap
+ /* Convert the X11 bitmap to a win32 bitmap
* The first is for an empty mask */
if (pCursor->bits->emptyMask) {
int x, y, xmax = bits_to_bytes(nCX);
diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c
index 3d95f361c..b0e7a18c0 100644..100755
--- a/xorg-server/hw/xwin/windialogs.c
+++ b/xorg-server/hw/xwin/windialogs.c
@@ -397,8 +397,8 @@ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv)
}
/*
- * Display a notification to the user that the visual
- * will not be displayed until the Windows display depth
+ * Display a notification to the user that the visual
+ * will not be displayed until the Windows display depth
* is restored to the original value.
*/
g_hDlgDepthChange = CreateDialogParam(g_hInstance,
@@ -419,7 +419,7 @@ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv)
/*
* Process messages for the dialog that is displayed for
- * disruptive screen depth changes.
+ * disruptive screen depth changes.
*/
static INT_PTR CALLBACK
@@ -440,8 +440,8 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
s_pScreenPriv = (winPrivScreenPtr) lParam;
s_pScreenInfo = s_pScreenPriv->pScreenInfo;
- winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
- "s_pScreenInfo: %08x\n",
+ winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, "
+ "s_pScreenInfo: %p\n",
s_pScreenPriv, s_pScreenInfo);
winDebug("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
@@ -479,7 +479,7 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
case IDCANCEL:
winDebug("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n");
- /*
+ /*
* User dismissed the dialog, hide it until the
* display mode is restored.
*/
diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h
index 0aae18b00..b39ca4923 100644
--- a/xorg-server/hw/xwin/winlayouts.h
+++ b/xorg-server/hw/xwin/winlayouts.h
@@ -23,7 +23,7 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* Definitions for various keyboard layouts from windows and their
+/* Definitions for various keyboard layouts from windows and their
* XKB settings.
*/
diff --git a/xorg-server/hw/xwin/winmsgwindow.c b/xorg-server/hw/xwin/winmsgwindow.c
index e48a46af7..37fe950c4 100644
--- a/xorg-server/hw/xwin/winmsgwindow.c
+++ b/xorg-server/hw/xwin/winmsgwindow.c
@@ -95,7 +95,6 @@ static HWND
winCreateMsgWindow(void)
{
HWND hwndMsg;
- wATOM winClass;
// register window class
{
@@ -113,7 +112,7 @@ winCreateMsgWindow(void)
wcx.lpszMenuName = NULL;
wcx.lpszClassName = WINDOW_CLASS_X_MSG;
wcx.hIconSm = NULL;
- winClass = RegisterClassEx(&wcx);
+ RegisterClassEx(&wcx);
}
// Create the msg window.
@@ -135,7 +134,7 @@ winCreateMsgWindow(void)
return NULL;
}
- winDebug("winCreateMsgWindow - Created msg window hwnd 0x%x\n", hwndMsg);
+ winDebug("winCreateMsgWindow - Created msg window hwnd 0x%p\n", hwndMsg);
return hwndMsg;
}
diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c
index 5ffc24278..1910592fc 100644
--- a/xorg-server/hw/xwin/winmultiwindowicons.c
+++ b/xorg-server/hw/xwin/winmultiwindowicons.c
@@ -384,7 +384,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize)
static int generation;
uint32_t *icon, *icon_data = NULL;
unsigned long int size;
- unsigned long int type;
+ Atom type;
int format;
unsigned long int left;
@@ -467,7 +467,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize)
xImageIcon =
XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height,
0xFFFFFFFF, ZPixmap);
- winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id,
+ winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%p\n", id,
xImageIcon);
if (hints->icon_mask)
diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c
index 0a00e79ee..15c5ebe9d 100644..100755
--- a/xorg-server/hw/xwin/winmultiwindowshape.c
+++ b/xorg-server/hw/xwin/winmultiwindowshape.c
@@ -46,7 +46,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
winScreenPriv(pScreen);
- winDebug ("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
+ winDebug ("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
WIN_UNWRAP(SetShape);
(*pScreen->SetShape) (pWin, kind);
diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c
index 2439ddb67..850edc149 100644..100755
--- a/xorg-server/hw/xwin/winmultiwindowwindow.c
+++ b/xorg-server/hw/xwin/winmultiwindowwindow.c
@@ -288,7 +288,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
winScreenPriv(pScreen);
- winDebug ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
+ winDebug ("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
WIN_UNWRAP(ChangeWindowAttributes);
fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
@@ -316,7 +316,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- winDebug ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
+ winDebug ("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
#endif
WIN_UNWRAP(UnrealizeWindow);
@@ -347,7 +347,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
winScreenPriv(pScreen);
#if CYGMULTIWINDOW_DEBUG
- winDebug ("winMapWindowMultiWindow - pWin: %08x\n", pWin);
+ winDebug ("winMapWindowMultiWindow - pWin: %p\n", pWin);
#endif
WIN_UNWRAP(RealizeWindow);
@@ -379,7 +379,7 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
winScreenPriv(pScreen);
winDebug
- ("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
+ ("winReparentMultiWindow - pWin:%p XID:0x%x, reparent from pWin:%p XID:0x%x to pWin:%p XID:0x%x\n",
pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id,
pWin->parent, pWin->parent->drawable.id);
@@ -403,7 +403,7 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
winScreenPriv(pScreen);
- winDebug ("winRestackMultiWindow - %08x\n", pWin);
+ winDebug ("winRestackMultiWindow - %p\n", pWin);
WIN_UNWRAP(RestackWindow);
if (pScreen->RestackWindow)
@@ -440,7 +440,7 @@ winCreateWindowsWindow(WindowPtr pWin)
winInitMultiWindowClass();
- winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin,
+ winDebug("winCreateWindowsTopLevelWindow - pWin:%p XID:0x%x \n", pWin,
pWin->drawable.id);
iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
@@ -591,7 +591,7 @@ winDestroyWindowsWindow(WindowPtr pWin)
HICON hIcon;
HICON hIconSm;
- winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin,
+ winDebug("winDestroyWindowsWindow - pWin:%p XID:0x%x \n", pWin,
pWin->drawable.id);
/* Bail out if the Windows window handle is invalid */
@@ -704,7 +704,7 @@ winUpdateWindowsWindow(WindowPtr pWin)
}
/*
- * winGetWindowID -
+ * winGetWindowID -
*/
XID
@@ -724,7 +724,7 @@ winGetWindowID(WindowPtr pWin)
}
/*
- * winFindWindow -
+ * winFindWindow -
*/
static void
@@ -738,7 +738,7 @@ winFindWindow(void *value, XID id, void *cdata)
}
/*
- * winReorderWindowsMultiWindow -
+ * winReorderWindowsMultiWindow -
*/
void
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index d35f048e3..869eeadf4 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -308,7 +308,7 @@ PopMessage(WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo)
#if 0
/*
- * HaveMessage -
+ * HaveMessage -
*/
static Bool
diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 624c96fca..ef40fca6d 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -152,7 +152,7 @@ ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp)
*
* minAspectX * dheight > minAspectY * dwidth
* maxAspectX * dheight < maxAspectY * dwidth
- *
+ *
*/
if (hints.flags & PAspect) {
@@ -283,7 +283,7 @@ winRaiseWindow(WindowPtr pWin)
BOOL oldstate = winInRaiseWindow;
XID vlist[1] = { 0 };
winInRaiseWindow = TRUE;
- /* Call configure window directly to make sure it gets processed
+ /* Call configure window directly to make sure it gets processed
* in time
*/
ConfigureWindow(pWin, CWStackMode, vlist, serverClient);
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index 533230ed0..79f9e73f5 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -627,7 +627,7 @@ winIconIsOverride(HICON hicon)
* If @path is NULL, use the built-in default.
*/
static int
-winPrefsLoadPreferences(char *path)
+winPrefsLoadPreferences(const char *path)
{
FILE *prefFile = NULL;
diff --git a/xorg-server/hw/xwin/winprefslex.l b/xorg-server/hw/xwin/winprefslex.l
index 5a6c96924..0caeb6738 100644..100755
--- a/xorg-server/hw/xwin/winprefslex.l
+++ b/xorg-server/hw/xwin/winprefslex.l
@@ -37,8 +37,6 @@
#include <string.h>
#include "winprefsyacc.h"
-extern int yyparse(void);
-
/* Copy the parsed string, must be free()d in yacc parser */
static char *makestr(char *str)
{
diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y
index 8dae912d5..6cbb9cc2e 100644
--- a/xorg-server/hw/xwin/winprefsyacc.y
+++ b/xorg-server/hw/xwin/winprefsyacc.y
@@ -65,7 +65,7 @@ static void SetDefaultSysMenu (char *menu, int pos);
static void SetTrayIcon (char *fname);
static void OpenMenu(char *menuname);
-static void AddMenuLine(char *name, MENUCOMMANDTYPE cmd, char *param);
+static void AddMenuLine(const char *name, MENUCOMMANDTYPE cmd, const char *param);
static void CloseMenu(void);
static void OpenIcons(void);
@@ -86,9 +86,10 @@ static void OpenSysMenu(void);
static void AddSysMenuLine(char *matchstr, char *menuname, int pos);
static void CloseSysMenu(void);
-static int yyerror (char *s);
+static int yyerror (const char *s);
extern char *yytext;
+extern int yylineno;
extern int yylex(void);
#define YYMALLOC malloc
@@ -281,10 +282,8 @@ debug: DEBUGOUTPUT STRING NEWLINE { winDebug("LoadPreferences: %s\n", $2); free
* Errors in parsing abort and print log messages
*/
static int
-yyerror (char *s)
+yyerror (const char *s)
{
- extern int yylineno; /* Handled by flex internally */
-
ErrorF("LoadPreferences: %s line %d\n", s, yylineno);
return 1;
}
@@ -337,7 +336,7 @@ OpenMenu (char *menuname)
}
static void
-AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param)
+AddMenuLine (const char *text, MENUCOMMANDTYPE cmd, const char *param)
{
if (menu.menuItem==NULL)
menu.menuItem = malloc(sizeof(MENUITEM));
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 952e7eb8b..9f106f77c 100755
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -183,7 +183,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv)
/* Are we using multiple monitors? */
if (pScreenInfo->fMultipleMonitors) {
- /*
+ /*
* In this case, some of the defaults set in
* winInitializeScreenDefaults() are not correct ...
*/
@@ -342,7 +342,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
pVisual->vid != pScreen->rootVisual; pVisual++);
pScreenPriv->pRootVisual = pVisual;
- /*
+ /*
* Setup points to the block and wakeup handlers. Pass a pointer
* to the current screen as pWakeupdata.
*/
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c
index 0d1cb24fe..688cc58d2 100644
--- a/xorg-server/hw/xwin/winshaddd.c
+++ b/xorg-server/hw/xwin/winshaddd.c
@@ -170,7 +170,7 @@ winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen)
/*
* Create a DirectDraw surface for the shadow framebuffer; also create
* a primary surface object so we can blit to the display.
- *
+ *
* Install a DirectDraw clipper on our primary surface object
* that clips our blits to the unobscured client area of our display window.
*/
@@ -499,7 +499,7 @@ winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf)
/*
* Handle small regions with multiple blits,
- * handle large regions by creating a clipping region and
+ * handle large regions by creating a clipping region and
* doing a single blit constrained to that clipping region.
*/
if (pScreenInfo->dwClipUpdatesNBoxes == 0
@@ -601,7 +601,7 @@ winInitScreenShadowDD(ScreenPtr pScreen)
/*
* Call the wrapped CloseScreen function.
- *
+ *
* Free our resources and private structures.
*/
@@ -663,7 +663,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen)
/*
* Tell mi what sort of visuals we need.
- *
+ *
* Generally we only need one visual, as our screen can only
* handle one format at a time, I believe. You may want
* to verify that last sentence.
diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c
index b7187b136..4170953f8 100644..100755
--- a/xorg-server/hw/xwin/winshadddnl.c
+++ b/xorg-server/hw/xwin/winshadddnl.c
@@ -271,7 +271,7 @@ winReleasePrimarySurfaceShadowDDNL (ScreenPtr pScreen)
/*
* Create a DirectDraw surface for the shadow framebuffer; also create
* a primary surface object so we can blit to the display.
- *
+ *
* Install a DirectDraw clipper on our primary surface object
* that clips our blits to the unobscured client area of our display window.
*/
@@ -316,7 +316,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen)
}
/*
- * Initialize the framebuffer memory so we don't get a
+ * Initialize the framebuffer memory so we don't get a
* strange display at startup
*/
ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight);
@@ -613,7 +613,7 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf)
/*
* Handle small regions with multiple blits,
- * handle large regions by creating a clipping region and
+ * handle large regions by creating a clipping region and
* doing a single blit constrained to that clipping region.
*/
if (pScreenInfo->dwClipUpdatesNBoxes == 0
diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c
index f04d2562b..cda47593b 100644..100755
--- a/xorg-server/hw/xwin/winshadgdi.c
+++ b/xorg-server/hw/xwin/winshadgdi.c
@@ -155,7 +155,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen)
/* Color masks for 8 bpp are standardized */
if (GetDeviceCaps(pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE) {
- /*
+ /*
* RGB BPP for 8 bit palletes is always 8
* and the color masks are always 0.
*/
@@ -370,7 +370,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen)
}
else {
winW32Error ("winAllocateFBShadowGDI - Shadow blit failure\n");
- /* ago: ignore this error. The blit fails with wine, but does not
+ /* ago: ignore this error. The blit fails with wine, but does not
* cause any problems later. */
fReturn = TRUE;
@@ -461,7 +461,7 @@ winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf)
/*
* Handle small regions with multiple blits,
- * handle large regions by creating a clipping region and
+ * handle large regions by creating a clipping region and
* doing a single blit constrained to that clipping region.
*/
if (!pScreenInfo->fMultiWindow &&
@@ -619,7 +619,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
/*
* Tell mi what sort of visuals we need.
- *
+ *
* Generally we only need one visual, as our screen can only
* handle one format at a time, I believe. You may want
* to verify that last sentence.
@@ -798,7 +798,7 @@ winActivateAppShadowGDI(ScreenPtr pScreen)
*/
if (pScreenPriv->fActive && pScreenInfo->fFullScreen) {
/*
- * Activating, attempt to bring our window
+ * Activating, attempt to bring our window
* to the top of the display
*/
ShowWindow(pScreenPriv->hwndScreen, SW_RESTORE);
diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
index 0c5856d6e..e008c2440 100644
--- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c
+++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c
@@ -147,7 +147,7 @@ ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp)
*
* minAspectX * dheight > minAspectY * dwidth
* maxAspectX * dheight < maxAspectY * dwidth
- *
+ *
*/
if (hints.flags & PAspect) {
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 26dfa7e6f..b4046bcbc 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -278,7 +278,7 @@ ProcWindowsWMReenableUpdate(ClientPtr client)
{
REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq);
- //winEnableUpdate();
+ //winEnableUpdate();
return Success;
}
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index 37d5ef6eb..9a150d57b 100644..100755
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -409,7 +409,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
SetScrollInfo(hwnd, SB_VERT, &si, TRUE);
/*
- * NOTE: Scrollbars may have moved if they were at the
+ * NOTE: Scrollbars may have moved if they were at the
* far right/bottom, so we query their current position.
*/
@@ -624,7 +624,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
int iCaptionHeight;
int iBorderHeight, iBorderWidth;
- winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
+ winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n",
s_pScreenInfo);
/* Can't do anything without screen info */
@@ -1036,12 +1036,12 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (winIsFakeCtrl_L(message, wParam, lParam))
return 0;
- /*
+ /*
* Discard presses generated from Windows auto-repeat
*/
if (lParam & (1 << 30)) {
switch (wParam) {
- /* ago: Pressing LControl while RControl is pressed is
+ /* ago: Pressing LControl while RControl is pressed is
* Indicated as repeat. Fix this!
*/
case VK_CONTROL: