From 2427e00b1da0ccfaf2c075ec408fd0f822801880 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 4 Jul 2005 16:52:29 +0000 Subject: r8152: * remove commented out structure * use SAMBA_PRINTER_PORT_NAME in registry values for builtin printer port (This used to be commit 63bc03536b6d0622005448f0f7be2739e06a432a) --- source3/include/nt_printing.h | 15 --------------- source3/registry/reg_db.c | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index fa53e1d284..01835c999e 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -344,21 +344,6 @@ typedef struct uint32 bottom; } nt_forms_struct; -/* -typedef struct _form -{ - uint32 flags; - uint32 name_ptr; - uint32 size_x; - uint32 size_y; - uint32 left; - uint32 top; - uint32 right; - uint32 bottom; - UNISTR2 name; -} FORM; -*/ - #ifndef SAMBA_PRINTER_PORT_NAME #define SAMBA_PRINTER_PORT_NAME "Samba Printer Port" #endif diff --git a/source3/registry/reg_db.c b/source3/registry/reg_db.c index cfc8b854fc..bd17303a70 100644 --- a/source3/registry/reg_db.c +++ b/source3/registry/reg_db.c @@ -67,9 +67,9 @@ static struct builtin_regkey_value builtin_registry_values[] = { { "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "SystemRoot", REG_SZ, { "c:\\Windows" } }, { "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Ports", - "Samba Printer Port", REG_SZ, { "" } }, + SAMBA_PRINTER_PORT_NAME, REG_SZ, { "" } }, { "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers", - "DefaultSpoolDirectory", REG_SZ, { "c:\\windows\\system32\\spool\\printers" } }, + "DefaultSpoolDirectory", REG_SZ, { "C:\\Windows\\System32\\Spool\\Printers" } }, { NULL, NULL, 0, { NULL } } }; -- cgit