diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
| commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
| tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/hw/xwin/winshaddd.c | |
| parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
| parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
| download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xwin/winshaddd.c')
| -rw-r--r-- | xorg-server/hw/xwin/winshaddd.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c index 8d4cfdc63..da2e8ebee 100644 --- a/xorg-server/hw/xwin/winshaddd.c +++ b/xorg-server/hw/xwin/winshaddd.c @@ -38,12 +38,6 @@ /*
- * External symbols
- */
-
-extern HWND g_hDlgExit;
-extern const char *g_pszLogFile;
-
/*
@@ -794,7 +788,6 @@ winInitVisualsShadowDD (ScreenPtr pScreen) case 24:
case 16:
case 15:
-#if defined(XFree86Server)
/* Create the real visual */
if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
TrueColorMask,
@@ -827,42 +820,9 @@ winInitVisualsShadowDD (ScreenPtr pScreen) return FALSE;
}
#endif
-#else /* XFree86Server */
- /* Create the real visual */
- if (!fbSetVisualTypesAndMasks (pScreenInfo->dwDepth,
- TrueColorMask,
- pScreenPriv->dwBitsPerRGB,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask))
- {
- ErrorF ("winInitVisualsShadowDD - fbSetVisualTypesAndMasks "
- "failed for TrueColor\n");
- return FALSE;
- }
-
-#ifdef XWIN_EMULATEPSEUDO
- if (!pScreenInfo->fEmulatePseudo)
- break;
-
- /* Setup a pseudocolor visual */
- if (!fbSetVisualTypesAndMasks (8,
- PseudoColorMask,
- 8,
- 0,
- 0,
- 0))
- {
- ErrorF ("winInitVisualsShadowDD - fbSetVisualTypesAndMasks "
- "failed for PseudoColor\n");
- return FALSE;
- }
-#endif
-#endif /* XFree86Server */
break;
case 8:
-#if defined(XFree86Server)
if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
pScreenInfo->fFullScreen
? PseudoColorMask : StaticColorMask,
@@ -877,20 +837,6 @@ winInitVisualsShadowDD (ScreenPtr pScreen) "failed\n");
return FALSE;
}
-#else /* XFree86Server */
- if (!fbSetVisualTypesAndMasks (pScreenInfo->dwDepth,
- pScreenInfo->fFullScreen
- ? PseudoColorMask : StaticColorMask,
- pScreenPriv->dwBitsPerRGB,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask))
- {
- ErrorF ("winInitVisualsShadowDD - fbSetVisualTypesAndMasks "
- "failed\n");
- return FALSE;
- }
-#endif /* XFree86Server */
break;
default:
|