diff options
| -rw-r--r-- | include/dix-config.h | 2 | ||||
| -rw-r--r-- | makefile.before | 2 | ||||
| -rw-r--r-- | xorg-server/dix/main.c | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/XWin.rc | 5 | ||||
| -rw-r--r-- | xorg-server/include/site.h | 4 | ||||
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/include/dix-config.h b/include/dix-config.h index 53e956da1..031bcb56f 100644 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -405,7 +405,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((0) * 100000) + ((0) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((0) * 100000) + ((1) * 1000) + 0) /* Xorg release date */ #define XORG_DATE "2 August 2009" diff --git a/makefile.before b/makefile.before index 7bc32dcae..df6d084e2 100644 --- a/makefile.before +++ b/makefile.before @@ -45,7 +45,7 @@ endif DEFINES += WIN32 _WIN32 _WINDOWS WINDOWS _MBCS __i386__ __MINGW32__ OPEN_MAX=256 PATH_MAX=256 _TIMEVAL_DEFINED mode_t=int __STDC__ X_LOCALE
-DEFINES += FAKEIT VENDOR_NAME="\"The_MH/X_Project\"" VENDOR_RELEASE="(((1)*10000000)+((5)*100000)+((3)*1000)+0)" HAVE_CONFIG_H _BSD_SOURCE
+DEFINES += FAKEIT HAVE_CONFIG_H _BSD_SOURCE
TOPSRCDIR=$(MHMAKECONF)\xorg-server
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 90ddb6dd4..c4d362a36 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -458,8 +458,8 @@ int main(int argc, char *argv[], char *envp[]) return(0); } -static int VendorRelease = VENDOR_RELEASE; -static char *VendorString = VENDOR_NAME; +static int VendorRelease = XORG_VERSION_CURRENT; +static char *VendorString = "HMCA" ; void SetVendorRelease(int release) diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index fd45f2d2f..6b904155c 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -45,10 +45,7 @@ FONT 8, "MS Shell Dlg 2" BEGIN CONTROL IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32 LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 - LTEXT "Version 1.0 (1 Aug 2009)", IDC_STATIC, 36, 18, 220, 8 -// LTEXT "This product is licensed under the terms of the MIT/X11 License.", IDC_STATIC, 36, 38, 220, 20 -// CONTROL __VENDORDWEBSUPPORT__, ID_ABOUT_WEBSITE, "Button", -// BS_OWNERDRAW | WS_TABSTOP, 36, 58, 68, 8 + LTEXT "Version 1.0.1 (6 Aug 2009)", IDC_STATIC, 36, 18, 220, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h index fec87070b..56c802d07 100644 --- a/xorg-server/include/site.h +++ b/xorg-server/include/site.h @@ -52,7 +52,7 @@ SOFTWARE. * server executable. */ #ifndef VENDOR_STRING -#define VENDOR_STRING "The X.Org Foundation" +#define VENDOR_STRING "HMCA" #endif /* @@ -61,7 +61,7 @@ SOFTWARE. * by the vendor. */ #ifndef VENDOR_RELEASE -#define VENDOR_RELEASE 6600 +#define VENDOR_RELEASE XORG_VERSION_CURRENT #endif /* diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 85c005576..dcaaf8f83 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -11,7 +11,7 @@ Name "VcXsrv"
; The file to write
-OutFile "vcxsrv.1.0.installer.exe"
+OutFile "vcxsrv.1.0.1.installer.exe"
; The default installation directory
InstallDir $PROGRAMFILES\VcXsrv
|