Skip to content

L
libvncserver
Commit 4415df95 authored by dscho's avatar dscho
Browse files
Options

Visual C++ / win32 compatibility reestablished

parent 281cb780
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 24 deletions
example.dsp
View file @ 4415df95
# Microsoft Developer Studio Project File - Name="example" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="example" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Console Application" 0x0103 # TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=example - Win32 Debug CFG=example - Win32 Debug
!MESSAGE "example - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE Dies ist kein gltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE "example - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und fhren Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "example.mak".
!MESSAGE
!MESSAGE Sie knnen beim Ausfhren von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "example.mak" CFG="example - Win32 Debug"
!MESSAGE
!MESSAGE Fr die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "example - Win32 Release" (basierend auf "Win32 (x86) Console Application")
!MESSAGE "example - Win32 Debug" (basierend auf "Win32 (x86) Console Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
...@@ -28,15 +41,15 @@ RSC=rc.exe ...@@ -28,15 +41,15 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "zlib" /I "libjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zlib.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"msvcrt.lib"
!ELSEIF "$(CFG)" == "example - Win32 Debug" !ELSEIF "$(CFG)" == "example - Win32 Debug"
...@@ -51,16 +64,16 @@ LINK32=link.exe ...@@ -51,16 +64,16 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "zlib" /I "libjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libvncserver.lib libjpeg.a libz.a /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib zlib.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /pdbtype:sept
!ENDIF !ENDIF
......
libvncserver.dsp
View file @ 4415df95
...@@ -5,8 +5,20 @@ ...@@ -5,8 +5,20 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libvncserver - Win32 Debug CFG=libvncserver - Win32 Debug
!MESSAGE "libvncserver - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE Dies ist kein gltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE "libvncserver - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und fhren Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "libvncserver.mak".
!MESSAGE
!MESSAGE Sie knnen beim Ausfhren von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "libvncserver.mak" CFG="libvncserver - Win32 Debug"
!MESSAGE
!MESSAGE Fr die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "libvncserver - Win32 Release" (basierend auf "Win32 (x86) Static Library")
!MESSAGE "libvncserver - Win32 Debug" (basierend auf "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
...@@ -29,7 +41,7 @@ RSC=rc.exe ...@@ -29,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "zlib" /I "libjpeg" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -51,8 +63,8 @@ LIB32=link.exe -lib ...@@ -51,8 +63,8 @@ LIB32=link.exe -lib
# PROP Output_Dir "libvncserver___Win32_Debug" # PROP Output_Dir "libvncserver___Win32_Debug"
# PROP Intermediate_Dir "libvncserver___Win32_Debug" # PROP Intermediate_Dir "libvncserver___Win32_Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "zlib" /I "libjpeg" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -72,6 +84,8 @@ LIB32=link.exe -lib ...@@ -72,6 +84,8 @@ LIB32=link.exe -lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Group "auth" # Begin Group "auth"
# PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\auth.c SOURCE=.\auth.c
...@@ -91,6 +105,10 @@ SOURCE=.\vncauth.c ...@@ -91,6 +105,10 @@ SOURCE=.\vncauth.c
# End Group # End Group
# Begin Source File # Begin Source File
SOURCE=.\cargs.c
# End Source File
# Begin Source File
SOURCE=.\corre.c SOURCE=.\corre.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -103,6 +121,10 @@ SOURCE=.\cutpaste.c ...@@ -103,6 +121,10 @@ SOURCE=.\cutpaste.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\draw.c
# End Source File
# Begin Source File
SOURCE=.\font.c SOURCE=.\font.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -127,6 +149,10 @@ SOURCE=.\rre.c ...@@ -127,6 +149,10 @@ SOURCE=.\rre.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\selbox.c
# End Source File
# Begin Source File
SOURCE=.\sockets.c SOURCE=.\sockets.c
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -153,7 +179,9 @@ SOURCE=.\zlib.c ...@@ -153,7 +179,9 @@ SOURCE=.\zlib.c
# Begin Group "Headers" # Begin Group "Headers"
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Group "auth" # Begin Group "auth Nr. 1"
# PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=.\d3des.h SOURCE=.\d3des.h
...@@ -161,6 +189,10 @@ SOURCE=.\d3des.h ...@@ -161,6 +189,10 @@ SOURCE=.\d3des.h
# End Group # End Group
# Begin Source File # Begin Source File
SOURCE=.\default8x16.h
# End Source File
# Begin Source File
SOURCE=.\keysym.h SOURCE=.\keysym.h
# End Source File # End Source File
# Begin Source File # Begin Source File
......
libvncserver.dsw
View file @ 4415df95
...@@ -14,6 +14,24 @@ Package=<4> ...@@ -14,6 +14,24 @@ Package=<4>
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libvncserver Project_Dep_Name libvncserver
End Project Dependency End Project Dependency
Begin Project Dependency
Project_Dep_Name libjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name zlib
End Project Dependency
}}}
###############################################################################
Project: "libjpeg"=.\libjpeg\libjpeg.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}} }}}
############################################################################### ###############################################################################
...@@ -26,11 +44,17 @@ Package=<5> ...@@ -26,11 +44,17 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency
Project_Dep_Name libjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name zlib
End Project Dependency
}}} }}}
############################################################################### ###############################################################################
Project: "rdp2vnc"=..\rdp2vnc\rdp2vnc.dsp - Package Owner=<4> Project: "rdp2vnc"=\my\rdp2vnc\rdp2vnc\rdp2vnc.dsp - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
...@@ -41,6 +65,24 @@ Package=<4> ...@@ -41,6 +65,24 @@ Package=<4>
Begin Project Dependency Begin Project Dependency
Project_Dep_Name libvncserver Project_Dep_Name libvncserver
End Project Dependency End Project Dependency
Begin Project Dependency
Project_Dep_Name libjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name zlib
End Project Dependency
}}}
###############################################################################
Project: "zlib"=.\zlib\zlib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}} }}}
############################################################################### ###############################################################################
......
main.c
View file @ 4415df95
...@@ -401,7 +401,6 @@ Bool defaultPasswordCheck(rfbClientPtr cl,char* response,int len) ...@@ -401,7 +401,6 @@ Bool defaultPasswordCheck(rfbClientPtr cl,char* response,int len)
of char*'s, where the last pointer is 0. */ of char*'s, where the last pointer is 0. */
Bool checkPasswordByList(rfbClientPtr cl,char* response,int len) Bool checkPasswordByList(rfbClientPtr cl,char* response,int len)
{ {
int i;
char **passwds; char **passwds;
for(passwds=(char**)cl->screen->rfbAuthPasswdData;*passwds;passwds++) { for(passwds=(char**)cl->screen->rfbAuthPasswdData;*passwds;passwds++) {
...@@ -565,7 +564,7 @@ void rfbInitServer(rfbScreenInfoPtr rfbScreen) ...@@ -565,7 +564,7 @@ void rfbInitServer(rfbScreenInfoPtr rfbScreen)
#include <conio.h> #include <conio.h>
#include <sys/timeb.h> #include <sys/timeb.h>
void gettimeofday(struct timeval* tv,char*) void gettimeofday(struct timeval* tv,char* dummy)
{ {
SYSTEMTIME t; SYSTEMTIME t;
GetSystemTime(&t); GetSystemTime(&t);
......
rfb.h
View file @ 4415df95
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <zlib.h> #include <zlib.h>
#include "keysym.h" #include "keysym.h"
...@@ -85,11 +84,13 @@ typedef CARD32 KeySym; ...@@ -85,11 +84,13 @@ typedef CARD32 KeySym;
#endif #endif
#ifdef WIN32 #ifdef WIN32
#include <sys/timeb.h>
#include <winsock.h> #include <winsock.h>
#undef SOCKET #undef SOCKET
#define SOCKET int #define SOCKET int
#else #else
int max(int,int); int max(int,int);
#include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>
#define SOCKET int #define SOCKET int
#endif #endif
......
rfbserver.c
View file @ 4415df95
...@@ -205,6 +205,8 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP) ...@@ -205,6 +205,8 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbReleaseClientIterator(iterator); rfbReleaseClientIterator(iterator);
FD_SET(sock,&(rfbScreen->allFds)); FD_SET(sock,&(rfbScreen->allFds));
rfbScreen->maxFd = max(sock,rfbScreen->maxFd);
INIT_MUTEX(cl->outputMutex); INIT_MUTEX(cl->outputMutex);
INIT_MUTEX(cl->refCountMutex); INIT_MUTEX(cl->refCountMutex);
INIT_COND(cl->deleteCond); INIT_COND(cl->deleteCond);
...@@ -326,6 +328,8 @@ rfbClientConnectionGone(cl) ...@@ -326,6 +328,8 @@ rfbClientConnectionGone(cl)
} }
#endif #endif
FD_CLR(cl->sock,&(cl->screen->allFds));
cl->clientGoneHook(cl); cl->clientGoneHook(cl);
rfbLog("Client %s gone\n",cl->host); rfbLog("Client %s gone\n",cl->host);
......
sockets.c
View file @ 4415df95
...@@ -69,9 +69,9 @@ struct timeval ...@@ -69,9 +69,9 @@ struct timeval
#include "rfb.h" #include "rfb.h"
#ifndef WIN32 //#ifndef WIN32
int max(int i,int j) { return(i<j?j:i); } int max(int i,int j) { return(i<j?j:i); }
#endif //#endif
int rfbMaxClientWait = 20000; /* time (ms) after which we decide client has int rfbMaxClientWait = 20000; /* time (ms) after which we decide client has
gone away - needed to stop us hanging */ gone away - needed to stop us hanging */
...@@ -203,9 +203,6 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec) ...@@ -203,9 +203,6 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec)
rfbLog("Got connection from client %s\n", inet_ntoa(addr.sin_addr)); rfbLog("Got connection from client %s\n", inet_ntoa(addr.sin_addr));
FD_SET(sock, &(rfbScreen->allFds));
rfbScreen->maxFd = max(sock,rfbScreen->maxFd);
rfbNewClient(rfbScreen,sock); rfbNewClient(rfbScreen,sock);
FD_CLR(rfbScreen->rfbListenSock, &fds); FD_CLR(rfbScreen->rfbListenSock, &fds);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment