svn commit: samba r2821 - branches/SAMBA_3_0/source/printing branches/SAMBA_3_0/source/registry branches/SAMBA_3_0/source/rpc_server branches/SAMBA_3_0/source/rpcclient branches/SAMBA_3_0/source/utils trunk/source/printing trunk/source/registry trunk/source/rpc_server trunk/source/rpcclient trunk/source/utils

gd at samba.org gd at samba.org
Mon Oct 4 22:13:58 GMT 2004


Author: gd
Date: 2004-10-04 22:13:57 +0000 (Mon, 04 Oct 2004)
New Revision: 2821

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2821&nolog=1

Log:
Adding "Windows x64" as architecture string and driverdir "x64" for the
64bit AMD platform.

(This used to be "Windows AMD64" and "AMD64" in one of the release
candidates of SP2 for Windows XP. AMD64 is obviously still supported but
not documented.)

Guenther


Modified:
   branches/SAMBA_3_0/source/printing/nt_printing.c
   branches/SAMBA_3_0/source/registry/reg_printing.c
   branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
   branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
   branches/SAMBA_3_0/source/utils/net_rpc_printer.c
   trunk/source/printing/nt_printing.c
   trunk/source/registry/reg_printing.c
   trunk/source/rpc_server/srv_spoolss_nt.c
   trunk/source/rpcclient/cmd_spoolss.c
   trunk/source/utils/net_rpc_printer.c


Changeset:
Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===================================================================
--- branches/SAMBA_3_0/source/printing/nt_printing.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -210,6 +210,7 @@
 #define SPL_ARCH_W32ALPHA	"W32ALPHA"
 #define SPL_ARCH_W32PPC		"W32PPC"
 #define SPL_ARCH_IA64		"IA64"
+#define SPL_ARCH_X64		"x64"
 
 static const struct table_node archi_table[]= {
 
@@ -219,6 +220,7 @@
 	{"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA,	2 },
 	{"Windows NT PowerPC",   SPL_ARCH_W32PPC,	2 },
 	{"Windows IA64",   	 SPL_ARCH_IA64,		3 },
+	{"Windows x64",   	 SPL_ARCH_X64,		3 },
 	{NULL,                   "",		-1 }
 };
 

Modified: branches/SAMBA_3_0/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_printing.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ branches/SAMBA_3_0/source/registry/reg_printing.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -90,6 +90,8 @@
 		"Windows NT R4000",
 		"Windows NT Alpha_AXP",
 		"Windows NT PowerPC",
+		"Windows IA64",
+		"Windows x64",
 		NULL };
 	fstring *drivers = NULL;
 	int i, env_index, num_drivers;

Modified: branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -1995,6 +1995,7 @@
 	        {"Windows NT Alpha_AXP", "W32ALPHA",    2 },
 	        {"Windows NT PowerPC",   "W32PPC",      2 },
 		{"Windows IA64",         "IA64",        3 },
+		{"Windows x64",          "x64",         3 },
 	        {NULL,                   "",            -1 }
 	};
  

Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -40,6 +40,7 @@
 	{"Windows NT Alpha_AXP", "W32ALPHA",	2 },
 	{"Windows NT PowerPC",   "W32PPC",	2 },
 	{"Windows IA64",         "IA64",        3 },
+	{"Windows x64",          "x64",         3 },
 	{NULL,                   "",		-1 }
 };
 

Modified: branches/SAMBA_3_0/source/utils/net_rpc_printer.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc_printer.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ branches/SAMBA_3_0/source/utils/net_rpc_printer.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -35,7 +35,8 @@
 	{"Windows NT R4000",     "W32MIPS",	2 },
 	{"Windows NT Alpha_AXP", "W32ALPHA",	2 },
 	{"Windows NT PowerPC",   "W32PPC",	2 },
-	{"Windows IA64",	 "IA64",	3 },
+	{"Windows IA64",         "IA64",	3 },
+	{"Windows x64",          "x64",		3 },
 	{NULL,                   "",		-1 }
 };
 

Modified: trunk/source/printing/nt_printing.c
===================================================================
--- trunk/source/printing/nt_printing.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ trunk/source/printing/nt_printing.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -210,6 +210,7 @@
 #define SPL_ARCH_W32ALPHA	"W32ALPHA"
 #define SPL_ARCH_W32PPC		"W32PPC"
 #define SPL_ARCH_IA64		"IA64"
+#define SPL_ARCH_X64		"x64"
 
 static const struct table_node archi_table[]= {
 
@@ -219,6 +220,7 @@
 	{"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA,	2 },
 	{"Windows NT PowerPC",   SPL_ARCH_W32PPC,	2 },
 	{"Windows IA64",   	 SPL_ARCH_IA64,		3 },
+	{"Windows x64",   	 SPL_ARCH_X64,		3 },
 	{NULL,                   "",		-1 }
 };
 

Modified: trunk/source/registry/reg_printing.c
===================================================================
--- trunk/source/registry/reg_printing.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ trunk/source/registry/reg_printing.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -90,6 +90,8 @@
 		"Windows NT R4000",
 		"Windows NT Alpha_AXP",
 		"Windows NT PowerPC",
+		"Windows IA64",
+		"Windows x64",
 		NULL };
 	fstring *drivers = NULL;
 	int i, env_index, num_drivers;

Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ trunk/source/rpc_server/srv_spoolss_nt.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -1995,6 +1995,7 @@
 	        {"Windows NT Alpha_AXP", "W32ALPHA",    2 },
 	        {"Windows NT PowerPC",   "W32PPC",      2 },
 		{"Windows IA64",         "IA64",        3 },
+		{"Windows x64",          "x64",         3 },
 	        {NULL,                   "",            -1 }
 	};
  

Modified: trunk/source/rpcclient/cmd_spoolss.c
===================================================================
--- trunk/source/rpcclient/cmd_spoolss.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ trunk/source/rpcclient/cmd_spoolss.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -40,6 +40,7 @@
 	{"Windows NT Alpha_AXP", "W32ALPHA",	2 },
 	{"Windows NT PowerPC",   "W32PPC",	2 },
 	{"Windows IA64",         "IA64",        3 },
+	{"Windows x64",          "x64",         3 },
 	{NULL,                   "",		-1 }
 };
 

Modified: trunk/source/utils/net_rpc_printer.c
===================================================================
--- trunk/source/utils/net_rpc_printer.c	2004-10-04 21:02:00 UTC (rev 2820)
+++ trunk/source/utils/net_rpc_printer.c	2004-10-04 22:13:57 UTC (rev 2821)
@@ -35,7 +35,8 @@
 	{"Windows NT R4000",     "W32MIPS",	2 },
 	{"Windows NT Alpha_AXP", "W32ALPHA",	2 },
 	{"Windows NT PowerPC",   "W32PPC",	2 },
-	{"Windows IA64",	 "IA64",	3 },
+	{"Windows IA64",         "IA64",	3 },
+	{"Windows x64",          "x64",		3 },
 	{NULL,                   "",		-1 }
 };
 



More information about the samba-cvs mailing list