Commit 9826b838 authored by Alexander Gottwald's avatar Alexander Gottwald

Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added

    mingw (Win32) port
parent cecb6681
2004-11-15 Alexander Gottwald <ago at freedesktop dot org>
* indirect.c:
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802
Added mingw (Win32) port
2004-08-13 Alexander Gottwald <ago@freedesktop.org>
* Imakefile: Added $(MESASRCDIR)/src/mesa/glapi to INCLUDES.
......
......@@ -44,8 +44,9 @@
#include "glwindows.h"
#include <glcontextmodes.h>
#include <stdint.h>
#include "../../hw/xwin/winpriv.h"
#include <winpriv.h>
#define GLWIN_DEBUG_HWND(hwnd) \
if (glWinDebugSettings.dumpHWND) { \
......
2004-11-15 Alexander Gottwald <ago at freedesktop dot org>
* Imakefile:
* InitInput.c: (InitInput):
* InitOutput.c: (winClipboardShutdown), (ddxGiveUp),
(winCheckMount), (winGetBaseDir), (winFixupPaths), (OsVendorInit),
(winCheckDisplayNumber):
* win.h:
* winblock.c: (winBlockHandler):
* winclipboard.h:
* winclipboardthread.c: (winClipboardProc):
* winclipboardwndproc.c: (winClipboardWindowProc):
* winconfig.c: (winConfigKeyboard), (winConfigFiles):
* wincreatewnd.c: (winCreateBoundingWindowWindowed):
* windialogs.c: (winDisplayExitDialog), (winExitDlgProc),
(winAboutDlgProc):
* winengine.c: (winSetEngine):
* winerror.c: (OsVendorVErrorF), (winMessageBoxF), (scprintf):
* winglobals.c: (winInitializeGlobals):
* winkeybd.c: (winKeybdReleaseKeys):
* winmultiwindowicons.c:
* winmultiwindowwindow.c: (winCreateWindowsWindow):
* winmultiwindowwm.c:
* winprefs.c: (ReloadPrefs), (HandleCustomWM_COMMAND):
* winprocarg.c: (ddxProcessArgument):
* winscrinit.c: (winFinishScreenInitFB):
* winshadddnl.c:
* wintrayicon.c: (winHandleIconMessage):
* winwakeup.c: (winWakeupHandler):
* winwin32rootless.c: (winMWExtWMCreateFrame):
* winwindow.c: (winReshapeRootless):
* winwindow.h:
* winwndproc.c: (winWindowProc):
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802
Added mingw (Win32) port
2004-11-06 Alexander Gottwald <ago at freedesktop dot org>
* winwndproc.c, wintrayicon.c, winscrinit.c:
......
......@@ -57,7 +57,9 @@ CARD32 g_c32LastInputEventTime = 0;
* References to external symbols
*/
#ifdef HAS_DEVWINDOWS
extern int g_fdMessageQueue;
#endif
extern Bool g_fXdmcpEnabled;
#ifdef XWIN_CLIPBOARD
extern winDispatchProcPtr winProcEstablishConnectionOrig;
......@@ -150,6 +152,7 @@ InitInput (int argc, char *argv[])
/* Initialize the mode key states */
winInitializeModeKeyStates ();
#ifdef HAS_DEVWINDOWS
/* Only open the windows message queue device once */
if (g_fdMessageQueue == WIN_FD_INVALID)
{
......@@ -165,6 +168,7 @@ InitInput (int argc, char *argv[])
/* Add the message queue as a device to wait for in WaitForSomething */
AddEnabledDevice (g_fdMessageQueue);
}
#endif
#if CYGDEBUG
winDebug ("InitInput - returning\n");
......
This diff is collapsed.
......@@ -139,8 +139,22 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#ifndef HAS_SCPRINTF
extern int scprintf(const char *format, ...);
#else
#ifdef WIN32
#define scprintf _scprintf
#endif
#endif
#ifndef __CYGWIN__
#define sleep(x) Sleep(1000 * (x))
#endif
#include <errno.h>
#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
#include <pthread.h>
#endif
#ifdef HAS_MMAP
#include <sys/mman.h>
......@@ -220,11 +234,10 @@ if (fDebugProcMsg) \
char *pszTemp; \
int iLength; \
\
iLength = sprintf (NULL, str, ##__VA_ARGS__); \
\
iLength = scprintf (str, ##__VA_ARGS__); \
pszTemp = malloc (iLength + 1); \
\
sprintf (pszTemp, str, ##__VA_ARGS__); \
snprintf (pszTemp, iLength + 1, str, ##__VA_ARGS__); \
pszTemp[iLength] = 0; \
\
MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \
\
......@@ -626,7 +639,9 @@ typedef struct {
extern winScreenInfo g_ScreenInfo[];
extern miPointerScreenFuncRec g_winPointerCursorFuncs;
extern DWORD g_dwEvents;
#ifdef HAS_DEVWINDOWS
extern int g_fdMessageQueue;
#endif
extern int g_iScreenPrivateIndex;
extern int g_iCmapPrivateIndex;
extern int g_iGCPrivateIndex;
......
......@@ -48,8 +48,15 @@ winBlockHandler (int nScreen,
pointer pTimeout,
pointer pReadMask)
{
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
winScreenPriv((ScreenPtr)pBlockData);
#endif
MSG msg;
#ifndef HAS_DEVWINDOWS
struct timeval **tvp = pTimeout;
(*tvp)->tv_sec = 0;
(*tvp)->tv_usec = 100;
#endif
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
/* Signal threaded modules to begin */
......
......@@ -35,7 +35,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#ifdef __CYGWIN__
#include <sys/select.h>
#else
#include "Xwinsock.h"
#define HAS_WINSOCK
#endif
#include <fcntl.h>
#include <setjmp.h>
#include <pthread.h>
......@@ -54,6 +59,10 @@
/* Fixups to prevent collisions between Windows and X headers */
#define ATOM DWORD
#ifndef __CYGWIN__
#define sleep(x) Sleep (1000 * (x))
#endif
/* Windows headers */
#ifndef XFree86Server
#define XFree86Server
......@@ -65,7 +74,9 @@
/* Clipboard module constants */
#define WIN_CLIPBOARD_WINDOW_CLASS "xwinclip"
#define WIN_CLIPBOARD_WINDOW_TITLE "xwinclip"
#define WIN_MSG_QUEUE_FNAME "/dev/windows"
#ifdef HAS_DEVWINDOWS
# define WIN_MSG_QUEUE_FNAME "/dev/windows"
#endif
#define WIN_CONNECT_RETRIES 40
#define WIN_CONNECT_DELAY 4
#define WIN_JMP_OKAY 0
......
......@@ -29,6 +29,9 @@
*/
#include "winclipboard.h"
#ifdef __CYGWIN__
#include <errno.h>
#endif
#include "X11/Xauth.h"
......@@ -86,7 +89,11 @@ winClipboardProc (void *pvNotUsed)
int iReturn;
HWND hwnd = NULL;
int iConnectionNumber = 0;
#ifdef HAS_DEVWINDOWS
int fdMessageQueue = 0;
#else
struct timeval tvTimeout;
#endif
fd_set fdsRead;
int iMaxDescriptor;
Display *pDisplay = NULL;
......@@ -94,6 +101,7 @@ winClipboardProc (void *pvNotUsed)
int iRetries;
Bool fUseUnicode;
char szDisplay[512];
int iSelectError;
ErrorF ("winClipboardProc - Hello\n");
......@@ -204,6 +212,7 @@ winClipboardProc (void *pvNotUsed)
/* Get our connection number */
iConnectionNumber = ConnectionNumber (pDisplay);
#ifdef HAS_DEVWINDOWS
/* Open a file descriptor for the windows message queue */
fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);
if (fdMessageQueue == -1)
......@@ -214,6 +223,9 @@ winClipboardProc (void *pvNotUsed)
/* Find max of our file descriptors */
iMaxDescriptor = max (fdMessageQueue, iConnectionNumber) + 1;
#else
iMaxDescriptor = iConnectionNumber + 1;
#endif
/* Select event types to watch */
if (XSelectInput (pDisplay,
......@@ -242,10 +254,6 @@ winClipboardProc (void *pvNotUsed)
pthread_exit (NULL);
}
#if 0
ErrorF ("winClipboardProc - iWindow: %d\n", iWindow);
#endif
/* Save the window in the screen privates */
g_iClipboardWindow = iWindow;
......@@ -255,17 +263,6 @@ winClipboardProc (void *pvNotUsed)
/* Save copy of HWND in screen privates */
g_hwndClipboard = hwnd;
#if 0
/* Assert ownership of CLIPBOARD_MANAGER */
iReturn = XSetSelectionOwner (pDisplay, atomClipboardManager,
iWindow, CurrentTime);
if (iReturn == BadAtom || iReturn == BadWindow)
{
ErrorF ("winClipboardProc - Could not set CLIPBOARD_MANAGER owner\n");
pthread_exit (NULL);
}
#endif
/* Assert ownership of selections if Win32 clipboard is owned */
if (NULL != GetClipboardOwner ())
{
......@@ -316,17 +313,41 @@ winClipboardProc (void *pvNotUsed)
* which descriptors are ready.
*/
FD_ZERO (&fdsRead);
FD_SET (fdMessageQueue, &fdsRead);
FD_SET (iConnectionNumber, &fdsRead);
#ifdef HAS_DEVWINDOWS
FD_SET (fdMessageQueue, &fdsRead);
#else
tvTimeout.tv_sec = 0;
tvTimeout.tv_usec = 100;
#endif
/* Wait for a Windows event or an X event */
iReturn = select (iMaxDescriptor, /* Highest fds number */
&fdsRead, /* Read mask */
NULL, /* No write mask */
NULL, /* No exception mask */
NULL); /* No timeout */
if (iReturn <= 0)
#ifdef HAS_DEVWINDOWS
NULL /* No timeout */
#else
&tvTimeout /* Set timeout */
#endif
);
#ifndef HAS_WINSOCK
iSelectError = errno;
#else
iSelectError = WSAGetLastError();
#endif
if (iReturn < 0)
{
#ifndef HAS_WINSOCK
if (iSelectError == EINTR)
#else
if (iSelectError == WSAEINTR)
#endif
continue;
ErrorF ("winClipboardProc - Call to select () failed: %d. "
"Bailing.\n", iReturn);
break;
......@@ -335,11 +356,6 @@ winClipboardProc (void *pvNotUsed)
/* Branch on which descriptor became active */
if (FD_ISSET (iConnectionNumber, &fdsRead))
{
/* X event ready */
#if 0
ErrorF ("winClipboardProc - X event ready\n");
#endif
/* Process X events */
/* Exit when we see that server is shutting down */
iReturn = winClipboardFlushXEvents (hwnd,
......@@ -354,14 +370,13 @@ winClipboardProc (void *pvNotUsed)
}
}
#ifdef HAS_DEVWINDOWS
/* Check for Windows event ready */
if (FD_ISSET (fdMessageQueue, &fdsRead))
{
/* Windows event ready */
#if 0
ErrorF ("winClipboardProc - Windows event ready\n");
#else
if (1)
#endif
{
/* Process Windows messages */
if (!winClipboardFlushWindowsMessageQueue (hwnd))
{
......@@ -383,9 +398,12 @@ winClipboardProc (void *pvNotUsed)
ErrorF ("winClipboardProc - XDestroyWindow succeeded.\n");
}
#ifdef HAS_DEVWINDOWS
/* Close our Win32 message handle */
if (fdMessageQueue)
close (fdMessageQueue);
#endif
#if 0
/*
......
......@@ -334,6 +334,8 @@ winClipboardWindowProc (HWND hwnd, UINT message,
* previous XSetSelectionOwner messages.
*/
XSync (pDisplay, FALSE);
winDebug("winClipboardWindowProc - XSync done.\n");
/* Release PRIMARY selection if owned */
iReturn = XGetSelectionOwner (pDisplay, XA_PRIMARY);
......
......@@ -374,7 +374,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
char lname[256];
DWORD namesize = sizeof(lname);
regpath = alloca(sizeof(regtempl) + KL_NAMELENGTH + 1);
regpath = malloc(sizeof(regtempl) + KL_NAMELENGTH + 1);
strcpy(regpath, regtempl);
strcat(regpath, layoutName);
......@@ -388,6 +388,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
/* Close registry key */
if (regkey)
RegCloseKey (regkey);
free(regpath);
}
}
......@@ -737,117 +738,19 @@ winConfigFiles ()
MessageType from;
/* Fontpath */
from = X_DEFAULT;
if (g_cmdline.fontPath)
{
from = X_CMDLINE;
defaultFontPath = g_cmdline.fontPath;
winMsg (X_CMDLINE, "FontPath set to \"%s\"\n", defaultFontPath);
}
else
{
/* Open fontpath configuration file */
FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
if (fontdirs != NULL)
{
char buffer[256];
int needs_sep = TRUE;
int comment_block = FALSE;
/* get defautl fontpath */
char *fontpath = xstrdup(defaultFontPath);
size_t size = strlen(fontpath);
/* read all lines */
while (!feof(fontdirs))
{
size_t blen;
char *hashchar;
char *str;
int has_eol = FALSE;
/* read one line */
str = fgets(buffer, sizeof(buffer), fontdirs);
if (str == NULL) /* stop on error or eof */
break;
if (strchr(str, '\n') != NULL)
has_eol = TRUE;
/* check if block is continued comment */
if (comment_block)
{
/* ignore all input */
*str = 0;
blen = 0;
if (has_eol) /* check if line ended in this block */
comment_block = FALSE;
}
else
{
/* find comment character. ignore all trailing input */
hashchar = strchr(str, '#');
if (hashchar != NULL)
{
*hashchar = 0;
if (!has_eol) /* mark next block as continued comment */
comment_block = TRUE;
}
}
/* strip whitespaces from beginning */
while (*str == ' ' || *str == '\t')
str++;
/* get size, strip whitespaces from end */
blen = strlen(str);
while (blen > 0 && (str[blen-1] == ' ' ||
str[blen-1] == '\t' || str[blen-1] == '\n'))
{
str[--blen] = 0;
}
/* still something left to add? */
if (blen > 0)
{
size_t newsize = size + blen;
/* reserve one character more for ',' */
if (needs_sep)
newsize++;
/* allocate memory */
if (fontpath == NULL)
fontpath = malloc(newsize+1);
else
fontpath = realloc(fontpath, newsize+1);
/* add separator */
if (needs_sep)
{
fontpath[size] = ',';
size++;
needs_sep = FALSE;
}
/* mark next line as new entry */
if (has_eol)
needs_sep = TRUE;
/* add block */
strncpy(fontpath + size, str, blen);
fontpath[newsize] = 0;
size = newsize;
}
}
/* cleanup */
fclose(fontdirs);
from = X_CONFIG;
defaultFontPath = xstrdup(fontpath);
free(fontpath);
}
/* RGBPath */
if (g_cmdline.rgbPath)
{
from = X_CMDLINE;
rgbPath = g_cmdline.rgbPath;
winMsg (X_CMDLINE, "RgbPath set to \"%s\"\n", rgbPath);
}
winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath);
return TRUE;
}
......
......@@ -419,7 +419,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
#endif
)
{
#if defined(XWIN_MULTIWINDOW) || defined(XWIN_MULTIWINDOWEXTWM)
pScreenPriv->fRootWindowShown = FALSE;
#endif
ShowWindow (*phwnd, SW_HIDE);
}
else
......
......@@ -30,7 +30,9 @@
*/
#include "win.h"
#ifdef __CYGWIN__
#include <sys/cygwin.h>
#endif
#include <shellapi.h>
#include "winprefs.h"
......@@ -44,7 +46,9 @@ extern HWND g_hDlgDepthChange;
extern HWND g_hDlgExit;
extern HWND g_hDlgAbout;
extern WINPREFS pref;
#ifdef XWIN_CLIPBOARD
extern Bool g_fClipboardStarted;
#endif
extern Bool g_fSoftwareCursor;
......@@ -217,11 +221,15 @@ winDisplayExitDialog (winPrivScreenPtr pScreenPriv)
for (i = 1; i < currentMaxClients; i++)
if (clients[i] != NullClient)
liveClients++;
#if defined(XWIN_MULTIWINDOW)
/* Count down server internal clients */
if (pScreenPriv->pScreenInfo->fMultiWindow)
liveClients -= 2; /* multiwindow window manager & XMsgProc */
#endif
#if defined(XWIN_CLIPBOARD)
if (g_fClipboardStarted)
liveClients--; /* clipboard manager */
#endif
/* A user reported that this sometimes drops below zero. just eye-candy. */
if (liveClients < 0)
......@@ -314,7 +322,7 @@ winExitDlgProc (HWND hDialog, UINT message,
MAKEINTRESOURCE(IDI_XWIN)));
/* Format the connected clients string */
iReturn = sprintf (NULL, CONNECTED_CLIENTS_FORMAT,
iReturn = scprintf (CONNECTED_CLIENTS_FORMAT,
s_pScreenPriv->iConnectedClients);
if (iReturn <= 0)
return TRUE;
......@@ -323,6 +331,7 @@ winExitDlgProc (HWND hDialog, UINT message,
return TRUE;
snprintf (pszConnectedClients, iReturn + 1, CONNECTED_CLIENTS_FORMAT,
s_pScreenPriv->iConnectedClients);
pszConnectedClients[iReturn] = 0;
/* Set the number of connected clients */
SetWindowText (GetDlgItem (hDialog, IDC_CLIENTS_CONNECTED),
......@@ -669,13 +678,18 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
case ID_ABOUT_CHANGELOG:
{
int iReturn;
#ifdef __CYGWIN__
const char * pszCygPath = "/usr/X11R6/share/doc/"
"xorg-x11-xwin/changelog.html";
char pszWinPath[MAX_PATH + 1];
int iReturn;
/* Convert the POSIX path to a Win32 path */
cygwin_conv_to_win32_path (pszCygPath, pszWinPath);
#else
const char * pszWinPath = "http://x.cygwin.com/"
"devel/server/changelog.html";
#endif
iReturn = (int) ShellExecute (NULL,
"open",
......
......@@ -204,6 +204,19 @@ winSetEngine (ScreenPtr pScreen)
winSetEngineFunctionsShadowGDI (pScreen);
return TRUE;
}
#ifdef WIN_PSEUDOCOLOR8BITPLANE
/* Edited by Sebastian Haby
ShadowGDI is the only engine that supports PseudoColor "emulation" */
if (pScreenInfo->fEmulatePseudo)
{
winErrorFVerb (2, "winSetEngine - EMULATEPSEUDO => ShadowGDI\n");
pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
/* Set engine function pointers */
winSetEngineFunctionsShadowGDI (pScreen);
return TRUE;
}
#endif
/* If the user's choice is supported, we'll use that */
if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred)
......
......@@ -43,16 +43,22 @@ OsVendorVErrorF (const char *pszFormat, va_list va_args);
void
OsVendorVErrorF (const char *pszFormat, va_list va_args)
{
#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
/* make sure the clipboard and multiwindow threads do not interfere the
* main thread */
static pthread_mutex_t s_pmPrinting = PTHREAD_MUTEX_INITIALIZER;
/* Lock the printing mutex */
pthread_mutex_lock (&s_pmPrinting);
#endif
/* Print the error message to a log file, could be stderr */
LogVWrite (0, pszFormat, va_args);
#if defined(XWIN_CLIPBOARD) || defined (XWIN_MULTIWINDOW)
/* Unlock the printing mutex */
pthread_mutex_unlock (&s_pmPrinting);
#endif
}
#endif
......@@ -94,17 +100,18 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
/* Get length of formatted error string */
va_start (args, uType);
i = sprintf (NULL, pszError, args);
i = scprintf (pszError, args);
va_end (args);
/* Allocate memory for formatted error string */
pszErrorF = malloc (i);
pszErrorF = malloc (i + 1);
if (!pszErrorF)
goto winMessageBoxF_Cleanup;
/* Create the formatted error string */
va_start (args, uType);
sprintf (pszErrorF, pszError, args);
snprintf (pszErrorF, i + 1, pszError, args);
pszErrorF[i] = 0;
va_end (args);
#define MESSAGEBOXF \
......@@ -116,21 +123,22 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
"%s\n"
/* Get length of message box string */
i = sprintf (NULL, MESSAGEBOXF,
i = scprintf (MESSAGEBOXF,
pszErrorF,
VENDOR_STRING, VERSION_STRING, VENDOR_CONTACT,
g_pszCommandLine);
/* Allocate memory for message box string */
pszMsgBox = malloc (i);
pszMsgBox = malloc (i + 1);
if (!pszMsgBox)
goto winMessageBoxF_Cleanup;
/* Format the message box string */
sprintf (pszMsgBox, MESSAGEBOXF,
snprintf (pszMsgBox, i + 1, MESSAGEBOXF,
pszErrorF,
VENDOR_STRING, VERSION_STRING, VENDOR_CONTACT,
g_pszCommandLine);
pszMsgBox[i] = 0;
/* Display the message box string */
MessageBox (NULL,
......@@ -145,3 +153,15 @@ winMessageBoxF (const char *pszError, UINT uType, ...)
free (pszMsgBox);
#undef MESSAGEBOXF
}
#ifndef HAS_SCPRINTF
extern int scprintf(const char *format, ...)
{
int ret;
va_list va;
va_start(va, format);
ret = vsnprintf(NULL, 0, format, va);
va_end(va);
return ret;
}
#endif
......@@ -38,7 +38,9 @@
int g_iNumScreens = 0;
winScreenInfo g_ScreenInfo[MAXSCREENS];
int g_iLastScreen = -1;
#ifdef HAS_DEVWINDOWS
int g_fdMessageQueue = WIN_FD_INVALID;
#endif
int g_iScreenPrivateIndex = -1;
int g_iCmapPrivateIndex = -1;
int g_iGCPrivateIndex = -1;
......@@ -55,7 +57,11 @@ const char * g_pszQueryHost = NULL;
Bool g_fXdmcpEnabled = FALSE;
HICON g_hIconX = NULL;
HICON g_hSmallIconX = NULL;
#ifndef RELOCATE_PROJECTROOT
char * g_pszLogFile = "/tmp/XWin.log";
#else
char * g_pszLogFile = "XWin.log";
#endif
int g_iLogVerbose = 2;
Bool g_fLogInited = FALSE;
char * g_pszCommandLine = NULL;
......@@ -99,7 +105,7 @@ Bool g_fUnicodeClipboard = TRUE;
Bool g_fClipboard = FALSE;
Bool g_fClipboardLaunched = FALSE;
Bool g_fClipboardStarted = FALSE;
pthread_t g_ptClipboardProc = 0;
pthread_t g_ptClipboardProc;
HWND g_hwndClipboard = NULL;
void *g_pClipboardDisplay = NULL;
Window g_iClipboardWindow = None;
......@@ -124,6 +130,5 @@ winInitializeGlobals (void)
g_pClipboardDisplay = NULL;
g_atomLastOwnedSelection = None;
g_hwndClipboard = NULL;
g_ptClipboardProc = 0;
#endif
}
......@@ -541,9 +541,11 @@ winKeybdReleaseKeys ()
{
int i;
#ifdef HAS_DEVWINDOWS
/* Verify that the mi input system has been initialized */
if (g_fdMessageQueue == WIN_FD_INVALID)
return;
#endif
/* Loop through all keys */
for (i = 0; i < NUM_KEYCODES; ++i)
......
......@@ -359,6 +359,7 @@ winXIconToHICON (WindowPtr pWin, int iconSize)
* Change the Windows window icon
*/
#ifdef XWIN_MULTIWINDOW
void
winUpdateIcon (Window id)
{
......@@ -471,3 +472,4 @@ void winDestroyIcon(HICON hIcon)
!winIconIsOverride((unsigned long)hIcon))
DestroyIcon (hIcon);
}
#endif
......@@ -524,7 +524,8 @@ winCreateWindowsWindow (WindowPtr pWin)
}