Merge 15334:15712 from trunk (but don't activate xmlbuild)

svn path=/branches/xen/; revision=15713

boot/freeldr/bootsect/Makefile

@@ -1,32 +0,0 @@
-#
-#  FreeLoader
-#  Copyright (C) 1999, 2000, 2001  Brian Palmer  <brianp@sginet.com>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-PATH_TO_TOP = ../../..
-
-include ../rules.mak
-
-BOOTCD_DIR	= $(PATH_TO_TOP)/../bootcd
-
-.PHONY : clean bootcd
-
-ifeq ($(ARCH),powerpc)
-include Makefile.powerpc
-else
-include Makefile.i386
-endif

boot/freeldr/bootsect/Makefile.powerpc

@@ -1,35 +0,0 @@
-TOOLS=$(PATH_TO_TOP)/tools
-SECTIONS= \
-	--only-section=.text \
-	--only-section=.data \
-	--only-section=.bss
-LDSECT=	-Ttext 0xe00000 -Tdata 0xe10000
-OBJS=ofwboot.o freeldr.o
-CFLAGS=-mbig -meabi -fPIC -fno-builtin -I../freeldr/include
-FREELDR=../freeldr/freeldr.sys
-
-.SUFFIXES: .c .o
-
-all: ofwldr 
-
-hack-coff$(EXEEXT):
-	$(HOST_CC) -I../freeldr/include hack-coff.c -o $@
-
-ofwboot.o: ofwboot.s
-	$(NASM_CMD) $< -c -o $@
-
-$(FREELDR):
-	$(MAKE) -C ../freeldr
-
-freeldr.o: $(FREELDR)
-	$(TOOLS)/ppc-le2be $< freeldr.tmp
-	$(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common freeldr.tmp $@
-	rm freeldr.tmp
-
-ofwldr: $(OBJS)
-	$(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf
-	$(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@
-	$(TOOLS)/hack-coff $@
-
-clean:
-	rm -rf ofwldr *.o *.elf *.tmp

boot/freeldr/bootsect/ofwboot.s

@@ -1,960 +0,0 @@
-	.section .text
-_start:	
-	.long	0xe00000 + 12
-	.long	0
-	.long	0
-	
-/*
- * LIFTED FROM arch/macppc/stand/ofwboot/Locore.c
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ;  LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-	
-_begin:
-	sync                    
-	isync
-
-	lis     %r1,stack@ha    
-	addi    %r1,%r1,stack@l 
-	addi    %r1,%r1,16384 - 0x10
-          
-	mfmsr   %r8             
-	li      %r0,0
-	mtmsr   %r0             
-	isync                   
-                               
-	mtibatu 0,%r0           
-	mtibatu 1,%r0           
-	mtibatu 2,%r0           
-	mtibatu 3,%r0           
-	mtdbatu 0,%r0           
-	mtdbatu 1,%r0           
-	mtdbatu 2,%r0           
-	mtdbatu 3,%r0           
-	
-	li      %r9,0x12             /* BATL(0, BAT_M, BAT_PP_RW) */
-	mtibatl 0,%r9           
-	mtdbatl 0,%r9           
-	li      %r9,0x1ffe           /* BATU(0, BAT_BL_256M, BAT_Vs) */
-	mtibatu 0,%r9           
-	mtdbatu 0,%r9           
-	isync                   
-
-	li	%r8,0x3030
-	mtmsr	%r8
-
-	/* Store ofw call addr */
-	mr	%r21,%r5
-	lis	%r10,0xe00000@ha
-	stw	%r5,ofw_call_addr - _start@l(%r10)
-
-	lis	%r4,_binary_freeldr_tmp_end@ha
-	addi	%r4,%r4,_binary_freeldr_tmp_end@l
-	lis	%r3,_binary_freeldr_tmp_start@ha
-	addi	%r3,%r3,_binary_freeldr_tmp_start@l
-
-	lis	%r5,0x8000@ha
-	addi	%r5,%r5,0x8000@l
-
-	bl	copy_bits
-
-	bl	zero_registers
-
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_banner - _start
-
-	bl	ofw_print_string
-
-	bl	ofw_print_eol
-
-	/* Zero CTR */
-	mtcr	%r31
-	
-	lis	%r3,0x8000@ha
-	addi	%r3,%r3,0x8000@l
-
-	mtlr	%r3
-	
-	lis	%r3,call_ofw@ha
-	addi	%r3,%r3,call_ofw - _start
-	
-	b	call_freeldr
-		
-	.align	4
-call_freeldr:
-	/* Get the address of the functions list --
-	 * Note:
-	 * Because of little endian switch we must use an even number of
-	 * instructions here..  Pad with a nop if needed. */
-	mfmsr	%r10
-	ori	%r10,%r10,1
-	mtmsr	%r10
-
-	nop
-	
-	/* Note that this is little-endian from here on */
-	blr
-	nop
-
-	.align  4
-call_ofw:
-	/* R3 has the function offset to call (n * 4) 
-	 * Other arg registers are unchanged.
-	 * Note that these 4 instructions are in reverse order due to
-	 * little-endian convention */
-	andi.	%r0,%r0,65534
-	mfmsr	%r0
-	mtmsr	%r0
-	/* Now normal ordering resumes */
-	subi	%r1,%r1,0x100
-
-	stw	%r8,4(%r1)
-	stw	%r9,8(%r1)
-	stw	%r10,12(%r1)
-	mflr	%r8
-	stw	%r8,16(%r1)
-
-	lis	%r10,0xe00000@ha
-	add	%r9,%r3,%r10
-	lwz	%r3,ofw_functions - _start@l(%r9)
-	mtctr	%r3
-	
-	mr	%r3,%r4
-	mr	%r4,%r5
-	mr	%r5,%r6
-	mr	%r6,%r7
-	mr	%r7,%r8
-
-	/* Goto the swapped function */
-	bctrl
-
-	lwz	%r8,16(%r1)
-	mtlr	%r8
-
-	lwz	%r8,4(%r1)
-	lwz	%r9,8(%r1)
-	lwz	%r10,12(%r1)
-
-	addi	%r1,%r1,0x100
-	/* Ok, go back to little endian */
-	mfmsr	%r0
-	ori	%r0,%r0,1
-	mtmsr	%r0
-
-	/* Note that this is little-endian from here on */
-	blr
-	nop
-
-zero_registers:
-	xor	%r2,%r2,%r2
-	mr	%r0,%r2
-	mr	%r3,%r2
-	
-	mr	%r4,%r2
-	mr	%r5,%r2
-	mr	%r6,%r2
-	mr	%r7,%r2
-
-	mr	%r8,%r2
-	mr	%r9,%r2
-	mr	%r10,%r2
-	mr	%r11,%r2
-
-	mr	%r12,%r2
-	mr	%r13,%r2
-	mr	%r14,%r2
-	mr	%r15,%r2
-	
-	mr	%r12,%r2
-	mr	%r13,%r2
-	mr	%r14,%r2
-	mr	%r15,%r2
-	
-	mr	%r16,%r2
-	mr	%r17,%r2
-	mr	%r18,%r2
-	mr	%r19,%r2
-	
-	mr	%r20,%r2
-	mr	%r21,%r2
-	mr	%r22,%r2
-	mr	%r23,%r2
-	
-	mr	%r24,%r2
-	mr	%r25,%r2
-	mr	%r26,%r2
-	mr	%r27,%r2
-	
-	mr	%r28,%r2
-	mr	%r29,%r2
-	mr	%r30,%r2
-	mr	%r31,%r2
-
-	blr
-	
-prim_strlen:
-	mr	%r5,%r3
-prim_strlen_loop:	
-	lbz	%r4,0(%r3)
-	cmpi	0,0,%r4,0
-	beq	prim_strlen_done
-	addi	%r3,%r3,1
-	b	prim_strlen_loop
-	
-prim_strlen_done:
-	sub	%r3,%r3,%r5
-	blr
-	
-copy_bits:
-	cmp	0,0,%r3,%r4
-	beqlr
-	lwz	%r6,0(%r3)
-	stw	%r6,0(%r5)
-	addi	%r3,%r3,4
-	addi	%r5,%r5,4
-	b	copy_bits
-
-ofw_print_string_hook:
-	bl	ofw_print_number
-	bl	ofw_exit
-	
-ofw_print_string:
-	/* Reserve some stack space */
-	subi	%r1,%r1,32
-
-	/* Save args */
-	stw	%r3,0(%r1)
-	
-	/* Save the lr, a scratch register */
-	stw	%r8,8(%r1)
-	mflr	%r8
-	stw	%r8,12(%r1)
-
-	/* Load the package name */
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,ofw_chosen_name - _start
-
-	/* Fire */
-	bl	ofw_finddevice
-
-	/* Load up for getprop */
-	stw	%r3,16(%r1)
-
-	lis	%r4,0xe00000@ha
-	addi	%r4,%r4,ofw_stdout_name - _start
-
-	addi	%r5,%r1,20
-
-	li	%r6,4
-
-	bl	ofw_getprop
-
-	/* Measure the string and remember the length */
-	lwz	%r3,0(%r1)
-	bl	prim_strlen
-	mr	%r5,%r3
-	
-	lwz	%r3,20(%r1)
-	lwz	%r4,0(%r1)
-
-	/* Write the string */
-	bl	ofw_write
-
-	/* Return */
-	lwz	%r8,12(%r1)
-	mtlr	%r8
-	lwz	%r8,8(%r1)
-	
-	addi	%r1,%r1,32
-	blr
-
-	/* Print 8 hex digits representing a number in r3 */
-ofw_print_number:
-	subi	%r1,%r1,32
-	stw	%r8,0(%r1)
-	mflr	%r8
-	stw	%r8,4(%r1)
-	stw	%r9,8(%r1)
-
-	xor	%r9,%r9,%r9
-	stw	%r9,12(%r1)
-
-	/* Set up and, devide, shift */
-	mr	%r8,%r3
-	lis	%r6,0xf0000000@ha
-	lis	%r7,0x10000000@ha
-	li	%r9,8
-
-ofw_number_loop:
-	nop
-	cmpi	0,0,%r9,0
-	beq	ofw_number_return
-	subi	%r9,%r9,1
-
-	/* Body: isolate digit, divide, print */
-	and	%r5,%r6,%r8
-	divwu	%r4,%r5,%r7
-	srwi	%r6,%r6,4
-	srwi	%r7,%r7,4
-
-	nop
-	
-	cmpi	0,0,%r4,10
-	bge	ofw_number_letter
-	addi	%r4,%r4,'0'
-	b	ofw_number_digit_out
-	
-ofw_number_letter:
-	addi	%r4,%r4,'A' - 10
-
-ofw_number_digit_out:	
-	stb	%r4,12(%r1)
-	addi	%r3,%r1,12
-
-	stw	%r6,16(%r1)
-	stw	%r7,20(%r1)
-	stw	%r8,24(%r1)
-	stw	%r9,28(%r1)
-	
-	bl	ofw_print_string
-
-	lwz	%r6,16(%r1)
-	lwz	%r7,20(%r1)
-	lwz	%r8,24(%r1)
-	lwz	%r9,28(%r1)
-	
-	b	ofw_number_loop
-
-ofw_number_return:	
-	/* Return */
-	lwz	%r9,8(%r1)
-	lwz	%r8,4(%r1)
-	mtlr	%r8
-	lwz	%r8,0(%r1)
-	addi	%r1,%r1,32
-	blr
-
-ofw_print_eol:
-	subi	%r1,%r1,16
-	stw	%r8,0(%r1)
-	mflr	%r8
-	stw	%r8,4(%r1)
-	li	%r4,0x0d0a
-	sth	%r4,8(%r1)
-	xor	%r4,%r4,%r4
-	sth	%r4,10(%r1)
-	addi	%r3,%r1,8
-	bl	ofw_print_string
-	lwz	%r8,4(%r1)
-	mtlr	%r8
-	lwz	%r8,0(%r1)
-	addi	%r1,%r1,16
-	blr
-
-ofw_print_nothing:
-	subi	%r1,%r1,16
-	stw	%r8,0(%r1)
-	mflr	%r8
-	stw	%r8,4(%r1)
-	li	%r4,0
-	sth	%r4,8(%r1)
-	xor	%r4,%r4,%r4
-	sth	%r4,10(%r1)
-	addi	%r3,%r1,8
-	bl	ofw_print_string
-	lwz	%r8,4(%r1)
-	mtlr	%r8
-	lwz	%r8,0(%r1)
-	addi	%r1,%r1,16
-	blr
-
-ofw_print_space:
-	subi	%r1,%r1,16
-	stw	%r8,0(%r1)
-	mflr	%r8
-	stw	%r8,4(%r1)
-	li	%r4,0x2000
-	sth	%r4,8(%r1)
-	xor	%r4,%r4,%r4
-	sth	%r4,10(%r1)
-	addi	%r3,%r1,8
-	bl	ofw_print_string
-	lwz	%r8,4(%r1)
-	mtlr	%r8
-	lwz	%r8,0(%r1)
-	addi	%r1,%r1,16
-	blr
-
-ofw_print_regs:	
-	/* Construct ofw exit call */
-	subi	%r1,%r1,0xa0
-
-	stw	%r0,0(%r1)
-	stw	%r1,4(%r1)
-	stw	%r2,8(%r1)
-	stw	%r3,12(%r1)
-
-	stw	%r4,16(%r1)
-	stw	%r5,20(%r1)
-	stw	%r6,24(%r1)
-	stw	%r7,28(%r1)
-	
-	stw	%r8,32(%r1)
-	stw	%r9,36(%r1)
-	stw	%r10,40(%r1)
-	stw	%r11,44(%r1)
-	
-	stw	%r12,48(%r1)
-	stw	%r13,52(%r1)
-	stw	%r14,56(%r1)
-	stw	%r15,60(%r1)
-	
-	stw	%r16,64(%r1)
-	stw	%r17,68(%r1)
-	stw	%r18,72(%r1)
-	stw	%r19,76(%r1)
-	
-	stw	%r20,80(%r1)
-	stw	%r21,84(%r1)
-	stw	%r22,88(%r1)
-	stw	%r23,92(%r1)
-	
-	stw	%r24,96(%r1)
-	stw	%r25,100(%r1)
-	stw	%r26,104(%r1)
-	stw	%r27,108(%r1)
-	
-	stw	%r28,112(%r1)
-	stw	%r29,116(%r1)
-	stw	%r30,120(%r1)
-	stw	%r31,124(%r1)
-
-	mflr	%r0
-	stw	%r0,128(%r1)
-	mfcr	%r0
-	stw	%r0,132(%r1)
-	mfctr	%r0
-	stw	%r0,136(%r1)
-	mfmsr	%r0
-	stw	%r0,140(%r1)
-
-	/* Count at zero */
-	xor	%r0,%r0,%r0
-	stw	%r0,144(%r1)
-	mr	%r3,%r1
-	stw	%r3,148(%r1)
-	
-	/* Body, print the regname, then the register */
-ofw_register_loop:
-	lwz	%r3,144(%r1)
-	cmpi	0,0,%r3,32
-	beq	ofw_register_special
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_reg_init - _start
-	bl	ofw_print_string
-	lwz	%r3,144(%r1)
-	bl	ofw_print_number
-	bl	ofw_print_space
-	lwz	%r3,144(%r1)
-	mulli	%r3,%r3,4
-	add	%r3,%r1,%r3
-	lwz	%r3,0(%r3)
-	stw	%r3,152(%r1)
-	bl	ofw_print_number
-	lwz	%r3,144(%r1)
-	addi	%r3,%r3,1
-	stw	%r3,144(%r1)
-	b	done_dump
-
-dump_optional:	
-	bl	ofw_print_space
-	bl	ofw_print_space
-	lwz	%r3,152(%r1)
-	lwz	%r3,0(%r3)
-	bl	ofw_print_number
-	bl	ofw_print_space	
-	lwz	%r3,152(%r1)
-	lwz	%r3,4(%r3)
-	bl	ofw_print_number
-	bl	ofw_print_space	
-	lwz	%r3,152(%r1)
-	lwz	%r3,8(%r3)
-	bl	ofw_print_number
-	bl	ofw_print_space	
-	lwz	%r3,152(%r1)
-	lwz	%r3,12(%r3)
-	bl	ofw_print_number
-	bl	ofw_print_space
-done_dump:	
-	bl	ofw_print_eol
-	b	ofw_register_loop
-
-ofw_register_special:
-	/* LR */
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_reg_lr - _start
-	bl	ofw_print_string
-	bl	ofw_print_space
-	lwz	%r3,128(%r1)
-	bl	ofw_print_number
-	bl	ofw_print_eol
-	
-	/* CR */
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_reg_cr - _start
-	bl	ofw_print_string
-	bl	ofw_print_space
-	lwz	%r3,132(%r1)
-	bl	ofw_print_number
-	bl	ofw_print_eol
-	
-	/* CTR */
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_reg_ctr - _start
-	bl	ofw_print_string
-	bl	ofw_print_space
-	lwz	%r3,136(%r1)
-	bl	ofw_print_number
-	bl	ofw_print_eol
-	
-	/* MSR */
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_reg_msr - _start
-	bl	ofw_print_string
-	bl	ofw_print_space
-	lwz	%r3,140(%r1)
-	bl	ofw_print_number
-	bl	ofw_print_eol
-
-	/* Return */
-	lwz	%r0,128(%r1)
-	mtlr	%r0
-	
-	lwz	%r0,0(%r1)
-	lwz	%r2,8(%r1)
-	lwz	%r3,12(%r1)
-
-	lwz	%r4,16(%r1)
-	lwz	%r5,20(%r1)
-	lwz	%r6,24(%r1)
-	lwz	%r7,28(%r1)
-
-	addi	%r1,%r1,0xa0
-		
-	blr
-	
-ofw_finddevice_hook:
-	subi	%r1,%r1,32
-	stw	%r3,0(%r1)
-	mflr	%r3
-	stw	%r3,4(%r1)
-	lwz	%r3,0(%r1)
-	bl	ofw_finddevice
-	stw	%r3,0(%r1)
-	lwz	%r3,4(%r1)
-	mtlr	%r3
-	lwz	%r3,0(%r1)
-	addi	%r1,%r1,32	
-	blr
-	
-ofw_finddevice:
-	/* Reserve stack space ...
-	 * 20 bytes for the ofw call,
-	 * r8, r9, and lr */
-	subi	%r1,%r1,32
-
-	/* Store r8, r9, lr */
-	stw	%r8,20(%r1)
-	stw	%r9,24(%r1)
-	mflr	%r8
-	stw	%r8,28(%r1)
-	
-	/* Get finddevice name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_finddevice_name - _start
-	stw	%r9,0(%r1)
-
-	/* 1 Argument and 1 return */
-	li	%r9,1
-	stw	%r9,4(%r1)
-	stw	%r9,8(%r1)
-
-	stw	%r3,12(%r1)
-
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	/* Set argument */
-	mr	%r3,%r1
-	
-	/* Fire */
-	blrl
-	
-	lwz	%r3,16(%r1)
-	
-	/* Restore registers */
-	lwz	%r8,28(%r1)
-	mtlr	%r8
-	lwz	%r9,24(%r1)
-	lwz	%r8,20(%r1)
-	
-	addi	%r1,%r1,32
-	
-	/* Return */
-	blr
-
-ofw_getprop_hook:
-	/* Reserve stack space:
-	 * 32 bytes for the ofw call
-	 * 12 bytes for r8, r9, lr
-	 */		
-	/* Reserve stack space ...
-	 * 20 bytes for the ofw call,
-	 * r8, r9, and lr */
-	subi	%r1,%r1,48
-
-	/* Store r8, r9, lr */
-	stw	%r8,32(%r1)
-	stw	%r9,36(%r1)
-	mflr	%r8
-	stw	%r8,40(%r1)
-	
-	/* Get getprop name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_getprop_name - _start
-	stw	%r9,0(%r1)
-
-	/* 4 Argument and 1 return */
-	li	%r9,4
-	stw	%r9,4(%r1)
-	li	%r9,1
-	stw	%r9,8(%r1)
-
-	stw	%r3,12(%r1) /* Package */
-	stw	%r4,16(%r1) /* Property */
-	stw	%r5,20(%r1) /* Return buffer */
-	stw	%r6,24(%r1) /* Buffer size */
-	
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	/* Set argument */
-	mr	%r3,%r1
-
-	/* Fire */
-	blrl
-
-	/* Workaround to a wierd crash ... not sure what causes it.
-	 * XXX investigate me */
-	bl	ofw_print_nothing
-	
-	/* Return */
-	lwz	%r3,28(%r1)
-
-	/* Restore registers */
-	lwz	%r8,40(%r1)
-	mtlr	%r8
-	lwz	%r9,36(%r1)
-	lwz	%r8,32(%r1)
-	
-	addi	%r1,%r1,48
-		
-	/* Return */
-	blr
-
-ofw_getprop:
-	/* Reserve stack space:
-	 * 32 bytes for the ofw call
-	 * 12 bytes for r8, r9, lr
-	 */		
-	/* Reserve stack space ...
-	 * 20 bytes for the ofw call,
-	 * r8, r9, and lr */
-	subi	%r1,%r1,48
-
-	/* Store r8, r9, lr */
-	stw	%r8,32(%r1)
-	stw	%r9,36(%r1)
-	mflr	%r8
-	stw	%r8,40(%r1)
-	
-	/* Get getprop name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_getprop_name - _start
-	stw	%r9,0(%r1)
-
-	/* 4 Argument and 1 return */
-	li	%r9,4
-	stw	%r9,4(%r1)
-	li	%r9,1
-	stw	%r9,8(%r1)
-
-	stw	%r3,12(%r1) /* Package */
-	stw	%r4,16(%r1) /* Property */
-	stw	%r5,20(%r1) /* Return buffer */
-	stw	%r6,24(%r1) /* Buffer size */
-	
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	/* Set argument */
-	mr	%r3,%r1
-
-	/* Fire */
-	blrl
-	
-	/* Return */
-	lwz	%r3,28(%r1)
-
-	/* Restore registers */
-	lwz	%r8,40(%r1)
-
-	mtlr	%r8
-	lwz	%r9,36(%r1)
-	lwz	%r8,32(%r1)
-	
-	addi	%r1,%r1,48
-		
-	/* Return */
-	blr
-		
-ofw_write:
-	/* Reserve stack space:
-	 * 28 bytes for the ofw call
-	 * 12 bytes for r8, r9, lr
-	 */		
-	/* Reserve stack space ...
-	 * 20 bytes for the ofw call,
-	 * r8, r9, and lr */
-	subi	%r1,%r1,48
-
-	nop
-	
-	/* Store r8, r9, lr */
-	stw	%r8,28(%r1)
-	stw	%r9,32(%r1)
-	mflr	%r8
-	stw	%r8,36(%r1)
-	
-	/* Get write name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_write_name - _start
-	stw	%r9,0(%r1)
-
-	/* 3 Arguments and 1 return */
-	li	%r9,3
-	stw	%r9,4(%r1)
-	li	%r9,1
-	stw	%r9,8(%r1)
-
-	stw	%r3,12(%r1)
-	stw	%r4,16(%r1)
-	stw	%r5,20(%r1)
-	
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	/* Set argument */
-	mr	%r3,%r1
-
-	/* Fire */
-	blrl
-
-	/* Return */
-	lwz	%r3,24(%r1)
-
-	/* Restore registers */
-	lwz	%r8,36(%r1)
-	mtlr	%r8
-	lwz	%r9,32(%r1)
-	lwz	%r8,28(%r1)
-	
-	addi	%r1,%r1,48
-	
-	/* Return */
-	blr
-
-ofw_read:
-	/* Reserve stack space:
-	 * 28 bytes for the ofw call
-	 * 12 bytes for r8, r9, lr
-	 */		
-	/* Reserve stack space ...
-	 * 20 bytes for the ofw call,
-	 * r8, r9, and lr */
-	subi	%r1,%r1,48
-
-	nop
-	
-	/* Store r8, r9, lr */
-	stw	%r8,28(%r1)
-	stw	%r9,32(%r1)
-	mflr	%r8
-	stw	%r8,36(%r1)
-	
-	/* Get read name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_read_name - _start
-	stw	%r9,0(%r1)
-
-	/* 3 Arguments and 1 return */
-	li	%r9,3
-	stw	%r9,4(%r1)
-	li	%r9,1
-	stw	%r9,8(%r1)
-
-	stw	%r3,12(%r1)
-	stw	%r4,16(%r1)
-	stw	%r5,20(%r1)
-	
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	/* Set argument */
-	mr	%r3,%r1
-
-	/* Fire */
-	blrl
-
-	/* Return */
-	lwz	%r3,24(%r1)
-
-	/* Restore registers */
-	lwz	%r8,36(%r1)
-	mtlr	%r8
-	lwz	%r9,32(%r1)
-	lwz	%r8,28(%r1)
-	
-	addi	%r1,%r1,48
-	
-	/* Return */
-	blr
-		
-ofw_exit:
-	lis	%r3,0xe00000@ha
-	addi	%r3,%r3,freeldr_halt - _start
-
-	bl	ofw_print_string
-/*	
-ofw_exit_loop:	
-	b	ofw_exit_loop
-*/
-	/* Load the exit name */
-	lis	%r8,0xe00000@ha
-	addi	%r9,%r8,ofw_exit_name - _start
-	stw	%r9,0(%r1)
-
-	/* Zero args, zero returns */
-	xor	%r9,%r9,%r9
-	stw	%r9,4(%r1)
-	stw	%r9,8(%r1)
-	
-	/* Load up the call address */
-	lwz	%r9,ofw_call_addr - _start(%r8)
-	mtlr	%r9
-
-	mr	%r3,%r1
-
-	/* Fire */
-	blrl
-	/* No return from exit */
-		
-	.org	0x1000
-freeldr_banner:
-	.ascii	"ReactOS OpenFirmware Boot Program\r\n\0"
-
-freeldr_halt:
-	.ascii	"ReactOS OpenFirmware Boot Program Halting\r\n\0"
-
-freeldr_reg_init:
-	.ascii	"r\0"
-
-freeldr_reg_lr:	
-	.ascii	"lr \0"
-freeldr_reg_cr:	
-	.ascii	"cr \0"
-freeldr_reg_ctr:	
-	.ascii	"ctr\0"
-freeldr_reg_msr:	
-	.ascii	"msr\0"
-			
-ofw_call_addr:	
-	.long	0
-
-ofw_memory_size:
-	.long	0
-	.long	0
-	.long	0
-	.long	0
-	
-ofw_finddevice_name:
-	.ascii	"finddevice\0"
-		
-ofw_getprop_name:
-	.ascii	"getprop\0"
-
-ofw_write_name:
-	.ascii	"write\0"
-
-ofw_read_name:
-	.ascii	"read\0"
-	
-ofw_exit_name:
-	.ascii	"exit\0"
-
-ofw_chosen_name:
-	.ascii	"/chosen\0"
-
-ofw_stdout_name:
-	.ascii	"stdout\0"
-
-ofw_memory_name:
-	.ascii	"/memory@0\0"
-
-ofw_reg_name:
-	.ascii	"reg\0"
-	
-ofw_functions:
-	.long	ofw_finddevice_hook
-	.long	ofw_getprop_hook
-	.long	ofw_write
-	.long	ofw_read
-	.long	ofw_exit
-	.long	ofw_print_regs
-	.long	ofw_print_string
-	.long	ofw_print_number
-	
-	.org	0x2000
-stack:
-	.space	0x4000

boot/freeldr/freeldr/multiboot.c

@@ -1,787 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         Freeloader
- * FILE:            boot/freeldr/freeldr/multiboot.c
- * PURPOSE:         ReactOS Loader
- * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
- *                  Hartmut Birr - SMP/PAE Code
- */
-
-#include <freeldr.h>
-#include <internal/i386/ke.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* Base Addres of Kernel in Physical Memory */
-#define KERNEL_BASE_PHYS 0x200000
-
-/* Bits to shift to convert a Virtual Address into an Offset in the Page Table */
-#define PFN_SHIFT 12
-
-/* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */
-#define PDE_SHIFT 20
-#define PDE_SHIFT_PAE 18
-
-  
-/* Converts a Relative Address read from the Kernel into a Physical Address */
-#define RaToPa(p) \
-    (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS)
-   
-/* Converts a Phsyical Address Pointer into a Page Frame Number */
-#define PaPtrToPfn(p) \
-    (((ULONG_PTR)&p) >> PFN_SHIFT)
-    
-/* Converts a Phsyical Address into a Page Frame Number */
-#define PaToPfn(p) \
-    ((p) >> PFN_SHIFT)
-
-#define STARTUP_BASE                0xF0000000
-#define HYPERSPACE_BASE             0xF0800000
-#define APIC_BASE                   0xFEC00000
-#define KPCR_BASE                   0xFF000000
-    
-#define LowMemPageTableIndex        0
-#define StartupPageTableIndex       (STARTUP_BASE >> 20)    / sizeof(HARDWARE_PTE_X86)
-#define HyperspacePageTableIndex    (HYPERSPACE_BASE >> 20) / sizeof(HARDWARE_PTE_X86)
-#define KpcrPageTableIndex          (KPCR_BASE >> 20)       / sizeof(HARDWARE_PTE_X86)
-#define ApicPageTableIndex          (APIC_BASE >> 20)       / sizeof(HARDWARE_PTE_X86)
-
-#define LowMemPageTableIndexPae     0
-#define StartupPageTableIndexPae    (STARTUP_BASE >> 21)
-#define HyperspacePageTableIndexPae (HYPERSPACE_BASE >> 21)
-#define KpcrPageTableIndexPae       (KPCR_BASE >> 21)
-#define ApicPageTableIndexPae       (APIC_BASE >> 21)
-
-
-#define KernelEntryPoint            (KernelEntry - KERNEL_BASE_PHYS) + KernelBase
-
-/* Load Address of Next Module */
-ULONG_PTR NextModuleBase = 0;
-
-/* Currently Opened Module */
-PFRLDR_MODULE CurrentModule = NULL;
-
-/* Unrelocated Kernel Base in Virtual Memory */
-ULONG_PTR KernelBase;
-
-/* Wether PAE is to be used or not */
-BOOLEAN PaeModeEnabled;
-
-/* Kernel Entrypoint in Physical Memory */
-ULONG_PTR KernelEntry;
-
-/* Page Directory and Tables for non-PAE Systems */
-extern ULONG_PTR startup_pagedirectory;
-extern ULONG_PTR lowmem_pagetable;
-extern ULONG_PTR kernel_pagetable;
-extern ULONG_PTR hyperspace_pagetable;
-extern ULONG_PTR _pae_pagedirtable;
-extern ULONG_PTR apic_pagetable;
-extern ULONG_PTR kpcr_pagetable;
-
-/* Page Directory and Tables for PAE Systems */
-extern ULONG_PTR startup_pagedirectorytable_pae;
-extern ULONG_PTR startup_pagedirectory_pae;
-extern ULONG_PTR lowmem_pagetable_pae;
-extern ULONG_PTR kernel_pagetable_pae;
-extern ULONG_PTR hyperspace_pagetable_pae;
-extern ULONG_PTR pagedirtable_pae;
-extern ULONG_PTR apic_pagetable_pae;
-extern ULONG_PTR kpcr_pagetable_pae;
-
-typedef struct _HARDWARE_PTE_X86 {
-    ULONG Valid             : 1;
-    ULONG Write             : 1;
-    ULONG Owner             : 1;
-    ULONG WriteThrough      : 1;
-    ULONG CacheDisable      : 1;
-    ULONG Accessed          : 1;
-    ULONG Dirty             : 1;
-    ULONG LargePage         : 1;
-    ULONG Global            : 1;
-    ULONG CopyOnWrite       : 1;
-    ULONG Prototype         : 1;
-    ULONG reserved          : 1;
-    ULONG PageFrameNumber   : 20;
-} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86;
-
-typedef struct _HARDWARE_PTE_X64 {
-    ULONG Valid             : 1;
-    ULONG Write             : 1;
-    ULONG Owner             : 1;
-    ULONG WriteThrough      : 1;
-    ULONG CacheDisable      : 1;
-    ULONG Accessed          : 1;
-    ULONG Dirty             : 1;
-    ULONG LargePage         : 1;
-    ULONG Global            : 1;
-    ULONG CopyOnWrite       : 1;
-    ULONG Prototype         : 1;
-    ULONG reserved          : 1;
-    ULONG PageFrameNumber   : 20;
-    ULONG reserved2         : 31;
-    ULONG NoExecute         : 1;
-} HARDWARE_PTE_X64, *PHARDWARE_PTE_X64;
-
-typedef struct _PAGE_DIRECTORY_X86 {
-    HARDWARE_PTE_X86 Pde[1024];
-} PAGE_DIRECTORY_x86, *PPAGE_DIRECTORY_X86;
-
-typedef struct _PAGE_DIRECTORY_X64 {
-    HARDWARE_PTE_X64 Pde[2048];
-} PAGE_DIRECTORY_X64, *PPAGE_DIRECTORY_X64;
-
-typedef struct _PAGE_DIRECTORY_TABLE_X64 {
-    HARDWARE_PTE_X64 Pde[4];
-} PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64;
-
-/* FUNCTIONS *****************************************************************/
-
-/*++
- * FrLdrStartup 
- * INTERNAL
- *
- *     Prepares the system for loading the Kernel.
- *
- * Params:
- *     Magic - Multiboot Magic
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     None.
- *
- *--*/
-VOID
-STDCALL
-FrLdrStartup(ULONG Magic)
-{      
-    /* Disable Interrupts */
-    Ke386DisableInterrupts();
-    
-    /* Re-initalize EFLAGS */
-    Ke386EraseFlags();
-    
-    /* Get the PAE Mode */
-    FrLdrGetPaeMode();
-       
-    /* Initialize the page directory */
-    FrLdrSetupPageDirectory();
-           
-    /* Initialize Paging, Write-Protection and Load NTOSKRNL */
-    FrLdrSetupPae(Magic);
-}
-
-/*++
- * FrLdrSetupPae 
- * INTERNAL
- *
- *     Configures PAE on a MP System, and sets the PDBR if it's supported, or if
- *     the system is UP.
- *
- * Params:
- *     Magic - Multiboot Magic
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     None.
- *
- *--*/
-VOID
-FASTCALL
-FrLdrSetupPae(ULONG Magic)
-{
-    ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory;
-    ASMCODE PagedJump;
-
-    if (PaeModeEnabled)
-    {
-        PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectorytable_pae;
-     
-        /* Enable PAE */
-        Ke386SetCr4(Ke386GetCr4() | X86_CR4_PAE);
-    } 
-     
-    /* Set the PDBR */
-    Ke386SetPageTableDirectory(PageDirectoryBaseAddress);
-     
-    /* Enable Paging and Write Protect*/
-    Ke386SetCr0(Ke386GetCr0() | X86_CR0_PG | X86_CR0_WP);
-         
-    /* Jump to Kernel */
-    PagedJump = (ASMCODE)KernelEntryPoint;
-    PagedJump(Magic, &LoaderBlock);
-}
-
-/*++
- * FrLdrGetKernelBase 
- * INTERNAL
- *
- *     Gets the Kernel Base to use.
- *
- * Params:
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     Sets both the FreeLdr internal variable as well as the one which
- *     will be used by the Kernel.
- *
- *--*/
-VOID
-FASTCALL
-FrLdrGetKernelBase(VOID)
-{
-    PCHAR p;
-     
-    /* Read Command Line */
-    p = (PCHAR)LoaderBlock.CommandLine;
-    while ((p = strchr(p, '/')) != NULL) {
-        
-        /* Find "/3GB" */
-        if (!strnicmp(p + 1, "3GB", 3)) {
-            
-            /* Make sure there's nothing following it */
-            if (p[4] == ' ' || p[4] == 0) {
-                
-                /* Use 3GB */
-                KernelBase = 0xC0000000;
-            }
-        }
-
-        p++;
-    }
-          
-    /* Set KernelBase */
-    LoaderBlock.KernelBase = KernelBase;
-}
-
-/*++
- * FrLdrGetPaeMode 
- * INTERNAL
- *
- *     Determines whether PAE mode shoudl be enabled or not.
- *
- * Params:
- *     None.
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     None.
- *
- *--*/
-VOID
-FASTCALL
-FrLdrGetPaeMode(VOID)
-{
-    /* FIXME: Read command line */
-    PaeModeEnabled = FALSE;
-
-    if (PaeModeEnabled)
-    {
-    }
-}
-
-/*++
- * FrLdrSetupPageDirectory 
- * INTERNAL
- *
- *     Sets up the ReactOS Startup Page Directory.
- *
- * Params:
- *     None.
- *
- * Returns:
- *     None.
- *
- * Remarks:
- *     We are setting PDEs, but using the equvivalent (for our purpose) PTE structure.
- *     As such, please note that PageFrameNumber == PageEntryNumber.
- *
- *--*/
-VOID
-FASTCALL
-FrLdrSetupPageDirectory(VOID)
-{
-    PPAGE_DIRECTORY_X86 PageDir;
-    PPAGE_DIRECTORY_TABLE_X64 PageDirTablePae;
-    PPAGE_DIRECTORY_X64 PageDirPae;
-    ULONG KernelPageTableIndex;
-    ULONG i;
-
-    if (PaeModeEnabled) {
-    
-        /* Get the Kernel Table Index */
-        KernelPageTableIndex = (KernelBase >> 21);
-
-        /* Get the Startup Page Directory Table */
-        PageDirTablePae = (PPAGE_DIRECTORY_TABLE_X64)&startup_pagedirectorytable_pae;
-
-        /* Get the Startup Page Directory */
-        PageDirPae = (PPAGE_DIRECTORY_X64)&startup_pagedirectory_pae;
-
-        /* Set the Startup page directory table */
-        for (i = 0; i < 4; i++)
-        {
-            PageDirTablePae->Pde[i].Valid = 1;
-            PageDirTablePae->Pde[i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i;
-        }
-
-        /* Set up the Low Memory PDE */
-        for (i = 0; i < 2; i++)
-        {
-            PageDirPae->Pde[LowMemPageTableIndexPae + i].Valid = 1;
-            PageDirPae->Pde[LowMemPageTableIndexPae + i].Write = 1;
-            PageDirPae->Pde[LowMemPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(lowmem_pagetable_pae) + i;
-        }
-
-        /* Set up the Kernel PDEs */
-        for (i = 0; i < 3; i++)
-        {
-            PageDirPae->Pde[KernelPageTableIndex + i].Valid = 1;
-            PageDirPae->Pde[KernelPageTableIndex + i].Write = 1;
-            PageDirPae->Pde[KernelPageTableIndex + i].PageFrameNumber = PaPtrToPfn(kernel_pagetable_pae) + i;
-        }
-    
-        /* Set up the Startup PDE */
-        for (i = 0; i < 4; i++)
-        {
-            PageDirPae->Pde[StartupPageTableIndexPae + i].Valid = 1;
-            PageDirPae->Pde[StartupPageTableIndexPae + i].Write = 1;
-            PageDirPae->Pde[StartupPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(startup_pagedirectory_pae) + i;
-        }
-    
-        /* Set up the Hyperspace PDE */
-        for (i = 0; i < 2; i++)
-        {
-            PageDirPae->Pde[HyperspacePageTableIndexPae + i].Valid = 1;
-            PageDirPae->Pde[HyperspacePageTableIndexPae + i].Write = 1;
-            PageDirPae->Pde[HyperspacePageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable_pae) + i;
-        }
-    
-        /* Set up the Apic PDE */   
-        for (i = 0; i < 2; i++)
-        {
-            PageDirPae->Pde[ApicPageTableIndexPae + i].Valid = 1;
-            PageDirPae->Pde[ApicPageTableIndexPae + i].Write = 1;
-            PageDirPae->Pde[ApicPageTableIndexPae + i].PageFrameNumber = PaPtrToPfn(apic_pagetable_pae) + i;
-        }
-        
-        /* Set up the KPCR PDE */
-        PageDirPae->Pde[KpcrPageTableIndexPae].Valid = 1;
-        PageDirPae->Pde[KpcrPageTableIndexPae].Write = 1;
-        PageDirPae->Pde[KpcrPageTableIndexPae].PageFrameNumber = PaPtrToPfn(kpcr_pagetable_pae);
-    
-        /* Set up Low Memory PTEs */
-        PageDirPae = (PPAGE_DIRECTORY_X64)&lowmem_pagetable_pae;
-        for (i=0; i<1024; i++) {
-        
-            PageDirPae->Pde[i].Valid = 1;
-            PageDirPae->Pde[i].Write = 1;
-            PageDirPae->Pde[i].Owner = 1;
-            PageDirPae->Pde[i].PageFrameNumber = i;
-        }
-            
-        /* Set up Kernel PTEs */
-        PageDirPae = (PPAGE_DIRECTORY_X64)&kernel_pagetable_pae;
-        for (i=0; i<1536; i++) {
-        
-            PageDirPae->Pde[i].Valid = 1;
-            PageDirPae->Pde[i].Write = 1;
-            PageDirPae->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS) + i;
-        }
-        
-        /* Set up APIC PTEs */
-        PageDirPae = (PPAGE_DIRECTORY_X64)&apic_pagetable_pae;
-        PageDirPae->Pde[0].Valid = 1;
-        PageDirPae->Pde[0].Write = 1;
-        PageDirPae->Pde[0].CacheDisable = 1;
-        PageDirPae->Pde[0].WriteThrough = 1;
-        PageDirPae->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE);
-        PageDirPae->Pde[0x200].Valid = 1;
-        PageDirPae->Pde[0x200].Write = 1;
-        PageDirPae->Pde[0x200].CacheDisable = 1;
-        PageDirPae->Pde[0x200].WriteThrough = 1;
-        PageDirPae->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS);
-    
-        /* Set up KPCR PTEs */
-        PageDirPae = (PPAGE_DIRECTORY_X64)&kpcr_pagetable_pae;
-        PageDirPae->Pde[0].Valid = 1;
-        PageDirPae->Pde[0].Write = 1;
-        PageDirPae->Pde[0].PageFrameNumber = 1;      
-    
-    } else {
-            
-        /* Get the Kernel Table Index */
-        KernelPageTableIndex = (KernelBase >> PDE_SHIFT) / sizeof(HARDWARE_PTE_X86);
-        
-        /* Get the Startup Page Directory */
-        PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory;
-        
-        /* Set up the Low Memory PDE */
-        PageDir->Pde[LowMemPageTableIndex].Valid = 1;
-        PageDir->Pde[LowMemPageTableIndex].Write = 1;
-        PageDir->Pde[LowMemPageTableIndex].PageFrameNumber = PaPtrToPfn(lowmem_pagetable);
-    
-        /* Set up the Kernel PDEs */
-        PageDir->Pde[KernelPageTableIndex].Valid = 1;
-        PageDir->Pde[KernelPageTableIndex].Write = 1;
-        PageDir->Pde[KernelPageTableIndex].PageFrameNumber = PaPtrToPfn(kernel_pagetable);
-        PageDir->Pde[KernelPageTableIndex + 1].Valid = 1;
-        PageDir->Pde[KernelPageTableIndex + 1].Write = 1;
-        PageDir->Pde[KernelPageTableIndex + 1].PageFrameNumber = PaPtrToPfn(kernel_pagetable + 4096);
-        
-        /* Set up the Startup PDE */
-        PageDir->Pde[StartupPageTableIndex].Valid = 1;
-        PageDir->Pde[StartupPageTableIndex].Write = 1;
-        PageDir->Pde[StartupPageTableIndex].PageFrameNumber = PaPtrToPfn(startup_pagedirectory);
-        
-        /* Set up the Hyperspace PDE */
-        PageDir->Pde[HyperspacePageTableIndex].Valid = 1;
-        PageDir->Pde[HyperspacePageTableIndex].Write = 1;
-        PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable);
-    
-        /* Set up the Apic PDE */   
-        PageDir->Pde[ApicPageTableIndex].Valid = 1;
-        PageDir->Pde[ApicPageTableIndex].Write = 1;
-        PageDir->Pde[ApicPageTableIndex].PageFrameNumber = PaPtrToPfn(apic_pagetable);
-        
-        /* Set up the KPCR PDE */
-        PageDir->Pde[KpcrPageTableIndex].Valid = 1;
-        PageDir->Pde[KpcrPageTableIndex].Write = 1;
-        PageDir->Pde[KpcrPageTableIndex].PageFrameNumber = PaPtrToPfn(kpcr_pagetable);
-    
-        /* Set up Low Memory PTEs */
-        PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable;
-        for (i=0; i<1024; i++) {
-        
-            PageDir->Pde[i].Valid = 1;
-            PageDir->Pde[i].Write = 1;
-            PageDir->Pde[i].Owner = 1;
-            PageDir->Pde[i].PageFrameNumber = PaToPfn(i * PAGE_SIZE);
-        }
-        
-        /* Set up Kernel PTEs */
-        PageDir = (PPAGE_DIRECTORY_X86)&kernel_pagetable;
-        for (i=0; i<1536; i++) {
-        
-            PageDir->Pde[i].Valid = 1;
-            PageDir->Pde[i].Write = 1;
-            PageDir->Pde[i].PageFrameNumber = PaToPfn(KERNEL_BASE_PHYS + i * PAGE_SIZE);
-        }
-        
-        /* Set up APIC PTEs */
-        PageDir = (PPAGE_DIRECTORY_X86)&apic_pagetable;
-        PageDir->Pde[0].Valid = 1;
-        PageDir->Pde[0].Write = 1;
-        PageDir->Pde[0].CacheDisable = 1;
-        PageDir->Pde[0].WriteThrough = 1;
-        PageDir->Pde[0].PageFrameNumber = PaToPfn(APIC_BASE);
-        PageDir->Pde[0x200].Valid = 1;
-        PageDir->Pde[0x200].Write = 1;
-        PageDir->Pde[0x200].CacheDisable = 1;
-        PageDir->Pde[0x200].WriteThrough = 1;
-        PageDir->Pde[0x200].PageFrameNumber = PaToPfn(APIC_BASE + KERNEL_BASE_PHYS);
-    
-        /* Set up KPCR PTEs */
-        PageDir = (PPAGE_DIRECTORY_X86)&kpcr_pagetable;
-        PageDir->Pde[0].Valid = 1;
-        PageDir->Pde[0].Write = 1;
-        PageDir->Pde[0].PageFrameNumber = 1;      
-    }
-    return;
-}
-
-/*++
- * FrLdrMapKernel 
- * INTERNAL
- *
- *     Maps the Kernel into memory, does PE Section Mapping, initalizes the
- *     uninitialized data sections, and relocates the image.
- *
- * Params:
- *     KernelImage - FILE Structure representing the ntoskrnl image file.
- *
- * Returns:
- *     TRUE if the Kernel was mapped.
- *
- * Remarks:
- *     None.
- *
- *--*/
-BOOL
-STDCALL
-FrLdrMapKernel(FILE *KernelImage)
-{
-    PIMAGE_DOS_HEADER ImageHeader;
-    PIMAGE_NT_HEADERS NtHeader;
-    PIMAGE_SECTION_HEADER Section;
-    ULONG SectionCount;
-    ULONG ImageSize;
-    ULONG_PTR SourceSection;
-    ULONG_PTR TargetSection;
-    ULONG SectionSize;
-    LONG i;
-    PIMAGE_DATA_DIRECTORY RelocationDDir;
-    PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
-    ULONG Count;
-    ULONG_PTR Address, MaxAddress;
-    PUSHORT TypeOffset;
-    ULONG_PTR Delta;
-    PUSHORT ShortPtr;
-    PULONG LongPtr;
-
-    /* Allocate 1024 bytes for PE Header */
-    ImageHeader = (PIMAGE_DOS_HEADER)MmAllocateMemory(1024);
-    
-    /* Make sure it was succesful */
-    if (ImageHeader == NULL) {
-        
-        return FALSE;
-    }
-
-    /* Load the first 1024 bytes of the kernel image so we can read the PE header */
-    if (!FsReadFile(KernelImage, 1024, NULL, ImageHeader)) {
-
-        /* Fail if we couldn't read */
-        MmFreeMemory(ImageHeader);
-        return FALSE;
-    }
-
-    /* Now read the MZ header to get the offset to the PE Header */
-    NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)ImageHeader + ImageHeader->e_lfanew);
-     
-    /* Get Kernel Base */
-    KernelBase = NtHeader->OptionalHeader.ImageBase;  
-    FrLdrGetKernelBase();
-    
-    /* Save Entrypoint */
-    KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint);
-    
-    /* Save the Image Size */
-    ImageSize = NtHeader->OptionalHeader.SizeOfImage;
-     
-    /* Free the Header */
-    MmFreeMemory(ImageHeader);
-
-    /* Set the file pointer to zero */
-    FsSetFilePointer(KernelImage, 0);
-
-    /* Load the file image */
-    FsReadFile(KernelImage, ImageSize, NULL, (PVOID)KERNEL_BASE_PHYS);
-    
-    /* Reload the NT Header */
-    NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)KERNEL_BASE_PHYS + ImageHeader->e_lfanew);
-    
-    /* Load the first section */
-    Section = IMAGE_FIRST_SECTION(NtHeader);
-    SectionCount = NtHeader->FileHeader.NumberOfSections - 1;
-    
-    /* Now go to the last section */
-    Section += SectionCount;
-    
-    /* Walk each section backwards */    
-    for (i=SectionCount; i >= 0; i--, Section--) {
-    
-        /* Get the disk location and the memory location, and the size */          
-        SourceSection = RaToPa(Section->PointerToRawData);
-        TargetSection = RaToPa(Section->VirtualAddress);
-        SectionSize = Section->SizeOfRawData;
-   
-        /* If the section is already mapped correctly, go to the next */
-        if (SourceSection == TargetSection) continue;
-        
-        /* Load it into memory */
-        memmove((PVOID)TargetSection, (PVOID)SourceSection, SectionSize);
-        
-        /* Check for unitilizated data */
-        if (Section->SizeOfRawData < Section->Misc.VirtualSize) {
-            
-            /* Zero it out */
-            memset((PVOID)RaToPa(Section->VirtualAddress + Section->SizeOfRawData), 
-                   0,
-                   Section->Misc.VirtualSize - Section->SizeOfRawData);
-        }
-    }
-       
-    /* Get the Relocation Data Directory */
-    RelocationDDir = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
-    
-    /* Get the Relocation Section Start and End*/
-    RelocationDir = (PIMAGE_BASE_RELOCATION)(KERNEL_BASE_PHYS + RelocationDDir->VirtualAddress);
-    RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size);
-   
-    /* Calculate Difference between Real Base and Compiled Base*/
-    Delta = KernelBase - NtHeader->OptionalHeader.ImageBase;;
-    
-    /* Determine how far we shoudl relocate */
-    MaxAddress = KERNEL_BASE_PHYS + ImageSize;
-    
-    /* Relocate until we've processed all the blocks */
-    while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) {
-        
-        /* See how many Relocation Blocks we have */
-        Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT);
-        
-        /* Calculate the Address of this Directory */
-        Address = KERNEL_BASE_PHYS + RelocationDir->VirtualAddress;
-        
-        /* Calculate the Offset of the Type */
-        TypeOffset = (PUSHORT)(RelocationDir + 1);
-
-        for (i = 0; i < Count; i++) {
-            
-            ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF));
-
-            /* Don't relocate after the end of the loaded driver */
-            if ((ULONG_PTR)ShortPtr >= MaxAddress) break;
-
-            switch (*TypeOffset >> 12) {
-                
-                case IMAGE_REL_BASED_ABSOLUTE:
-                    break;
-
-                case IMAGE_REL_BASED_HIGH:
-                    *ShortPtr += HIWORD(Delta);
-                    break;
-
-                case IMAGE_REL_BASED_LOW:
-                    *ShortPtr += LOWORD(Delta);
-                    break;
-
-                case IMAGE_REL_BASED_HIGHLOW:
-                    LongPtr = (PULONG)ShortPtr;
-                    *LongPtr += Delta;
-                    break;
-            }
-            
-            TypeOffset++;
-        }
-        
-        /* Move to the next Relocation Table */
-        RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDir->SizeOfBlock);
-    }
-    
-    /* Increase the next Load Base */
-    NextModuleBase = ROUND_UP(KERNEL_BASE_PHYS + ImageSize, PAGE_SIZE);
-
-    /* Return Success */
-    return TRUE;
-}
-
-ULONG_PTR
-STDCALL
-FrLdrLoadModule(FILE *ModuleImage, 
-                LPSTR ModuleName, 
-                PULONG ModuleSize)
-{
-    ULONG LocalModuleSize;
-    PFRLDR_MODULE ModuleData;
-    LPSTR NameBuffer;
-    LPSTR TempName;
-
-    /* Get current module data structure and module name string array */
-    ModuleData = &multiboot_modules[LoaderBlock.ModsCount];
-    
-    /* Get only the Module Name */
-    do {
-        
-        TempName = strchr(ModuleName, '\\');
-        
-        if(TempName) {
-            ModuleName = TempName + 1;
-        }
-
-    } while(TempName);
-    NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount];
-
-    /* Get Module Size */
-    LocalModuleSize = FsGetFileSize(ModuleImage);
-    
-    /* Fill out Module Data Structure */
-    ModuleData->ModuleStart = NextModuleBase;
-    ModuleData->ModuleEnd = NextModuleBase + LocalModuleSize;
-    
-    /* Save name */
-    strcpy(NameBuffer, ModuleName);
-    ModuleData->ModuleName = NameBuffer;
-
-    /* Load the file image */
-    FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase);
-
-    /* Move to next memory block and increase Module Count */
-    NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE);
-    LoaderBlock.ModsCount++;
-
-    /* Return Module Size if required */
-    if (ModuleSize != NULL) {
-        *ModuleSize = LocalModuleSize;
-    }
-
-    return(ModuleData->ModuleStart);
-}
-
-ULONG_PTR
-STDCALL
-FrLdrCreateModule(LPSTR ModuleName)
-{
-    PFRLDR_MODULE ModuleData;
-    LPSTR NameBuffer;
-
-    /* Get current module data structure and module name string array */
-    ModuleData = &multiboot_modules[LoaderBlock.ModsCount];
-    NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount];
-
-    /* Set up the structure */
-    ModuleData->ModuleStart = NextModuleBase;
-    ModuleData->ModuleEnd = -1;
-    
-    /* Copy the name */
-    strcpy(NameBuffer, ModuleName);
-    ModuleData->ModuleName = NameBuffer;
-
-    /* Set the current Module */
-    CurrentModule = ModuleData;
-
-    /* Return Module Base Address */
-    return(ModuleData->ModuleStart);
-}
-
-BOOL
-STDCALL
-FrLdrCloseModule(ULONG_PTR ModuleBase, 
-                 ULONG ModuleSize)
-{
-    PFRLDR_MODULE ModuleData = CurrentModule;
-
-    /* Make sure a module is opened */
-    if (ModuleData) {
-    
-        /* Make sure this is the right module and that it hasn't been closed */
-        if ((ModuleBase == ModuleData->ModuleStart) && (ModuleData->ModuleEnd == -1)) {
-        
-            /* Close the Module */
-            ModuleData->ModuleEnd = ModuleData->ModuleStart + ModuleSize;
-
-            /* Set the next Module Base and increase the number of modules */
-            NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE);
-            LoaderBlock.ModsCount++;
-            
-            /* Close the currently opened module */
-            CurrentModule = NULL;
-
-            /* Success */
-            return(TRUE);
-        }
-    }
-
-    /* Failure path */
-    return(FALSE);
-}

drivers/bus/serenum/detect.c

@@ -1,541 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Serial enumerator driver
- * FILE:            drivers/bus/serenum/detect.c
- * PURPOSE:         Detection of serial devices
- * 
- * PROGRAMMERS:     Jason Filby (jasonfilby@yahoo.com)
- *                  Filip Navara (xnavara@volny.cz)
- *                  Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "serenum.h"
-
-static NTSTATUS
-SerenumDeviceIoControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN ULONG CtlCode,
-	IN PVOID InputBuffer OPTIONAL,
-	IN ULONG InputBufferSize,
-	IN OUT PVOID OutputBuffer OPTIONAL,
-	IN OUT PULONG OutputBufferSize)
-{
-	KEVENT Event;
-	PIRP Irp;
-	IO_STATUS_BLOCK IoStatus;
-	NTSTATUS Status;
-	
-	KeInitializeEvent (&Event, NotificationEvent, FALSE);
-	
-	Irp = IoBuildDeviceIoControlRequest(CtlCode,
-		DeviceObject,
-		InputBuffer,
-		InputBufferSize,
-		OutputBuffer,
-		(OutputBufferSize) ? *OutputBufferSize : 0,
-		FALSE,
-		&Event,
-		&IoStatus);
-	if (Irp == NULL)
-	{
-		DPRINT("Serenum: IoBuildDeviceIoControlRequest() failed\n");
-		return STATUS_INSUFFICIENT_RESOURCES;
-	}
-	
-	Status = IoCallDriver(DeviceObject, Irp);
-	
-	if (Status == STATUS_PENDING)
-	{
-		DPRINT("Serenum: Operation pending\n");
-		KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL);
-		Status = IoStatus.Status;
-	}
-	
-	if (OutputBufferSize)
-	{
-		*OutputBufferSize = IoStatus.Information;
-	}
-	
-	return Status;
-}
-
-static NTSTATUS
-ReadBytes(
-	IN PDEVICE_OBJECT LowerDevice,
-	OUT PUCHAR Buffer,
-	IN ULONG BufferSize,
-	OUT PULONG FilledBytes)
-{
-	PIRP Irp;
-	IO_STATUS_BLOCK ioStatus;
-	KEVENT event;
-	NTSTATUS Status;
-	
-	KeInitializeEvent(&event, NotificationEvent, FALSE);
-	Irp = IoBuildSynchronousFsdRequest(
-		IRP_MJ_READ,
-		LowerDevice,
-		Buffer, BufferSize,
-		0,
-		&event,
-		&ioStatus);
-	if (!Irp)
-		return FALSE;
-	
-	Status = IoCallDriver(LowerDevice, Irp);
-	if (Status == STATUS_PENDING)
-	{
-		KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL);
-		Status = ioStatus.Status;
-	}
-	DPRINT("Serenum: bytes received: %lu/%lu\n",
-		ioStatus.Information, BufferSize);
-	*FilledBytes = ioStatus.Information;
-	return Status;
-}
-
-static NTSTATUS
-ReportDetectedDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PUNICODE_STRING DeviceDescription,
-	IN PUNICODE_STRING DeviceId,
-	IN PUNICODE_STRING HardwareIds,
-	IN PUNICODE_STRING CompatibleIds)
-{
-	PDEVICE_OBJECT Pdo = NULL;
-	PPDO_DEVICE_EXTENSION PdoDeviceExtension = NULL;
-	PFDO_DEVICE_EXTENSION FdoDeviceExtension;
-	NTSTATUS Status;
-	
-	DPRINT("Serenum: SerenumReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription);
-	
-	Status = IoCreateDevice(
-		DeviceObject->DriverObject,
-		sizeof(PDO_DEVICE_EXTENSION),
-		NULL,
-		FILE_DEVICE_CONTROLLER,
-		FILE_AUTOGENERATED_DEVICE_NAME,
-		FALSE,
-		&Pdo);
-	if (!NT_SUCCESS(Status)) goto ByeBye;
-	
-	Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE;
-	Pdo->Flags |= DO_POWER_PAGABLE;
-	PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)Pdo->DeviceExtension;
-	FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	RtlZeroMemory(PdoDeviceExtension, sizeof(PDO_DEVICE_EXTENSION));
-	PdoDeviceExtension->Common.IsFDO = FALSE;
-	Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->DeviceDescription, DeviceDescription, PagedPool);
-	if (!NT_SUCCESS(Status)) goto ByeBye;
-	Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->DeviceId, DeviceId, PagedPool);
-	if (!NT_SUCCESS(Status)) goto ByeBye;
-	Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->HardwareIds, HardwareIds, PagedPool);
-	if (!NT_SUCCESS(Status)) goto ByeBye;
-	Status = SerenumDuplicateUnicodeString(&PdoDeviceExtension->CompatibleIds, CompatibleIds, PagedPool);
-	if (!NT_SUCCESS(Status)) goto ByeBye;
-	
-	/* Device attached to serial port (Pdo) may delegate work to
-	 * serial port stack (Fdo = DeviceObject variable) */
-	Pdo->StackSize = DeviceObject->StackSize + 1;
-	
-	FdoDeviceExtension->AttachedPdo = Pdo;
-	PdoDeviceExtension->AttachedFdo = DeviceObject;
-	
-	Pdo->Flags |= DO_BUFFERED_IO;
-	Pdo->Flags &= ~DO_DEVICE_INITIALIZING;
-	
-	return STATUS_SUCCESS;
-
-ByeBye:
-	if (Pdo)
-	{
-		if (PdoDeviceExtension->DeviceDescription.Buffer)
-			RtlFreeUnicodeString(&PdoDeviceExtension->DeviceDescription);
-		if (PdoDeviceExtension->DeviceId.Buffer)
-			RtlFreeUnicodeString(&PdoDeviceExtension->DeviceId);
-		if (PdoDeviceExtension->HardwareIds.Buffer)
-			RtlFreeUnicodeString(&PdoDeviceExtension->HardwareIds);
-		if (PdoDeviceExtension->CompatibleIds.Buffer)
-			RtlFreeUnicodeString(&PdoDeviceExtension->CompatibleIds);
-		IoDeleteDevice(Pdo);
-	}
-	return Status;
-}
-
-static BOOLEAN
-SerenumIsValidPnpIdString(
-	IN PUCHAR Buffer,
-	IN ULONG BufferLength)
-{
-	/* FIXME: SerenumIsValidPnpIdString not implemented */
-	DPRINT1("Serenum: SerenumIsValidPnpIdString() unimplemented\n");
-	return STATUS_SUCCESS;
-}
-
-static NTSTATUS
-ReportDetectedPnpDevice(
-	IN PUCHAR Buffer,
-	IN ULONG BufferLength)
-{
-	ULONG i;
-	/* FIXME: ReportDetectedPnpDevice not implemented */
-	DPRINT1("Serenum: ReportDetectedPnpDevice() unimplemented\n");
-	DPRINT1("");
-	for (i = 0; i < BufferLength; i++)
-		DbgPrint("%c", Buffer[i]);
-	DbgPrint("\n");
-	/* Call ReportDetectedDevice */
-	return STATUS_SUCCESS;
-}
-
-#define BEGIN_ID '('
-#define END_ID ')'
-
-static NTSTATUS
-SerenumWait(ULONG milliseconds)
-{
-	KTIMER Timer;
-	LARGE_INTEGER DueTime;
-	
-	DueTime.QuadPart = milliseconds * -10;
-	KeInitializeTimer(&Timer);
-	KeSetTimer(&Timer, DueTime, NULL);
-	return KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, NULL);
-}
-
-NTSTATUS
-SerenumDetectPnpDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PDEVICE_OBJECT LowerDevice)
-{
-	UCHAR Buffer[256];
-	ULONG BaudRate;
-	ULONG TotalBytesReceived = 0;
-	ULONG Size;
-	ULONG Msr, Purge;
-	ULONG i;
-	BOOLEAN BufferContainsBeginId = FALSE;
-	BOOLEAN BufferContainsEndId = FALSE;
-	SERIAL_LINE_CONTROL Lcr;
-	SERIAL_TIMEOUTS Timeouts;
-	SERIALPERF_STATS PerfStats;
-	NTSTATUS Status;
-	
-	/* 1. COM port initialization, check for device enumerate */
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	SerenumWait(200);
-	Size = sizeof(Msr);
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS,
-		NULL, 0, &Msr, &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	if ((Msr & SR_MSR_DSR) == 0) goto SerenumDisconnectIdle;
-	
-	/* 2. COM port setup, 1st phase */
-	CHECKPOINT;
-	BaudRate = SERIAL_BAUD_1200;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
-		&BaudRate, sizeof(BaudRate), NULL, 0);
-	if (!NT_SUCCESS(Status)) return Status;
-	Lcr.WordLength = 7;
-	Lcr.Parity = NO_PARITY;
-	Lcr.StopBits = STOP_BIT_1;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL,
-		&Lcr, sizeof(Lcr), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	SerenumWait(200);
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	SerenumWait(200);
-	
-	/* 3. Wait for response, 1st phase */
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Timeouts.ReadIntervalTimeout = 0;
-	Timeouts.ReadTotalTimeoutMultiplier = 0;
-	Timeouts.ReadTotalTimeoutConstant = 200;
-	Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS,
-		&Timeouts, sizeof(Timeouts), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer), &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	if (Size != 0) goto SerenumCollectPnpComDeviceId;
-	
-	/* 4. COM port setup, 2nd phase */
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Purge = SERIAL_PURGE_RXABORT | SERIAL_PURGE_RXCLEAR;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_PURGE,
-		&Purge, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	SerenumWait(200);
-	
-	/* 5. Wait for response, 2nd phase */
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = ReadBytes(LowerDevice, Buffer, 1, &TotalBytesReceived);
-	if (!NT_SUCCESS(Status)) return Status;
-	if (TotalBytesReceived != 0) goto SerenumCollectPnpComDeviceId;
-	Size = sizeof(Msr);
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS,
-		NULL, 0, &Msr, &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect; else goto SerenumConnectIdle;
-	
-	/* 6. Collect PnP COM device ID */
-SerenumCollectPnpComDeviceId:
-	CHECKPOINT;
-	Timeouts.ReadIntervalTimeout = 200;
-	Timeouts.ReadTotalTimeoutMultiplier = 0;
-	Timeouts.ReadTotalTimeoutConstant = 2200;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS,
-		&Timeouts, sizeof(Timeouts), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = ReadBytes(LowerDevice, &Buffer[TotalBytesReceived], sizeof(Buffer) - TotalBytesReceived, &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	TotalBytesReceived += Size;
-	Size = sizeof(PerfStats);
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_STATS,
-		NULL, 0, &PerfStats, &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	if (PerfStats.FrameErrorCount + PerfStats.ParityErrorCount != 0) goto SerenumConnectIdle;
-	for (i = 0; i < TotalBytesReceived; i++)
-	{
-		if (Buffer[i] == BEGIN_ID) BufferContainsBeginId = TRUE;
-		if (Buffer[i] == END_ID) BufferContainsEndId = TRUE;
-	}
-	if (TotalBytesReceived == 1 || BufferContainsEndId)
-	{
-		if (SerenumIsValidPnpIdString(Buffer, TotalBytesReceived))
-			return ReportDetectedPnpDevice(Buffer, TotalBytesReceived);
-		goto SerenumConnectIdle;
-	}
-	if (!BufferContainsBeginId) goto SerenumConnectIdle;
-	if (!BufferContainsEndId) goto SerenumConnectIdle;
-	Size = sizeof(Msr);
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_GET_MODEMSTATUS,
-		NULL, 0, &Msr, &Size);
-	if (!NT_SUCCESS(Status)) return Status;
-	if ((Msr & SR_MSR_DSR) == 0) goto SerenumVerifyDisconnect;
-	
-	/* 7. Verify disconnect */
-SerenumVerifyDisconnect:
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	SerenumWait(5000);
-	goto SerenumDisconnectIdle;
-	
-	/* 8. Connect idle */
-SerenumConnectIdle:
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	BaudRate = SERIAL_BAUD_300;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
-		&BaudRate, sizeof(BaudRate), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Lcr.WordLength = 7;
-	Lcr.Parity = NO_PARITY;
-	Lcr.StopBits = STOP_BIT_1;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL,
-		&Lcr, sizeof(Lcr), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	if (TotalBytesReceived == 0)
-		return STATUS_DEVICE_NOT_CONNECTED;
-	else
-		return STATUS_SUCCESS;
-	
-	/* 9. Disconnect idle */
-SerenumDisconnectIdle:
-	CHECKPOINT;
-	/* FIXME: report to OS device removal, if it was present */
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	BaudRate = SERIAL_BAUD_300;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
-		&BaudRate, sizeof(BaudRate), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Lcr.WordLength = 7;
-	Lcr.Parity = NO_PARITY;
-	Lcr.StopBits = STOP_BIT_1;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL,
-		&Lcr, sizeof(Lcr), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	return STATUS_DEVICE_NOT_CONNECTED;
-}
-
-NTSTATUS
-SerenumDetectLegacyDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PDEVICE_OBJECT LowerDevice)
-{
-	ULONG Fcr, Mcr;
-	ULONG BaudRate;
-	ULONG Command;
-	SERIAL_TIMEOUTS Timeouts;
-	SERIAL_LINE_CONTROL LCR;
-	ULONG i, Count;
-	UCHAR Buffer[16];
-	UNICODE_STRING DeviceDescription;
-	UNICODE_STRING DeviceId;
-	UNICODE_STRING HardwareIds;
-	UNICODE_STRING CompatibleIds;
-	NTSTATUS Status;
-	
-	RtlZeroMemory(Buffer, sizeof(Buffer));
-	
-	/* Reset UART */
-	CHECKPOINT;
-	Mcr = 0; /* MCR: DTR/RTS/OUT2 off */
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL,
-		&Mcr, sizeof(Mcr), NULL, NULL); 
-	if (!NT_SUCCESS(Status)) return Status;
-	
-	/* Set communications parameters */
-	CHECKPOINT;
-	/* DLAB off */
-	Fcr = 0;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL,
-		&Fcr, sizeof(Fcr), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	/* Set serial port speed */
-	BaudRate = SERIAL_BAUD_1200;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
-		&BaudRate, sizeof(BaudRate), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	/* Set LCR */
-	LCR.WordLength = 7;
-	LCR.Parity = NO_PARITY;
-	LCR.StopBits = STOP_BITS_2;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL,
-		&LCR, sizeof(LCR), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	
-	/* Flush receive buffer */
-	CHECKPOINT;
-	Command = SERIAL_PURGE_RXCLEAR;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL,
-		&Command, sizeof(Command), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	/* Wait 100 ms */
-	SerenumWait(100);
-	
-	/* Enable DTR/RTS */
-	CHECKPOINT;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS,
-		NULL, 0, NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	
-	/* Set timeout to 500 microseconds */
-	CHECKPOINT;
-	Timeouts.ReadIntervalTimeout = 100;
-	Timeouts.ReadTotalTimeoutMultiplier = 0;
-	Timeouts.ReadTotalTimeoutConstant = 500;
-	Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0;
-	Status = SerenumDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS,
-		&Timeouts, sizeof(Timeouts), NULL, NULL);
-	if (!NT_SUCCESS(Status)) return Status;
-	
-	/* Fill the read buffer */
-	CHECKPOINT;
-	Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count);
-	if (!NT_SUCCESS(Status)) return Status;
-	
-	for (i = 0; i < Count; i++)
-	{
-		if (Buffer[i] == 'B')
-		{
-			/* Sign for Microsoft Ballpoint */
-			/* Hardware id: *PNP0F09
-			 * Compatible id: *PNP0F0F, SERIAL_MOUSE
-			 */
-			RtlInitUnicodeString(&DeviceDescription, L"Microsoft Ballpoint device");
-			RtlInitUnicodeString(&DeviceId, L"*PNP0F09");
-			SerenumInitMultiSzString(&HardwareIds, "*PNP0F09", NULL);
-			SerenumInitMultiSzString(&CompatibleIds, "*PNP0F0F", "SERIAL_MOUSE", NULL);
-			Status = ReportDetectedDevice(DeviceObject,
-				&DeviceDescription, &DeviceId, &HardwareIds, &CompatibleIds);
-			RtlFreeUnicodeString(&HardwareIds);
-			RtlFreeUnicodeString(&CompatibleIds);
-			return Status;
-		}
-		else if (Buffer[i] == 'M')
-		{
-			/* Sign for Microsoft Mouse protocol followed by button specifier */
-			if (i == sizeof(Buffer) - 1)
-			{
-				/* Overflow Error */
-				return STATUS_DEVICE_NOT_CONNECTED;
-			}
-			switch (Buffer[i + 1])
-			{
-				case '3':
-					/* Hardware id: *PNP0F08
-					 * Compatible id: SERIAL_MOUSE
-					 */
-					RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 3-buttons");
-					RtlInitUnicodeString(&DeviceId, L"*PNP0F08");
-					SerenumInitMultiSzString(&HardwareIds, "*PNP0F08", NULL);
-					SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL);
-				default:
-					/* Hardware id: *PNP0F01
-					 * Compatible id: SERIAL_MOUSE
-					 */
-					RtlInitUnicodeString(&DeviceDescription, L"Microsoft Mouse with 2-buttons or Microsoft Wheel Mouse");
-					RtlInitUnicodeString(&DeviceId, L"*PNP0F01");
-					SerenumInitMultiSzString(&HardwareIds, "*PNP0F01", NULL);
-					SerenumInitMultiSzString(&CompatibleIds, "SERIAL_MOUSE", NULL);
-			}
-			Status = ReportDetectedDevice(DeviceObject,
-				&DeviceDescription, &DeviceId, &HardwareIds, &CompatibleIds);
-			RtlFreeUnicodeString(&HardwareIds);
-			RtlFreeUnicodeString(&CompatibleIds);
-			return Status;
-		}
-	}
-
-	return STATUS_DEVICE_NOT_CONNECTED;
-}

drivers/bus/serenum/fdo.c

@@ -1,213 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Serial enumerator driver
- * FILE:            drivers/bus/serenum/fdo.c
- * PURPOSE:         IRP_MJ_PNP operations for FDOs
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "serenum.h"
-
-NTSTATUS STDCALL
-SerenumAddDevice(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PDEVICE_OBJECT Pdo)
-{
-	PDEVICE_OBJECT Fdo;
-	PFDO_DEVICE_EXTENSION DeviceExtension;
-	//UNICODE_STRING SymbolicLinkName;
-	NTSTATUS Status;
-
-	DPRINT("Serenum: SerenumAddDevice called. Pdo = %p\n", Pdo);
-   
-	/* Create new device object */
-	Status = IoCreateDevice(DriverObject,
-	                        sizeof(FDO_DEVICE_EXTENSION),
-	                        NULL,
-	                        FILE_DEVICE_BUS_EXTENDER,
-	                        FILE_DEVICE_SECURE_OPEN,
-	                        FALSE,
-	                        &Fdo);
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("Serenum: IoCreateDevice() failed with status 0x%08lx\n", Status);
-		return Status;
-	}
-	
-	/* Register device interface */
-#if 0 /* FIXME: activate */
-	Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, NULL, &SymbolicLinkName);
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("Serenum: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status);
-		goto ByeBye;
-	}
-	DPRINT1("Serenum: IoRegisterDeviceInterface() returned '%wZ'\n", &SymbolicLinkName);
-	Status = IoSetDeviceInterfaceState(&SymbolicLinkName, TRUE);
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("Serenum: IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status);
-		goto ByeBye;
-	}
-	RtlFreeUnicodeString(&SymbolicLinkName);
-#endif
-	
-	DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension;
-	RtlZeroMemory(DeviceExtension, sizeof(FDO_DEVICE_EXTENSION));
-	DeviceExtension->Common.IsFDO = TRUE;
-	DeviceExtension->Common.PnpState = dsStopped;
-	DeviceExtension->Pdo = Pdo;
-	IoInitializeRemoveLock(&DeviceExtension->RemoveLock, SERENUM_TAG, 0, 0);
-	Fdo->Flags |= DO_POWER_PAGABLE;
-	Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice);
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("Serenum: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status);
-		IoDeleteDevice(Fdo);
-		return Status;
-	}
-	Fdo->Flags |= DO_BUFFERED_IO;
-	Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
-	
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS STDCALL
-SerenumFdoStartDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PCOMMON_DEVICE_EXTENSION DeviceExtension;
-	
-	DPRINT("Serenum: SerenumFdoStartDevice() called\n");
-	DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	
-	ASSERT(DeviceExtension->PnpState == dsStopped);
-	DeviceExtension->PnpState = dsStarted;
-	
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-SerenumFdoQueryBusRelations(
-	IN PDEVICE_OBJECT DeviceObject,
-	OUT PDEVICE_RELATIONS* pDeviceRelations)
-{
-	PFDO_DEVICE_EXTENSION DeviceExtension;
-	PDEVICE_RELATIONS DeviceRelations;
-	ULONG NumPDO;
-	ULONG i;
-	NTSTATUS Status = STATUS_SUCCESS;
-	
-	DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ASSERT(DeviceExtension->Common.IsFDO);
-	
-	/* Do enumeration if needed */
-	if (!(DeviceExtension->Flags & FLAG_ENUMERATION_DONE))
-	{
-		ASSERT(DeviceExtension->AttachedPdo == NULL);
-		/* Detect plug-and-play devices */
-		Status = SerenumDetectPnpDevice(DeviceObject, DeviceExtension->LowerDevice);
-		if (Status == STATUS_DEVICE_NOT_CONNECTED)
-		{
-			/* Detect legacy devices */
-			Status = SerenumDetectLegacyDevice(DeviceObject, DeviceExtension->LowerDevice);
-			if (Status == STATUS_DEVICE_NOT_CONNECTED)
-				Status = STATUS_SUCCESS;
-		}
-		DeviceExtension->Flags |= FLAG_ENUMERATION_DONE;
-	}
-	NumPDO = (DeviceExtension->AttachedPdo != NULL ? 1 : 0);
-	
-	DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(
-		PagedPool,
-		sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * (NumPDO - 1),
-		SERENUM_TAG);
-	if (!DeviceRelations)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	
-	/* Fill returned structure */
-	DeviceRelations->Count = NumPDO;
-	for (i = 0; i < NumPDO; i++)
-	{
-		ObReferenceObject(DeviceExtension->AttachedPdo);
-		DeviceRelations->Objects[i] = DeviceExtension->AttachedPdo;
-	}
-	
-	*pDeviceRelations = DeviceRelations;
-	return Status;
-}
-
-NTSTATUS
-SerenumFdoPnp(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	ULONG MinorFunction;
-	PIO_STACK_LOCATION Stack;
-	ULONG_PTR Information = 0;
-	NTSTATUS Status;
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	MinorFunction = Stack->MinorFunction;
-	
-	switch (MinorFunction)
-	{
-		/* FIXME: do all these minor functions
-		IRP_MN_QUERY_REMOVE_DEVICE 0x1
-		IRP_MN_REMOVE_DEVICE 0x2
-		IRP_MN_CANCEL_REMOVE_DEVICE 0x3
-		IRP_MN_STOP_DEVICE 0x4
-		IRP_MN_QUERY_STOP_DEVICE 0x5
-		IRP_MN_CANCEL_STOP_DEVICE 0x6
-		IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations (optional) 0x7
-		IRP_MN_QUERY_INTERFACE (optional) 0x8
-		IRP_MN_QUERY_CAPABILITIES (optional) 0x9
-		IRP_MN_FILTER_RESOURCE_REQUIREMENTS (optional or required) 0xb
-		IRP_MN_QUERY_PNP_DEVICE_STATE (optional) 0x14
-		IRP_MN_DEVICE_USAGE_NOTIFICATION (required or optional) 0x16
-		IRP_MN_SURPRISE_REMOVAL 0x17
-		*/
-		case IRP_MN_START_DEVICE: /* 0x0 */
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_START_DEVICE\n");
-			/* Call lower driver */
-			Status = ForwardIrpAndWait(DeviceObject, Irp);
-			if (NT_SUCCESS(Status))
-				Status = SerenumFdoStartDevice(DeviceObject, Irp);
-			break;
-		}
-		case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x7 */
-		{
-			switch (Stack->Parameters.QueryDeviceRelations.Type)
-			{
-				case BusRelations:
-				{
-					PDEVICE_RELATIONS DeviceRelations;
-					DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n");
-					Status = SerenumFdoQueryBusRelations(DeviceObject, &DeviceRelations);
-					Information = (ULONG_PTR)DeviceRelations;
-					break;
-				}
-				default:
-					DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", 
-						Stack->Parameters.QueryDeviceRelations.Type);
-					return ForwardIrpAndForget(DeviceObject, Irp);
-			}
-			break;
-		}
-		default:
-		{
-			DPRINT1("Serenum: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction);
-			return ForwardIrpAndForget(DeviceObject, Irp);
-		}
-	}
-	
-	Irp->IoStatus.Information = Information;
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/bus/serenum/makefile

@@ -1,20 +0,0 @@
-# $Id: makefile 12852 2005-01-06 13:58:04Z mf $
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = driver
-
-TARGET_NAME = serenum
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-TARGET_OBJECTS = \
-	detect.o      \
-	fdo.o         \
-	misc.o        \
-	pdo.o         \
-	serenum.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

drivers/bus/serenum/misc.c

@@ -1,210 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Serial enumerator driver
- * FILE:            drivers/dd/serenum/misc.c
- * PURPOSE:         Misceallenous operations
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "serenum.h"
-#include <stdarg.h>
-
-NTSTATUS
-SerenumDuplicateUnicodeString(
-	OUT PUNICODE_STRING Destination,
-	IN PUNICODE_STRING Source,
-	IN POOL_TYPE PoolType)
-{
-	ASSERT(Destination);
-	
-	if (Source == NULL)
-	{
-		RtlInitUnicodeString(Destination, NULL);
-		return STATUS_SUCCESS;
-	}
-	
-	Destination->Buffer = ExAllocatePool(PoolType, Source->MaximumLength);
-	if (Destination->Buffer == NULL)
-	{
-		return STATUS_INSUFFICIENT_RESOURCES;
-	}
-	
-	Destination->MaximumLength = Source->MaximumLength;
-	Destination->Length = Source->Length;
-	RtlCopyMemory(Destination->Buffer, Source->Buffer, Source->MaximumLength);
-	
-	return STATUS_SUCCESS;
-}
-
-/* I really want ANSI strings as last arguments because
- * PnP ids are ANSI-encoded in PnP device string
- * identification */
-NTSTATUS
-SerenumInitMultiSzString(
-	OUT PUNICODE_STRING Destination,
-	... /* list of PCSZ */)
-{
-	va_list args;
-	PCSZ Source;
-	ANSI_STRING AnsiString;
-	UNICODE_STRING UnicodeString;
-	ULONG DestinationSize = 0;
-	NTSTATUS Status = STATUS_SUCCESS;
-	
-	ASSERT(Destination);
-	
-	/* Calculate length needed for destination unicode string */
-	va_start(args, Destination);
-	Source = va_arg(args, PCSZ);
-	while (Source != NULL)
-	{
-		RtlInitAnsiString(&AnsiString, Source);
-		DestinationSize += RtlAnsiStringToUnicodeSize(&AnsiString)
-			+ sizeof(WCHAR) /* final NULL */;
-		Source = va_arg(args, PCSZ);
-	}
-	va_end(args);
-	if (DestinationSize == 0)
-	{
-		RtlInitUnicodeString(Destination, NULL);
-		return STATUS_SUCCESS;
-	}
-	
-	/* Initialize destination string */
-	DestinationSize += sizeof(WCHAR); // final NULL
-	Destination->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, DestinationSize, SERENUM_TAG);
-	if (!Destination->Buffer)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	Destination->Length = 0;
-	Destination->MaximumLength = (USHORT)DestinationSize;
-	
-	/* Copy arguments to destination string */
-	/* Use a temporary unicode string, which buffer is shared with
-	 * destination string, to copy arguments */
-	UnicodeString.Length = Destination->Length;
-	UnicodeString.MaximumLength = Destination->MaximumLength;
-	UnicodeString.Buffer = Destination->Buffer;
-	va_start(args, Destination);
-	Source = va_arg(args, PCSZ);
-	while (Source != NULL)
-	{
-		RtlInitAnsiString(&AnsiString, Source);
-		Status = RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE);
-		if (!NT_SUCCESS(Status))
-		{
-			ExFreePoolWithTag(Destination->Buffer, SERENUM_TAG);
-			break;
-		}
-		Destination->Length += UnicodeString.Length + sizeof(WCHAR);
-		UnicodeString.MaximumLength -= UnicodeString.Length + sizeof(WCHAR);
-		UnicodeString.Buffer += UnicodeString.Length / sizeof(WCHAR) + 1;
-		UnicodeString.Length = 0;
-		Source = va_arg(args, PCSZ);
-	}
-	va_end(args);
-	if (NT_SUCCESS(Status))
-	{
-		/* Finish multi-sz string */
-		Destination->Buffer[Destination->Length / sizeof(WCHAR)] = L'\0';
-		Destination->Length += sizeof(WCHAR);
-	}
-	return Status;
-}
-
-NTSTATUS STDCALL
-ForwardIrpAndWaitCompletion(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp,
-	IN PVOID Context)
-{
-	if (Irp->PendingReturned)
-		KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE);
-  	return STATUS_MORE_PROCESSING_REQUIRED;
-}
-
-NTSTATUS
-ForwardIrpAndWait(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PDEVICE_OBJECT LowerDevice;
-	KEVENT Event;
-	NTSTATUS Status;
-	
-	ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO);
-	LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice;
-	
-	ASSERT(LowerDevice);
-	
-	KeInitializeEvent(&Event, NotificationEvent, FALSE);
-	IoCopyCurrentIrpStackLocationToNext(Irp);
-	
-	DPRINT("Serenum: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName);
-	IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE);
-	
-	Status = IoCallDriver(LowerDevice, Irp);
-	if (Status == STATUS_PENDING)
-	{
-		Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL);
-		if (NT_SUCCESS(Status))
-			Status = Irp->IoStatus.Status;
-	}
-	
-	return Status;
-}
-
-NTSTATUS STDCALL
-ForwardIrpToLowerDeviceAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PFDO_DEVICE_EXTENSION DeviceExtension;
-	PDEVICE_OBJECT LowerDevice;
-	
-	DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ASSERT(DeviceExtension->Common.IsFDO);
-	
-	LowerDevice = DeviceExtension->LowerDevice;
-	ASSERT(LowerDevice);
-	DPRINT("Serenum: calling lower device 0x%p [%wZ]\n",
-		LowerDevice, &LowerDevice->DriverObject->DriverName);
-	IoSkipCurrentIrpStackLocation(Irp);
-	return IoCallDriver(LowerDevice, Irp);
-}
-
-NTSTATUS STDCALL
-ForwardIrpToAttachedFdoAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PPDO_DEVICE_EXTENSION DeviceExtension;
-	PDEVICE_OBJECT Fdo;
-	
-	DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ASSERT(!DeviceExtension->Common.IsFDO);
-	
-	Fdo = DeviceExtension->AttachedFdo;
-	ASSERT(Fdo);
-	DPRINT("Serenum: calling attached Fdo 0x%p [%wZ]\n",
-		Fdo, &Fdo->DriverObject->DriverName);
-	IoSkipCurrentIrpStackLocation(Irp);
-	return IoCallDriver(Fdo, Irp);
-}
-
-NTSTATUS STDCALL
-ForwardIrpAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PDEVICE_OBJECT LowerDevice;
-	
-	ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO);
-	LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice;
-	ASSERT(LowerDevice);
-	
-	IoSkipCurrentIrpStackLocation(Irp);
-	return IoCallDriver(LowerDevice, Irp);
-}

drivers/bus/serenum/pdo.c

@@ -1,314 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Serial enumerator driver
- * FILE:            drivers/bus/serenum/pdo.c
- * PURPOSE:         IRP_MJ_PNP operations for PDOs
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "serenum.h"
-
-static NTSTATUS
-SerenumPdoStartDevice(
-	IN PDEVICE_OBJECT DeviceObject)
-{
-	PPDO_DEVICE_EXTENSION DeviceExtension;
-	
-	DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	
-	ASSERT(DeviceExtension->Common.PnpState == dsStopped);
-	
-	DeviceExtension->Common.PnpState = dsStarted;
-	return STATUS_SUCCESS;
-}
-
-static NTSTATUS
-SerenumPdoQueryId(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp,
-	OUT ULONG_PTR* Information)
-{
-	PPDO_DEVICE_EXTENSION DeviceExtension;
-	ULONG IdType;
-	PUNICODE_STRING SourceString;
-	UNICODE_STRING String;
-	NTSTATUS Status;
-	
-	IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType;
-	DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	RtlInitUnicodeString(&String, NULL);
-	
-	switch (IdType)
-	{
-		case BusQueryDeviceID:
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n");
-			SourceString = &DeviceExtension->DeviceId;
-			break;
-		}
-		case BusQueryHardwareIDs:
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n");
-			SourceString = &DeviceExtension->HardwareIds;
-			break;
-		}
-		case BusQueryCompatibleIDs:
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n");
-			SourceString = &DeviceExtension->CompatibleIds;
-			break;
-		case BusQueryInstanceID:
-		{
-			/* We don't have any instance id to report, and
-			 * this query is optional, so ignore it.
-			 */
-			*Information = Irp->IoStatus.Information;
-			return Irp->IoStatus.Status;
-		}
-		default:
-			DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType);
-			return STATUS_NOT_SUPPORTED;
-	}
-	
-	Status = SerenumDuplicateUnicodeString(
-		&String,
-		SourceString,
-		PagedPool);
-	*Information = (ULONG_PTR)String.Buffer;
-	return Status;
-}
-
-static NTSTATUS
-SerenumPdoQueryDeviceRelations(
-	IN PDEVICE_OBJECT DeviceObject,
-	OUT PDEVICE_RELATIONS* pDeviceRelations)
-{
-	PFDO_DEVICE_EXTENSION DeviceExtension;
-	PDEVICE_RELATIONS DeviceRelations;
-	
-	DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ASSERT(DeviceExtension->Common.IsFDO);
-	
-	DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(
-		PagedPool,
-		sizeof(DEVICE_RELATIONS),
-		SERENUM_TAG);
-	if (!DeviceRelations)
-		return STATUS_INSUFFICIENT_RESOURCES;
-	
-	ObReferenceObject(DeviceObject);
-	DeviceRelations->Count = 1;
-	DeviceRelations->Objects[0] = DeviceObject;
-	
-	*pDeviceRelations = DeviceRelations;
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-SerenumPdoPnp(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	ULONG MinorFunction;
-	PIO_STACK_LOCATION Stack;
-	ULONG_PTR Information = 0;
-	NTSTATUS Status;
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	MinorFunction = Stack->MinorFunction;
-	
-	switch (MinorFunction)
-	{
-		/* FIXME: do all these minor functions
-		IRP_MN_QUERY_REMOVE_DEVICE 0x1
-		IRP_MN_REMOVE_DEVICE 0x2
-		IRP_MN_CANCEL_REMOVE_DEVICE 0x3
-		IRP_MN_STOP_DEVICE 0x4
-		IRP_MN_QUERY_STOP_DEVICE 0x5
-		IRP_MN_CANCEL_STOP_DEVICE 0x6
-		IRP_MN_QUERY_DEVICE_RELATIONS / EjectionRelations (optional) 0x7
-		IRP_MN_QUERY_INTERFACE (required or optional) 0x8
-		IRP_MN_READ_CONFIG (required or optional) 0xf
-		IRP_MN_WRITE_CONFIG (required or optional) 0x10
-		IRP_MN_EJECT (required or optional) 0x11
-		IRP_MN_SET_LOCK (required or optional) 0x12
-		IRP_MN_QUERY_ID / BusQueryDeviceID 0x13
-		IRP_MN_QUERY_ID / BusQueryCompatibleIDs (optional) 0x13
-		IRP_MN_QUERY_ID / BusQueryInstanceID (optional) 0x13
-		IRP_MN_QUERY_PNP_DEVICE_STATE (optional) 0x14
-		IRP_MN_DEVICE_USAGE_NOTIFICATION (required or optional) 0x16
-		IRP_MN_SURPRISE_REMOVAL 0x17
-		*/
-		case IRP_MN_START_DEVICE: /* 0x0 */
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_START_DEVICE\n");
-			Status = SerenumPdoStartDevice(DeviceObject);
-			break;
-		}
-		case IRP_MN_QUERY_DEVICE_RELATIONS: /* 0x7 */
-		{
-			switch (Stack->Parameters.QueryDeviceRelations.Type)
-			{
-				case  RemovalRelations:
-				{
-					return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp);
-				}
-				case TargetDeviceRelation:
-				{
-					PDEVICE_RELATIONS DeviceRelations;
-					DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n");
-					Status = SerenumPdoQueryDeviceRelations(DeviceObject, &DeviceRelations);
-					Information = (ULONG_PTR)DeviceRelations;
-					break;
-				}
-				default:
-				{
-					DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", 
-						Stack->Parameters.QueryDeviceRelations.Type);
-					Status = STATUS_NOT_IMPLEMENTED;
-					break;
-				}
-			}
-			break;
-		}
-		case IRP_MN_QUERY_CAPABILITIES: /* 0x9 */
-		{
-			PDEVICE_CAPABILITIES DeviceCapabilities;
-			ULONG i;
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n");
-			
-			DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities;
-			/* FIXME: capabilities can change with connected device */
-			DeviceCapabilities->LockSupported = FALSE;
-			DeviceCapabilities->EjectSupported = FALSE;
-			DeviceCapabilities->Removable = TRUE;
-			DeviceCapabilities->DockDevice = FALSE;
-			DeviceCapabilities->UniqueID = FALSE;
-			DeviceCapabilities->SilentInstall = FALSE;
-			DeviceCapabilities->RawDeviceOK = TRUE;
-			DeviceCapabilities->SurpriseRemovalOK = TRUE;
-			DeviceCapabilities->HardwareDisabled = FALSE; /* FIXME */
-			//DeviceCapabilities->NoDisplayInUI = FALSE; /* FIXME */
-			DeviceCapabilities->DeviceState[0] = PowerDeviceD0; /* FIXME */
-			for (i = 0; i < PowerSystemMaximum; i++)
-				DeviceCapabilities->DeviceState[i] = PowerDeviceD3; /* FIXME */
-			//DeviceCapabilities->DeviceWake = PowerDeviceUndefined; /* FIXME */
-			DeviceCapabilities->D1Latency = 0; /* FIXME */
-			DeviceCapabilities->D2Latency = 0; /* FIXME */
-			DeviceCapabilities->D3Latency = 0; /* FIXME */
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IRP_MN_QUERY_RESOURCES: /* 0xa */
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n");
-			/* Serial devices don't need resources, except the ones of
-			 * the serial port. This PDO is the serial device PDO, so
-			 * report no resource by not changing Information and
-			 * Status
-			 */
-			Information = Irp->IoStatus.Information;
-			Status = Irp->IoStatus.Status;
-			break;
-		}
-		case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: /* 0xb */
-		{
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n");
-			/* Serial devices don't need resources, except the ones of
-			 * the serial port. This PDO is the serial device PDO, so
-			 * report no resource by not changing Information and
-			 * Status
-			 */
-			Information = Irp->IoStatus.Information;
-			Status = Irp->IoStatus.Status;
-			break;
-		}
-		case IRP_MN_QUERY_DEVICE_TEXT: /* 0xc */
-		{
-			switch (Stack->Parameters.QueryDeviceText.DeviceTextType)
-			{
-				case DeviceTextDescription:
-				{
-					PUNICODE_STRING Source;
-					PWSTR Description;
-					DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n");
-					
-					Source = &((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->DeviceDescription;
-					Description = ExAllocatePool(PagedPool, Source->Length + sizeof(WCHAR));
-					if (!Description)
-						Status = STATUS_INSUFFICIENT_RESOURCES;
-					else
-					{
-						RtlCopyMemory(Description, Source->Buffer, Source->Length);
-						Description[Source->Length / sizeof(WCHAR)] = L'\0';
-						Information = (ULONG_PTR)Description;
-						Status = STATUS_SUCCESS;
-					}
-					break;
-				}
-				case DeviceTextLocationInformation:
-				{
-					/* We don't have any text location to report,
-					 * and this query is optional, so ignore it.
-					 */
-					Information = Irp->IoStatus.Information;
-					Status = Irp->IoStatus.Status;
-					break;
-				}
-				default:
-				{
-					DPRINT1("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n",
-						Stack->Parameters.QueryDeviceText.DeviceTextType);
-					Status = STATUS_NOT_SUPPORTED;
-				}
-			}
-			break;
-		}
-		case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0xd */
-		{
-			return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp);
-		}
-		case IRP_MN_QUERY_ID: /* 0x13 */
-		{
-			Status = SerenumPdoQueryId(DeviceObject, Irp, &Information);
-			break;
-		}
-		case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */
-		{
-			PPNP_BUS_INFORMATION BusInfo;
-			DPRINT("Serenum: IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n");
-			
-			BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION));
-			if (!BusInfo)
-				Status = STATUS_INSUFFICIENT_RESOURCES;
-			else
-			{
-				BusInfo->BusTypeGuid = GUID_BUS_TYPE_SERENUM;
-				/* FIXME: real value should be PNPBus, but PNPBus seems to be
-				 * the only value in INTERFACE_TYPE enum that doesn't work...
-				 */
-				BusInfo->LegacyBusType = PNPISABus;
-				/* We're the only serial bus enumerator on the computer */
-				BusInfo->BusNumber = 0;
-				Information = (ULONG_PTR)BusInfo;
-				Status = STATUS_SUCCESS;
-			}
-			break;
-		}
-		default:
-		{
-			/* We can't forward request to the lower driver, because
-			 * we are a Pdo, so we don't have lower driver... */
-			DPRINT1("Serenum: IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction);
-			Information = Irp->IoStatus.Information;
-			Status = Irp->IoStatus.Status;
-		}
-	}
-	
-	Irp->IoStatus.Information = Information;
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/bus/serenum/serenum.c

@@ -1,112 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Serial enumerator driver
- * FILE:            drivers/bus/serenum/serenum.c
- * PURPOSE:         Serial enumeration driver entry point
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-//#define NDEBUG
-#define INITGUID
-#include "serenum.h"
-
-NTSTATUS STDCALL
-SerenumPnp(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO)
-		return SerenumFdoPnp(DeviceObject, Irp);
-	else
-		return SerenumPdoPnp(DeviceObject, Irp);
-}
-
-VOID STDCALL
-DriverUnload(IN PDRIVER_OBJECT DriverObject)
-{
-	// nothing to do here yet
-}
-
-NTSTATUS STDCALL
-IrpStub(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	NTSTATUS Status = STATUS_NOT_SUPPORTED;
-	
-	if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO)
-	{
-		/* Forward some IRPs to lower device */
-		switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction)
-		{
-			case IRP_MJ_CREATE:
-			case IRP_MJ_CLOSE:
-			case IRP_MJ_CLEANUP:
-			case IRP_MJ_READ:
-			case IRP_MJ_WRITE:
-			case IRP_MJ_DEVICE_CONTROL:
-				return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp);
-			default:
-			{
-				DPRINT1("Serenum: FDO stub for major function 0x%lx\n",
-					IoGetCurrentIrpStackLocation(Irp)->MajorFunction);
-#ifndef NDEBUG
-				DbgBreakPoint();
-#endif
-				Status = Irp->IoStatus.Status;
-			}
-		}
-	}
-	else
-	{
-		/* Forward some IRPs to attached FDO */
-		switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction)
-		{
-			case IRP_MJ_CREATE:
-			case IRP_MJ_CLOSE:
-			case IRP_MJ_CLEANUP:
-			case IRP_MJ_READ:
-			case IRP_MJ_WRITE:
-			case IRP_MJ_DEVICE_CONTROL:
-				return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp);
-			default:
-			{
-				DPRINT1("Serenum: PDO stub for major function 0x%lx\n",
-					IoGetCurrentIrpStackLocation(Irp)->MajorFunction);
-#ifndef NDEBUG
-				DbgBreakPoint();
-#endif
-				Status = Irp->IoStatus.Status;
-			}
-		}
-	}
-	
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return Status;
-}
-
-/*
- * Standard DriverEntry method.
- */
-NTSTATUS STDCALL
-DriverEntry(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PUNICODE_STRING RegPath)
-{
-	ULONG i;
-	
-	DriverObject->DriverUnload = DriverUnload;
-	DriverObject->DriverExtension->AddDevice = SerenumAddDevice;
-	
-	for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++)
-		DriverObject->MajorFunction[i] = IrpStub;
-	
-	//DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation;
-	DriverObject->MajorFunction[IRP_MJ_PNP] = SerenumPnp;
-	//DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower;
-	
-	return STATUS_SUCCESS;
-}

drivers/bus/serenum/serenum.h

@@ -1,152 +0,0 @@
-#if defined(__GNUC__)
-  #include <ddk/ntddk.h>
-  #include <ddk/ntddser.h>
-  #include <ddk/wdmguid.h>
-  #include <stdio.h>
-  
-  #include <debug.h>
-
-  #define SR_MSR_DSR 0x20
-  #define ExFreePoolWithTag(p, tag) ExFreePool(p)
-  
-  /* FIXME: these prototypes MUST NOT be here! */
-  NTSTATUS STDCALL
-  IoAttachDeviceToDeviceStackSafe(
-    IN PDEVICE_OBJECT SourceDevice,
-    IN PDEVICE_OBJECT TargetDevice,
-    OUT PDEVICE_OBJECT *AttachedToDeviceObject);
-  
-#elif defined(_MSC_VER)
-  #include <ntddk.h>
-  #include <ntddser.h>
-  #include <c:/progra~1/winddk/inc/ddk/wdm/wxp/wdmguid.h>
-  #include <stdio.h>
-  
-  #define STDCALL
-  
-  #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
-  #define CHECKPOINT1 DbgPrint("(%s:%d)\n")
-  
-  #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
-  
-  NTSTATUS STDCALL
-  IoAttachDeviceToDeviceStackSafe(
-    IN PDEVICE_OBJECT SourceDevice,
-    IN PDEVICE_OBJECT TargetDevice,
-    OUT PDEVICE_OBJECT *AttachedToDeviceObject);
-  
-  #define DPRINT DPRINT1
-  #define CHECKPOINT CHECKPOINT1
-  
-  #define SR_MSR_DSR 0x20
-#else
-  #error Unknown compiler!
-#endif
-
-typedef enum
-{
-  dsStopped,
-  dsStarted,
-  dsPaused,
-  dsRemoved,
-  dsSurpriseRemoved
-} SERENUM_DEVICE_STATE;
-
-typedef struct _COMMON_DEVICE_EXTENSION
-{
-	BOOLEAN IsFDO;
-	SERENUM_DEVICE_STATE PnpState;
-} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION;
-
-typedef struct _FDO_DEVICE_EXTENSION
-{
-	COMMON_DEVICE_EXTENSION Common;
-	
-	PDEVICE_OBJECT LowerDevice;
-	PDEVICE_OBJECT Pdo;
-	IO_REMOVE_LOCK RemoveLock;
-	
-	PDEVICE_OBJECT AttachedPdo;
-	ULONG Flags;
-} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION;
-
-typedef struct _PDO_DEVICE_EXTENSION
-{
-	COMMON_DEVICE_EXTENSION Common;
-	
-	PDEVICE_OBJECT AttachedFdo;
-	
-	UNICODE_STRING DeviceDescription; // REG_SZ
-	UNICODE_STRING DeviceId;          // REG_SZ
-	UNICODE_STRING HardwareIds;       // REG_MULTI_SZ
-	UNICODE_STRING CompatibleIds;     // REG_MULTI_SZ
-} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION;
-
-#define SERENUM_TAG TAG('S', 'e', 'r', 'e')
-
-/* Flags */
-#define FLAG_ENUMERATION_DONE    0x01
-
-/************************************ detect.c */
-
-NTSTATUS
-SerenumDetectPnpDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PDEVICE_OBJECT LowerDevice);
-
-NTSTATUS
-SerenumDetectLegacyDevice(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PDEVICE_OBJECT LowerDevice);
-
-/************************************ fdo.c */
-
-NTSTATUS STDCALL
-SerenumAddDevice(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PDEVICE_OBJECT Pdo);
-
-NTSTATUS
-SerenumFdoPnp(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-/************************************ misc.c */
-
-NTSTATUS
-SerenumDuplicateUnicodeString(
-  OUT PUNICODE_STRING Destination,
-  IN PUNICODE_STRING Source,
-  IN POOL_TYPE PoolType);
-
-NTSTATUS
-SerenumInitMultiSzString(
-	OUT PUNICODE_STRING Destination,
-	... /* list of ANSI_STRINGs */);
-
-NTSTATUS
-ForwardIrpAndWait(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-NTSTATUS STDCALL
-ForwardIrpToLowerDeviceAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-NTSTATUS STDCALL
-ForwardIrpToAttachedFdoAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-NTSTATUS STDCALL
-ForwardIrpAndForget(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-/************************************ pdo.c */
-
-NTSTATUS
-SerenumPdoPnp(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);

drivers/bus/serenum/serenum.rc

@@ -1,7 +0,0 @@
-/* $Id$ */
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"Serial port enumerator\0"
-#define REACTOS_STR_INTERNAL_NAME	"serenum\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"serenum.sys\0"
-#include <reactos/version.rc>

drivers/dd/green/createclose.c

@@ -1,38 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/createclose.c
- * PURPOSE:         IRP_MJ_CREATE, IRP_MJ_CLOSE and IRP_MJ_CLEANUP operations
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-//#define NDEBUG
-#include "green.h"
-
-NTSTATUS STDCALL
-GreenCreate(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	DPRINT("Green: IRP_MJ_CREATE\n");
-	
-	Irp->IoStatus.Status = STATUS_SUCCESS;
-	Irp->IoStatus.Information = 0;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS STDCALL
-GreenClose(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	DPRINT("Green: IRP_MJ_CLOSE\n");
-	
-	Irp->IoStatus.Status = STATUS_SUCCESS;
-	Irp->IoStatus.Information = 0;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return STATUS_SUCCESS;
-}

drivers/dd/green/dispatch.c

@@ -1,65 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/dispatch.c
- * PURPOSE:         Dispatch routines
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "green.h"
-
-NTSTATUS STDCALL
-GreenDispatch(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	ULONG MajorFunction;
-	GREEN_DEVICE_TYPE DeviceType;
-	ULONG_PTR Information;
-	NTSTATUS Status;
-	
-	MajorFunction = IoGetCurrentIrpStackLocation(Irp)->MajorFunction;
-	DeviceType = ((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Type;
-	
-	Information = Irp->IoStatus.Information;
-	Status = Irp->IoStatus.Status;
-	
-	DPRINT("Green: Dispatching major function 0x%lx, DeviceType %d\n",
-		MajorFunction, DeviceType);
-	
-	if (MajorFunction == IRP_MJ_CREATE && DeviceType == Green)
-		return GreenCreate(DeviceObject, Irp);
-	else if (MajorFunction == IRP_MJ_CLOSE && DeviceType == Green)
-		return GreenClose(DeviceObject, Irp);
-	else if (MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL && DeviceType == Green)
-	{
-		return KeyboardInternalDeviceControl(
-			((PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Keyboard,
-			Irp);
-	}
-	else if (MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL && DeviceType == Keyboard)
-		return KeyboardInternalDeviceControl(DeviceObject, Irp);
-	else if (MajorFunction == IRP_MJ_DEVICE_CONTROL && DeviceType == Green)
-	{
-		return ScreenDeviceControl(
-			((PGREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Screen,
-			Irp);
-	}
-	else if (MajorFunction == IRP_MJ_DEVICE_CONTROL && DeviceType == Screen)
-		return ScreenDeviceControl(DeviceObject, Irp);
-	else if (MajorFunction == IRP_MJ_WRITE && DeviceType == Screen)
-		return ScreenWrite(DeviceObject, Irp);
-	else
-	{
-		DPRINT1("Green: unknown combination: MajorFunction 0x%lx, DeviceType %d\n",
-			MajorFunction, DeviceType);
-	}
-	
-	Irp->IoStatus.Information = Information;
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest (Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/dd/green/green.c

@@ -1,44 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/green.c
- * PURPOSE:         Driver entry point
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-//#define NDEBUG
-#include "green.h"
-
-VOID STDCALL
-DriverUnload(IN PDRIVER_OBJECT DriverObject)
-{
-	// nothing to do here yet
-}
-
-/*
- * Standard DriverEntry method.
- */
-NTSTATUS STDCALL
-DriverEntry(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PUNICODE_STRING RegPath)
-{
-	ULONG i;
-	
-	DriverObject->DriverUnload = DriverUnload;
-	DriverObject->DriverExtension->AddDevice = GreenAddDevice;
-	
-	for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++)
-		DriverObject->MajorFunction[i] = GreenDispatch;
-	
-	/* keyboard only */
-	//DriverObject->DriverStartIo = GreenStartIo;
-	
-	/* keyboard and screen */
-	DriverObject->MajorFunction[IRP_MJ_CREATE] = GreenCreate;
-	DriverObject->MajorFunction[IRP_MJ_CLOSE] = GreenClose;
-	
-	return STATUS_SUCCESS;
-}

drivers/dd/green/green.h

@@ -1,179 +0,0 @@
-#if defined(__GNUC__)
-  #include <ddk/ntddk.h>
-  #include <ddk/ntddser.h>
-  #include <ntos/halfuncs.h>
-  #include <ddk/ntddblue.h>
-  #include <ddk/ntddkbd.h> /* should be in kbdmou.h */
-  
-  #include <debug.h>
-  
-  /* FIXME: should be in kbdmou.h */
-  typedef struct _CONNECT_DATA {
-    PDEVICE_OBJECT ClassDeviceObject;
-    PVOID ClassService;
-  } CONNECT_DATA, *PCONNECT_DATA;
-  
-  /* FIXME: should be in kbdmou.h */
-  #define IOCTL_INTERNAL_KEYBOARD_CONNECT \
-    CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
-  
-  NTSTATUS STDCALL
-  ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
-    ULONG Attributes,
-    PACCESS_STATE PassedAccessState,
-    ACCESS_MASK DesiredAccess,
-    POBJECT_TYPE ObjectType,
-    KPROCESSOR_MODE AccessMode,
-    PVOID ParseContext,
-    PVOID* ObjectPtr);
-  
-  /* FIXME: should be in kbdmou.h */
-  typedef VOID (*PSERVICE_CALLBACK_ROUTINE)(PDEVICE_OBJECT, PKEYBOARD_INPUT_DATA, PKEYBOARD_INPUT_DATA, PULONG);
-  
-  typedef struct _CLASS_INFORMATION
-  {
-    PDEVICE_OBJECT DeviceObject;
-    PVOID CallBack;
-  } CLASS_INFORMATION, *PCLASS_INFORMATION;
-  
-  #define KEYBOARD_BUFFER_SIZE 100
-  
-#elif defined(_MSC_VER)
-  #include <ntddk.h>
-  #include <ntddser.h>
-  #include <kbdmou.h>
-
-  #define STDCALL
-  
-  #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint
-  #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__)
-  #define DPRINT DPRINT1
-  #define CHECKPOINT CHECKPOINT1
-#else
-  #error Unknown compiler!
-#endif
-
-typedef enum
-{
-	Green,
-	Screen,
-	Keyboard
-} GREEN_DEVICE_TYPE;
-
-typedef struct _COMMON_DEVICE_EXTENSION
-{
-	GREEN_DEVICE_TYPE Type;
-} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION;
-
-typedef struct _KEYBOARD_DEVICE_EXTENSION
-{
-	COMMON_DEVICE_EXTENSION Common;
-	PDEVICE_OBJECT Green;
-	
-	CLASS_INFORMATION ClassInformation;
-	HANDLE WorkerThreadHandle;
-	KDPC KeyboardDpc;
-	
-	ULONG ActiveQueue;
-	ULONG InputDataCount[2];
-	KEYBOARD_INPUT_DATA KeyboardInputData[2][KEYBOARD_BUFFER_SIZE];
-} KEYBOARD_DEVICE_EXTENSION, *PKEYBOARD_DEVICE_EXTENSION;
-
-typedef struct _SCREEN_DEVICE_EXTENSION
-{
-	COMMON_DEVICE_EXTENSION Common;
-	PDEVICE_OBJECT Green;
-	
-	PUCHAR VideoMemory;   /* Pointer to video memory */
-	USHORT CharAttribute; /* Current color attribute */
-	ULONG  Mode;
-	UCHAR  ScanLines;     /* Height of a text line   */
-	UCHAR  Rows;          /* Number of rows          */
-	UCHAR  Columns;       /* Number of columns       */
-	UCHAR  TabWidth;
-	
-	ULONG LogicalOffset;  /* Position of the cursor  */
-	
-	UCHAR SendBuffer[1024];
-	ULONG SendBufferPosition;
-} SCREEN_DEVICE_EXTENSION, *PSCREEN_DEVICE_EXTENSION;
-
-typedef struct _GREEN_DEVICE_EXTENSION
-{
-	COMMON_DEVICE_EXTENSION Common;
-	PDEVICE_OBJECT Serial;
-	
-	PDEVICE_OBJECT LowerDevice;
-	ULONG BaudRate;
-	SERIAL_LINE_CONTROL LineControl;
-	SERIAL_TIMEOUTS Timeouts;
-	
-	PDEVICE_OBJECT Keyboard;
-	PDEVICE_OBJECT Screen;
-} GREEN_DEVICE_EXTENSION, *PGREEN_DEVICE_EXTENSION;
-
-/************************************ createclose.c */
-
-NTSTATUS STDCALL
-GreenCreate(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-NTSTATUS STDCALL
-GreenClose(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-/************************************ dispatch.c */
-
-NTSTATUS STDCALL
-GreenDispatch(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-/************************************ keyboard.c */
-
-NTSTATUS
-KeyboardInitialize(
-	IN PDRIVER_OBJECT DriverObject,
-	OUT PDEVICE_OBJECT* KeyboardFdo);
-
-NTSTATUS
-KeyboardInternalDeviceControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-/************************************ misc.c */
-
-NTSTATUS
-GreenDeviceIoControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN ULONG CtlCode,
-	IN PVOID InputBuffer OPTIONAL,
-	IN ULONG InputBufferSize,
-	IN OUT PVOID OutputBuffer OPTIONAL,
-	IN OUT PULONG OutputBufferSize);
-
-/************************************ pnp.c */
-
-NTSTATUS STDCALL
-GreenAddDevice(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PDEVICE_OBJECT Pdo);
-
-/************************************ screen.c */
-
-NTSTATUS
-ScreenInitialize(
-	IN PDRIVER_OBJECT DriverObject,
-	OUT PDEVICE_OBJECT* ScreenFdo);
-
-NTSTATUS
-ScreenWrite(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);
-
-NTSTATUS
-ScreenDeviceControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp);

drivers/dd/green/green.rc

@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"VT100 Server Driver\0"
-#define REACTOS_STR_INTERNAL_NAME	"green\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"green.sys\0"
-#include <reactos/version.rc>

drivers/dd/green/keyboard.c

@@ -1,346 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/keyboard.c
- * PURPOSE:         Keyboard part of green management
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "green.h"
-
-static BOOLEAN
-TranslateCharToScanCodes(
-	IN PUCHAR InputBuffer,
-	IN ULONG InputBufferSize,
-	OUT KEYBOARD_INPUT_DATA* OutputBuffer,
-	OUT PULONG OutputBufferSize,
-	OUT PULONG BytesConsumed)
-{
-	BOOLEAN NormalKey = FALSE;
-	USHORT MakeCode;
-	
-	if (InputBufferSize == 0)
-		return FALSE;
-	
-	switch (*InputBuffer)
-	{
-		case 0x1b: MakeCode = 0x01; NormalKey = TRUE; break; /* ESC */
-		
-		case '1': MakeCode = 0x02; NormalKey = TRUE; break;
-		case '2': MakeCode = 0x03; NormalKey = TRUE; break;
-		case '3': MakeCode = 0x04; NormalKey = TRUE; break;
-		case '4': MakeCode = 0x05; NormalKey = TRUE; break;
-		case '5': MakeCode = 0x06; NormalKey = TRUE; break;
-		case '6': MakeCode = 0x07; NormalKey = TRUE; break;
-		case '7': MakeCode = 0x08; NormalKey = TRUE; break;
-		case '8': MakeCode = 0x09; NormalKey = TRUE; break;
-		case '9': MakeCode = 0x0a; NormalKey = TRUE; break;
-		case '0': MakeCode = 0x0b; NormalKey = TRUE; break;
-		case '-': MakeCode = 0x0c; NormalKey = TRUE; break;
-		case '=': MakeCode = 0x0d; NormalKey = TRUE; break;
-		case '\b': MakeCode = 0x0e; NormalKey = TRUE; break;
-		
-		case '\t': MakeCode = 0x0f; NormalKey = TRUE; break;
-		case 'q': MakeCode = 0x10; NormalKey = TRUE; break;
-		case 'w': MakeCode = 0x11; NormalKey = TRUE; break;
-		case 'e': MakeCode = 0x12; NormalKey = TRUE; break;
-		case 'r': MakeCode = 0x13; NormalKey = TRUE; break;
-		case 't': MakeCode = 0x14; NormalKey = TRUE; break;
-		case 'y': MakeCode = 0x15; NormalKey = TRUE; break;
-		case 'u': MakeCode = 0x16; NormalKey = TRUE; break;
-		case 'i': MakeCode = 0x17; NormalKey = TRUE; break;
-		case 'o': MakeCode = 0x18; NormalKey = TRUE; break;
-		case 'p': MakeCode = 0x19; NormalKey = TRUE; break;
-		case '[': MakeCode = 0x1a; NormalKey = TRUE; break;
-		case ']': MakeCode = 0x1b; NormalKey = TRUE; break;
-		
-		case '\r': MakeCode = 0x1c; NormalKey = TRUE; break;
-		
-		case 'a': MakeCode = 0x1e; NormalKey = TRUE; break;
-		case 's': MakeCode = 0x1f; NormalKey = TRUE; break;
-		case 'd': MakeCode = 0x20; NormalKey = TRUE; break;
-		case 'f': MakeCode = 0x21; NormalKey = TRUE; break;
-		case 'g': MakeCode = 0x22; NormalKey = TRUE; break;
-		case 'h': MakeCode = 0x23; NormalKey = TRUE; break;
-		case 'j': MakeCode = 0x24; NormalKey = TRUE; break;
-		case 'k': MakeCode = 0x25; NormalKey = TRUE; break;
-		case 'l': MakeCode = 0x26; NormalKey = TRUE; break;
-		case ';': MakeCode = 0x27; NormalKey = TRUE; break;
-		case '\'': MakeCode = 0x28; NormalKey = TRUE; break;
-		
-		case '`': MakeCode = 0x29; NormalKey = TRUE; break;
-		
-		case '\\': MakeCode = 0x2b; NormalKey = TRUE; break;
-		
-		case 'z': MakeCode = 0x2c; NormalKey = TRUE; break;
-		case 'x': MakeCode = 0x2d; NormalKey = TRUE; break;
-		case 'c': MakeCode = 0x2e; NormalKey = TRUE; break;
-		case 'v': MakeCode = 0x2f; NormalKey = TRUE; break;
-		case 'b': MakeCode = 0x30; NormalKey = TRUE; break;
-		case 'n': MakeCode = 0x31; NormalKey = TRUE; break;
-		case 'm': MakeCode = 0x32; NormalKey = TRUE; break;
-		case ',': MakeCode = 0x33; NormalKey = TRUE; break;
-		case '.': MakeCode = 0x34; NormalKey = TRUE; break;
-		case '/': MakeCode = 0x35; NormalKey = TRUE; break;
-		
-		case ' ': MakeCode = 0x39; NormalKey = TRUE; break;
-	}
-	if (NormalKey && *OutputBufferSize >= 2)
-	{
-		OutputBuffer[0].MakeCode = MakeCode;
-		OutputBuffer[0].Flags = KEY_MAKE;
-		OutputBuffer[1].MakeCode = MakeCode;
-		OutputBuffer[1].Flags = KEY_BREAK;
-		*BytesConsumed = 2;
-		return TRUE;
-	}
-	
-	/* Consume strange character by ignoring it */
-	DPRINT1("Green: strange byte received 0x%02x ('%c')\n",
-		*InputBuffer, *InputBuffer >= 32 ? *InputBuffer : '.');
-	*BytesConsumed = 1;
-	return TRUE;
-}
-
-NTSTATUS
-KeyboardInitialize(
-	IN PDRIVER_OBJECT DriverObject,
-	OUT PDEVICE_OBJECT* KeyboardFdo)
-{
-	PDEVICE_OBJECT Fdo;
-	PKEYBOARD_DEVICE_EXTENSION DeviceExtension;
-	UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass1");
-	NTSTATUS Status;
-	
-	DPRINT("Green: KeyboardInitialize() called\n");
-	
-	Status = IoCreateDevice(DriverObject,
-		sizeof(KEYBOARD_DEVICE_EXTENSION),
-		&DeviceName, /* FIXME: don't hardcode string */
-		FILE_DEVICE_KEYBOARD,
-		FILE_DEVICE_SECURE_OPEN,
-		TRUE,
-		&Fdo);
-	if (!NT_SUCCESS(Status))
-		return Status;
-	
-	DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)Fdo->DeviceExtension;
-	RtlZeroMemory(DeviceExtension, sizeof(KEYBOARD_DEVICE_EXTENSION));
-	DeviceExtension->Common.Type = Keyboard;
-	Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO;
-	Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
-	
-	*KeyboardFdo = Fdo;
-	
-	return STATUS_SUCCESS;
-}
-
-static VOID STDCALL
-KeyboardDpcSendData(
-	IN PKDPC Dpc,
-	IN PVOID pDeviceExtension, /* real type PKEYBOARD_DEVICE_EXTENSION */
-	IN PVOID Unused1,
-	IN PVOID Unused2)
-{
-	PKEYBOARD_DEVICE_EXTENSION DeviceExtension;
-	ULONG Queue;
-	ULONG InputDataConsumed;
-	
-	DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)pDeviceExtension;
-	
-	Queue = DeviceExtension->ActiveQueue % 2;
-	InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue);
-	(*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack)(
-			DeviceExtension->ClassInformation.DeviceObject,
-			DeviceExtension->KeyboardInputData[Queue],
-			&DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCount[Queue]],
-			&InputDataConsumed);
-	
-	DeviceExtension->InputDataCount[Queue] = 0;
-}
-static VOID STDCALL
-KeyboardDeviceWorker(
-	PVOID Context)
-{
-	PDEVICE_OBJECT DeviceObject;
-	PKEYBOARD_DEVICE_EXTENSION DeviceExtension;
-	PGREEN_DEVICE_EXTENSION GreenDeviceExtension;
-	PDEVICE_OBJECT LowerDevice;
-	UCHAR Buffer[16]; /* Arbitrary size */
-	ULONG BufferSize;
-	PIRP Irp;
-	IO_STATUS_BLOCK ioStatus;
-	KEVENT event;
-	KIRQL OldIrql;
-	ULONG i, Queue;
-	ULONG SpaceInQueue;
-	ULONG BytesConsumed;
-	PKEYBOARD_INPUT_DATA Input;
-	NTSTATUS Status;
-	
-	DPRINT("Green: KeyboardDeviceWorker() called\n");
-	
-	DeviceObject = (PDEVICE_OBJECT)Context;
-	DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	GreenDeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension;
-	LowerDevice = GreenDeviceExtension->Serial;
-	BufferSize = sizeof(Buffer);
-	
-	/* Initialize device extension */
-	DeviceExtension->ActiveQueue = 0;
-	DeviceExtension->InputDataCount[0] = 0;
-	DeviceExtension->InputDataCount[1] = 0;
-	KeInitializeDpc(&DeviceExtension->KeyboardDpc, KeyboardDpcSendData, DeviceExtension);
-	RtlZeroMemory(&DeviceExtension->KeyboardInputData, sizeof(DeviceExtension->KeyboardInputData));
-	
-	/* main read loop */
-	while (TRUE)
-	{
-		KeInitializeEvent(&event, NotificationEvent, FALSE);
-		Irp = IoBuildSynchronousFsdRequest(
-			IRP_MJ_READ,
-			LowerDevice,
-			Buffer, BufferSize,
-			0,
-			&event,
-			&ioStatus);
-		if (!Irp)
-		{
-			/* no memory actually, try later */
-			CHECKPOINT;
-			KeStallExecutionProcessor(10);
-			continue;
-		}
-		
-		Status = IoCallDriver(LowerDevice, Irp);
-		if (Status == STATUS_PENDING)
-		{
-			KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL);
-			Status = ioStatus.Status;
-		}
-		if (!NT_SUCCESS(Status))
-			continue;
-		
-		/* Read all available data and process */
-		i = 0;
-		while (i < ioStatus.Information)
-		{
-			Queue = DeviceExtension->ActiveQueue % 2;
-			
-			Input = &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCount[Queue]];
-			
-			/* Translate current chars to scan codes */
-			SpaceInQueue = KEYBOARD_BUFFER_SIZE - DeviceExtension->InputDataCount[Queue];
-			if (TranslateCharToScanCodes(
-				&Buffer[i],               /* input buffer */
-				ioStatus.Information - i, /* input buffer size */
-				Input,                    /* output buffer */
-				&SpaceInQueue,            /* output buffer size */
-				&BytesConsumed))          /* bytes consumed in input buffer */
-			{
-				DPRINT1("Green: got char 0x%02x (%c)\n", Buffer[i], Buffer[i] >= 32 ? Buffer[i] : ' ');
-				DeviceExtension->InputDataCount[Queue] += BytesConsumed;
-				
-				/* Send the data to the keyboard class driver */
-				KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
-				KeInsertQueueDpc(&DeviceExtension->KeyboardDpc, NULL, NULL);
-				KeLowerIrql(OldIrql);
-				i += BytesConsumed;
-			}
-			else
-			{
-				/* TranslateCharToScanCodes failed. Possible reasons:
-				 * - not enough bytes in input buffer (escape control code; wait next received bytes)
-				 * - not enough room in output buffer (wait for the Dpc to empty it)
-				 *
-				 * The best way to resolve this is to try later.
-				 */
-				i++;
-			}
-		}
-	}
-	
-	PsTerminateSystemThread(STATUS_SUCCESS);
-}
-
-NTSTATUS
-KeyboardInternalDeviceControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PIO_STACK_LOCATION Stack;
-	PKEYBOARD_DEVICE_EXTENSION DeviceExtension;
-	PGREEN_DEVICE_EXTENSION GreenDeviceExtension;
-	OBJECT_ATTRIBUTES objectAttributes;
-	PDEVICE_OBJECT LowerDevice;
-	NTSTATUS Status;
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	Irp->IoStatus.Information = 0;
-	DeviceExtension = (PKEYBOARD_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	GreenDeviceExtension = (PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension;
-	LowerDevice = GreenDeviceExtension->Serial;
-	DPRINT1("Green: LowerDevice %p\n", LowerDevice);
-	
-	switch (Stack->Parameters.DeviceIoControl.IoControlCode)
-	{
-		case IOCTL_INTERNAL_KEYBOARD_CONNECT:
-		{
-			ULONG Fcr;
-			
-			DPRINT("Green: IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_KEYBOARD_CONNECT\n");
-			if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA))
-			{
-				Status = STATUS_INVALID_PARAMETER;
-				break;
-			}
-			
-			DeviceExtension->ClassInformation =
-				*((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer);
-			
-			/* Initialize serial port */
-			Fcr = 0;
-			Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL,
-				&Fcr, sizeof(Fcr), NULL, NULL);
-			if (!NT_SUCCESS(Status)) break;
-			/* Set serial port speed */
-			Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
-				&GreenDeviceExtension->BaudRate, sizeof(GreenDeviceExtension->BaudRate), NULL, NULL);
-			if (!NT_SUCCESS(Status)) break;
-			/* Set LCR */
-			Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL,
-				&GreenDeviceExtension->LineControl, sizeof(GreenDeviceExtension->LineControl), NULL, NULL);
-			if (!NT_SUCCESS(Status)) break;
-			
-			/* Set timeouts */
-			Status = GreenDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS,
-				&GreenDeviceExtension->Timeouts, sizeof(GreenDeviceExtension->Timeouts), NULL, NULL);
-			if (!NT_SUCCESS(Status)) break;
-			
-			/* Start read loop */
-			InitializeObjectAttributes(&objectAttributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
-			Status = PsCreateSystemThread(
-				&DeviceExtension->WorkerThreadHandle,
-				(ACCESS_MASK)0L,
-				&objectAttributes,
-				NULL,
-				NULL,
-				KeyboardDeviceWorker,
-				DeviceObject);
-			break;
-		}
-		default:
-		{
-			DPRINT("Green: IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n",
-				Stack->Parameters.DeviceIoControl.IoControlCode);
-			Status = STATUS_INVALID_DEVICE_REQUEST;
-		}
-	}
-	
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest (Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/dd/green/makefile

@@ -1,24 +0,0 @@
-# $Id:
-
-PATH_TO_TOP = ../../..
-
-TARGET_BOOTSTRAP = yes
-
-TARGET_TYPE = driver
-
-TARGET_NAME = green
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-TARGET_OBJECTS = \
-	$(TARGET_NAME).o \
-	createclose.o \
-	dispatch.o \
-	keyboard.o \
-	misc.o \
-	pnp.o \
-	screen.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

drivers/dd/green/misc.c

@@ -1,60 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/misc.c
- * PURPOSE:         Misceallenous operations
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-//#define NDEBUG
-#include "green.h"
-
-NTSTATUS
-GreenDeviceIoControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN ULONG CtlCode,
-	IN PVOID InputBuffer OPTIONAL,
-	IN ULONG InputBufferSize,
-	IN OUT PVOID OutputBuffer OPTIONAL,
-	IN OUT PULONG OutputBufferSize)
-{
-	KEVENT Event;
-	PIRP Irp;
-	IO_STATUS_BLOCK IoStatus;
-	NTSTATUS Status;
-	
-	KeInitializeEvent (&Event, NotificationEvent, FALSE);
-	
-	Irp = IoBuildDeviceIoControlRequest(CtlCode,
-		DeviceObject,
-		InputBuffer,
-		InputBufferSize,
-		OutputBuffer,
-		(OutputBufferSize) ? *OutputBufferSize : 0,
-		FALSE,
-		&Event,
-		&IoStatus);
-	if (Irp == NULL)
-	{
-		DPRINT("Green: IoBuildDeviceIoControlRequest() failed\n");
-		return STATUS_INSUFFICIENT_RESOURCES;
-	}
-	
-	Status = IoCallDriver(DeviceObject, Irp);
-	
-	if (Status == STATUS_PENDING)
-	{
-		DPRINT("Green: Operation pending\n");
-		KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL);
-		Status = IoStatus.Status;
-	}
-	
-	if (OutputBufferSize)
-	{
-		*OutputBufferSize = IoStatus.Information;
-	}
-	
-	return Status;
-}

drivers/dd/green/pnp.c

@@ -1,87 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/pnp.c
- * PURPOSE:         IRP_MJ_PNP operations
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "green.h"
-
-NTSTATUS STDCALL
-GreenAddDevice(
-	IN PDRIVER_OBJECT DriverObject,
-	IN PDEVICE_OBJECT Pdo)
-{
-	PDEVICE_OBJECT Fdo = NULL;
-	PGREEN_DEVICE_EXTENSION DeviceExtension;
-	UNICODE_STRING serialPortName;
-	NTSTATUS Status;
-	
-	DPRINT("Green: AddDevice(DriverObject %p, Pdo %p)\n", DriverObject, Pdo);
-	
-	/* Create green FDO */
-	Status = IoCreateDevice(DriverObject,
-		sizeof(GREEN_DEVICE_EXTENSION),
-		NULL,
-		FILE_DEVICE_UNKNOWN,
-		FILE_DEVICE_SECURE_OPEN,
-		TRUE,
-		&Fdo);
-	if (!NT_SUCCESS(Status))
-		return Status;
-	
-	DeviceExtension = (PGREEN_DEVICE_EXTENSION)Fdo->DeviceExtension;
-	RtlZeroMemory(DeviceExtension, sizeof(GREEN_DEVICE_EXTENSION));
-	DeviceExtension->Common.Type = Green;
-	
-	Status = KeyboardInitialize(DriverObject, &DeviceExtension->Keyboard);
-	if (!NT_SUCCESS(Status))
-	{
-		IoDeleteDevice(Fdo);
-		return Status;
-	}
-	((PKEYBOARD_DEVICE_EXTENSION)DeviceExtension->Keyboard->DeviceExtension)->Green = Fdo;
-	
-	Status = ScreenInitialize(DriverObject, &DeviceExtension->Screen);
-	if (!NT_SUCCESS(Status))
-	{
-		IoDeleteDevice(DeviceExtension->Keyboard);
-		IoDeleteDevice(Fdo);
-		return Status;
-	}
-	((PSCREEN_DEVICE_EXTENSION)DeviceExtension->Screen->DeviceExtension)->Green = Fdo;
-	
-	/* initialize green Fdo */
-	DeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(Fdo, Pdo);
-	DeviceExtension->LineControl.WordLength = 8;
-	DeviceExtension->LineControl.Parity = NO_PARITY;
-	DeviceExtension->LineControl.StopBits = STOP_BIT_1;
-	DeviceExtension->BaudRate = SERIAL_BAUD_38400;
-	DeviceExtension->Timeouts.ReadTotalTimeoutConstant = 1; /* not null */
-	DeviceExtension->Timeouts.ReadIntervalTimeout = INFINITE;
-	DeviceExtension->Timeouts.ReadTotalTimeoutMultiplier = INFINITE;
-	DeviceExtension->Timeouts.WriteTotalTimeoutMultiplier = 0; /* FIXME */
-	DeviceExtension->Timeouts.WriteTotalTimeoutConstant = 0; /* FIXME */
-	
-	/* open associated serial port */
-	RtlInitUnicodeString(&serialPortName, L"\\Device\\Serial1"); /* FIXME: don't hardcode string */
-	Status = ObReferenceObjectByName(
-		&serialPortName,
-		OBJ_EXCLUSIVE | OBJ_KERNEL_HANDLE,
-		NULL,
-		(ACCESS_MASK)0,
-		IoDeviceObjectType,
-		KernelMode,
-		NULL,
-		(PVOID*)&DeviceExtension->Serial);
-	/* FIXME: we never ObDereferenceObject */
-	
-	Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO;
-	Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
-	
-	return Status;
-}

drivers/dd/green/screen.c

@@ -1,544 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS VT100 emulator
- * FILE:            drivers/dd/green/screen.c
- * PURPOSE:         Screen part of green management
- * 
- * PROGRAMMERS:     Eric Kohl (ekohl@abo.rhein-zeitung.de)
- *                  Art Yerkes
- *                  Herv<72> Poussineau (hpoussin@reactos.com)
- */
-
-#define NDEBUG
-#include "green.h"
-#include <stdarg.h>
-
-#define ESC       ((UCHAR)0x1b)
-
-/* Force a move of the cursor on each printer char.
- * Very useful for debug, but it is very slow...
- */
-//#define FORCE_POSITION
-
-/* UCHAR is promoted to int when passed through '...',
- * so we get int with va_arg and cast them back to UCHAR.
- */
-static VOID
-AddToSendBuffer(
-	IN PSCREEN_DEVICE_EXTENSION DeviceExtension,
-	IN ULONG NumberOfChars,
-	... /* IN int */)
-{
-	PIRP Irp;
-	IO_STATUS_BLOCK ioStatus;
-	va_list args;
-	PDEVICE_OBJECT SerialDevice;
-	ULONG SizeLeft;
-	int CurrentInt;
-	UCHAR CurrentChar;
-	NTSTATUS Status;
-	
-	SizeLeft = sizeof(DeviceExtension->SendBuffer) - DeviceExtension->SendBufferPosition;
-	if (SizeLeft < NumberOfChars * 2 || NumberOfChars == 0)
-	{
-		SerialDevice = ((PGREEN_DEVICE_EXTENSION)DeviceExtension->Green->DeviceExtension)->Serial;
-		Irp = IoBuildSynchronousFsdRequest(
-			IRP_MJ_WRITE,
-			SerialDevice,
-			DeviceExtension->SendBuffer, DeviceExtension->SendBufferPosition,
-			NULL, /* StartingOffset */
-			NULL, /* Event */
-			&ioStatus);
-		if (!Irp)
-		{
-			DPRINT1("Green: IoBuildSynchronousFsdRequest() failed. Unable to flush output buffer\n");
-			return;
-		}
-		Status = IoCallDriver(SerialDevice, Irp);
-		if (!NT_SUCCESS(Status) && Status != STATUS_PENDING)
-		{
-			DPRINT1("Green: IoCallDriver() failed. Status = 0x%08lx\n", Status);
-			return;
-		}
-		DeviceExtension->SendBufferPosition = 0;
-		SizeLeft = sizeof(DeviceExtension->SendBuffer);
-	}
-	
-	va_start(args, NumberOfChars);
-	while (NumberOfChars-- > 0)
-	{
-		CurrentInt = va_arg(args, int);
-		if (CurrentInt > 0)
-		{
-			CurrentChar = (UCHAR)CurrentInt;
-			
-			/* Why 0xff chars are printed on a 'dir' ? */
-			if (CurrentChar == 0xff) CurrentChar = ' ';
-			
-			DeviceExtension->SendBuffer[DeviceExtension->SendBufferPosition++] = CurrentChar;
-			SizeLeft--;
-		}
-		else if (CurrentInt == 0)
-		{
-			DeviceExtension->SendBuffer[DeviceExtension->SendBufferPosition++] = '0';
-			SizeLeft--;
-		}
-		else
-		{
-			CurrentInt = -CurrentInt;
-			ASSERT(CurrentInt < 100);
-			if (CurrentInt >= 10)
-			{
-				DeviceExtension->SendBuffer[DeviceExtension->SendBufferPosition++] =
-					(CurrentInt / 10) % 10 + '0';
-				SizeLeft--;
-			}
-			DeviceExtension->SendBuffer[DeviceExtension->SendBufferPosition++] =
-				CurrentInt % 10 + '0';
-			SizeLeft--;
-		}
-	}
-	va_end(args);
-}
-
-NTSTATUS
-ScreenInitialize(
-	IN PDRIVER_OBJECT DriverObject,
-	OUT PDEVICE_OBJECT* ScreenFdo)
-{
-	PDEVICE_OBJECT Fdo;
-	PSCREEN_DEVICE_EXTENSION DeviceExtension;
-	UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BlueScreen");
-	NTSTATUS Status;
-	
-	DPRINT("Green: ScreenInitialize() called\n");
-	
-	Status = IoCreateDevice(DriverObject,
-		sizeof(SCREEN_DEVICE_EXTENSION),
-		&DeviceName, /* FIXME: don't hardcode string */
-		FILE_DEVICE_SCREEN,
-		FILE_DEVICE_SECURE_OPEN,
-		TRUE,
-		&Fdo);
-	if (!NT_SUCCESS(Status))
-		return Status;
-	
-	DeviceExtension = (PSCREEN_DEVICE_EXTENSION)Fdo->DeviceExtension;
-	RtlZeroMemory(DeviceExtension, sizeof(SCREEN_DEVICE_EXTENSION));
-	DeviceExtension->Common.Type = Screen;
-	/* initialize screen */
-	DeviceExtension->Columns = 80;
-	DeviceExtension->Rows = 25;
-	DeviceExtension->ScanLines = 16;
-	DeviceExtension->VideoMemory = (PUCHAR)ExAllocatePool(
-		PagedPool,
-		2 * DeviceExtension->Columns * DeviceExtension->Rows * sizeof(UCHAR));
-	if (!DeviceExtension->VideoMemory)
-	{
-		IoDeleteDevice(Fdo);
-		return STATUS_INSUFFICIENT_RESOURCES;
-	}
-	DeviceExtension->TabWidth = 8;
-	
-	/* more initialization */
-	DeviceExtension->Mode = ENABLE_PROCESSED_OUTPUT |
-		ENABLE_WRAP_AT_EOL_OUTPUT;
-	
-	/* initialize screen at next write */
-	AddToSendBuffer(DeviceExtension, 2, ESC, 'c'); /* reset device */
-	AddToSendBuffer(DeviceExtension, 4, ESC, '[', '7', 'l'); /* disable line wrap */
-	AddToSendBuffer(DeviceExtension, 4, ESC, '[', '3', 'g'); /* clear all tabs */
-	
-	Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO;
-	Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
-	
-	*ScreenFdo = Fdo;
-	
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS
-ScreenWrite(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PIO_STACK_LOCATION Stack;
-	PUCHAR Buffer;
-	PSCREEN_DEVICE_EXTENSION DeviceExtension;
-	PUCHAR VideoMemory; /* FIXME: is it useful? */
-	ULONG VideoMemorySize; /* FIXME: is it useful? */
-	
-	ULONG Columns, Rows;
-	ULONG CursorX, CursorY;
-	ULONG i, j;
-	NTSTATUS Status;
-	
-	DPRINT("Green: IRP_MJ_WRITE\n");
-	
-	Stack = IoGetCurrentIrpStackLocation (Irp);
-	Buffer = Irp->UserBuffer;
-	DeviceExtension = (PSCREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	VideoMemory = DeviceExtension->VideoMemory;
-	
-	Columns = DeviceExtension->Columns;
-	Rows = DeviceExtension->Rows;
-	CursorX = (DeviceExtension->LogicalOffset / 2) % Columns + 1;
-	CursorY = (DeviceExtension->LogicalOffset / 2) / Columns + 1;
-	VideoMemorySize = Columns * Rows * 2 * sizeof(UCHAR);
-	DPRINT1("Y: %lu\n", CursorY);
-	DPRINT1("Buffer =");
-	for (i = 0; i < Stack->Parameters.Write.Length; i++)
-		DbgPrint(" 0x%02x", Buffer[i]);
-	DbgPrint("\n");
-	
-	if (!(DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT))
-	{
-		/* raw output mode */
-		CHECKPOINT;
-		Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
-		IoCompleteRequest (Irp, IO_NO_INCREMENT);
-		
-		return STATUS_NOT_SUPPORTED;
-	}
-	else
-	{
-		for (i = 0; i < Stack->Parameters.Write.Length; i++, Buffer++)
-		{
-			switch (*Buffer)
-			{
-				case '\b':
-				{
-					if (CursorX > 1)
-					{
-						CursorX--;
-						AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-						AddToSendBuffer(DeviceExtension, 1, ' ');
-						AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-					}
-					else if (CursorY > 1)
-					{
-						CursorX = Columns;
-						CursorY--;
-						AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-					}
-					break;
-				}
-				case '\n':
-				{
-					CursorY++;
-					CursorX = 1;
-					AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', '1', 'H');
-					break;
-				}
-				case '\r':
-				{
-					if (CursorX > 1)
-					{
-						AddToSendBuffer(DeviceExtension, 4, ESC, '[', -(int)(CursorX-1), 'D');
-						CursorX = 1;
-					}
-					break;
-				}
-				case '\t':
-				{
-					ULONG Offset = DeviceExtension->TabWidth - (CursorX % DeviceExtension->TabWidth);
-					for (j = 0; j < Offset; j++)
-					{
-#ifdef FORCE_POSITION
-						AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-#endif
-						AddToSendBuffer(DeviceExtension, 1, ' ');
-						CursorX++;
-						if (CursorX > Columns)
-						{
-							CursorX = 1;
-							CursorY++;
-						}
-					}
-					break;
-				}
-				default:
-				{
-#ifdef FORCE_POSITION
-					AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-#endif
-					AddToSendBuffer(DeviceExtension, 1, *Buffer);
-					CursorX++;
-					if (CursorX > Columns)
-					{
-						CursorX = 1;
-						DPRINT1("Y: %lu -> %lu\n", CursorY, CursorY + 1);
-						CursorY++;
-						AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', '1', 'H');
-						
-					}
-				}
-			}
-			if (CursorY > Rows)
-			{
-				DPRINT1("Y: %lu -> %lu\n", CursorY, CursorY - 1);
-				CursorY--;
-				AddToSendBuffer(DeviceExtension, 2, ESC, 'D');
-				AddToSendBuffer(DeviceExtension, 6, ESC, '[', -(int)CursorY, ';', -(int)CursorX, 'H');
-			}
-		}
-	}
-	
-	DeviceExtension->LogicalOffset = ((CursorX-1) + (CursorY-1) * Columns) * 2;
-	
-	/* flush output buffer */
-	AddToSendBuffer(DeviceExtension, 0);
-	
-	Status = STATUS_SUCCESS;
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest (Irp, IO_NO_INCREMENT);
-	
-	return Status;
-}
-
-NTSTATUS
-ScreenDeviceControl(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PIO_STACK_LOCATION Stack;
-	PSCREEN_DEVICE_EXTENSION DeviceExtension;
-	NTSTATUS Status;
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	DeviceExtension = (PSCREEN_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	
-	switch (Stack->Parameters.DeviceIoControl.IoControlCode)
-	{
-		case IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO:
-		{
-			PCONSOLE_SCREEN_BUFFER_INFO pcsbi;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO\n");
-			
-			pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer;
-			
-			pcsbi->dwSize.X = DeviceExtension->Columns;
-			pcsbi->dwSize.Y = DeviceExtension->Rows;
-			
-			pcsbi->dwCursorPosition.X = (SHORT)(DeviceExtension->LogicalOffset % DeviceExtension->Columns);
-			pcsbi->dwCursorPosition.Y = (SHORT)(DeviceExtension->LogicalOffset / DeviceExtension->Columns);
-			
-			pcsbi->wAttributes = DeviceExtension->CharAttribute;
-			
-			pcsbi->srWindow.Left   = 1;
-			pcsbi->srWindow.Right  = DeviceExtension->Columns;
-			pcsbi->srWindow.Top    = 1;
-			pcsbi->srWindow.Bottom = DeviceExtension->Rows;
-			
-			pcsbi->dwMaximumWindowSize.X = DeviceExtension->Columns;
-			pcsbi->dwMaximumWindowSize.Y = DeviceExtension->Rows;
-			
-			Irp->IoStatus.Information = sizeof(CONSOLE_SCREEN_BUFFER_INFO);
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO:
-		{
-			PCONSOLE_SCREEN_BUFFER_INFO pcsbi;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO\n");
-			
-			pcsbi = (PCONSOLE_SCREEN_BUFFER_INFO)Irp->AssociatedIrp.SystemBuffer;
-			/* FIXME: remove */ { pcsbi->dwCursorPosition.X++; }
-			/* FIXME: remove */ { pcsbi->dwCursorPosition.Y++; }
-			ASSERT(pcsbi->dwCursorPosition.X >= 1);
-			ASSERT(pcsbi->dwCursorPosition.Y >= 1);
-			ASSERT(pcsbi->dwCursorPosition.X <= DeviceExtension->Columns);
-			ASSERT(pcsbi->dwCursorPosition.Y <= DeviceExtension->Rows);
-			
-			DeviceExtension->LogicalOffset = (
-				(pcsbi->dwCursorPosition.Y-1) * DeviceExtension->Columns +
-				(pcsbi->dwCursorPosition.X-1)) * 2;
-			AddToSendBuffer(DeviceExtension, 6, ESC, '[',
-				-(int)pcsbi->dwCursorPosition.Y, ';',
-				-(int)pcsbi->dwCursorPosition.X, 'H');
-			
-			/* flush buffer */
-			AddToSendBuffer(DeviceExtension, 0);
-			
-			DeviceExtension->CharAttribute = pcsbi->wAttributes;
-			
-			Irp->IoStatus.Information = 0;
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_GET_CURSOR_INFO:
-		{
-			PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_GET_CURSOR_INFO\n");
-			
-			pcci->dwSize = 1;
-			pcci->bVisible = TRUE;
-			
-			Irp->IoStatus.Information = sizeof (CONSOLE_CURSOR_INFO);
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_GET_MODE:
-		{
-			PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_GET_MODE\n");
-			
-			pcm->dwMode = DeviceExtension->Mode;
-			
-			Irp->IoStatus.Information = sizeof(CONSOLE_MODE);
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_SET_MODE:
-		{
-			PCONSOLE_MODE pcm = (PCONSOLE_MODE)Irp->AssociatedIrp.SystemBuffer;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_SET_MODE\n");
-			
-			DeviceExtension->Mode = pcm->dwMode;
-			
-			Irp->IoStatus.Information = 0;
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME: IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE */
-			break;
-		}
-		case IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME: IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE */
-			break;
-		}
-		case IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME: IOCTL_CONSOLE_WRITE_OUTPUT_ATTRIBUTE */
-			break;
-		}
-		case IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE:
-		{
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE\n");
-			
-			DeviceExtension->CharAttribute = (WORD)*(PWORD)Irp->AssociatedIrp.SystemBuffer;
-			Irp->IoStatus.Information = 0;
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME:IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER */
-			break;
-		}
-		case IOCTL_CONSOLE_READ_OUTPUT_CHARACTER:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_READ_OUTPUT_CHARACTER\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME: IOCTL_CONSOLE_READ_OUTPUT_CHARACTER */
-			break;
-		}
-		case IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER:
-		{
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER\n");
-			Status = STATUS_NOT_IMPLEMENTED; /* FIXME: IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER */
-			break;
-		}
-		case IOCTL_CONSOLE_DRAW:
-		{
-			PCONSOLE_DRAW ConsoleDraw;
-			PUCHAR Video;
-			ULONG x, y;
-			BOOLEAN DoOptimization = FALSE;
-			DPRINT("Green: IRP_MJ_DEVICE_CONTROL / IOCTL_CONSOLE_DRAW\n");
-			
-			ConsoleDraw = (PCONSOLE_DRAW)MmGetSystemAddressForMdl(Irp->MdlAddress);
-			/* FIXME: remove */ { ConsoleDraw->X++; ConsoleDraw->CursorX++; }
-			/* FIXME: remove */ { ConsoleDraw->Y++; ConsoleDraw->CursorY++; }
-			DPRINT1("%lu %lu %lu %lu\n",
-				ConsoleDraw->X, ConsoleDraw->Y,
-				ConsoleDraw->SizeX, ConsoleDraw->SizeY);
-			ASSERT(ConsoleDraw->X >= 1);
-			ASSERT(ConsoleDraw->Y >= 1);
-			ASSERT(ConsoleDraw->X <= DeviceExtension->Columns);
-			ASSERT(ConsoleDraw->Y <= DeviceExtension->Rows);
-			ASSERT(ConsoleDraw->X + ConsoleDraw->SizeX >= 1);
-			ASSERT(ConsoleDraw->Y + ConsoleDraw->SizeY >= 1);
-			ASSERT(ConsoleDraw->X + ConsoleDraw->SizeX - 1 <= DeviceExtension->Columns);
-			ASSERT(ConsoleDraw->Y + ConsoleDraw->SizeY - 1 <= DeviceExtension->Rows);
-			ASSERT(ConsoleDraw->CursorX >= 1);
-			ASSERT(ConsoleDraw->CursorY >= 1);
-			ASSERT(ConsoleDraw->CursorX <= DeviceExtension->Columns);
-			ASSERT(ConsoleDraw->CursorY <= DeviceExtension->Rows);
-			
-#if 0
-			if (ConsoleDraw->X == 1
-				&& ConsoleDraw->Y == 1
-				&& ConsoleDraw->SizeX == DeviceExtension->Columns
-				&& ConsoleDraw->SizeY == DeviceExtension->Rows)
-			{
-				CHECKPOINT1;
-				/* search if we need to clear all screen */
-				DoOptimization = TRUE;
-				Video = (PUCHAR)(ConsoleDraw + 1);
-				x = 0;
-				while (DoOptimization && x < DeviceExtension->Columns * DeviceExtension->Rows)
-				{
-					if (Video[x++] != ' ')
-					{
-						CHECKPOINT1;
-						DoOptimization = FALSE;
-					}
-					/*if (Video[x++] != DeviceExtension->CharAttribute) DoOptimization = FALSE; */
-				}
-				if (DoOptimization)
-				{
-					CHECKPOINT1;
-					AddToSendBuffer(DeviceExtension, 4, ESC, '[', '2', 'J');
-				}
-			}
-#endif
-			/* add here more optimizations if needed */
-			
-			if (!DoOptimization)
-			{
-				for (y = 0; y < ConsoleDraw->SizeY; y++)
-				{
-					AddToSendBuffer(DeviceExtension, 6, ESC, '[',
-						-(int)(ConsoleDraw->Y + y), ';',
-						-(int)(ConsoleDraw->X), 'H');
-					Video = (PUCHAR)(ConsoleDraw + 1);
-					Video = &Video[((ConsoleDraw->Y + y) * DeviceExtension->Columns + ConsoleDraw->X) * 2];
-					for (x = 0; x < ConsoleDraw->SizeX; x++)
-					{
-						AddToSendBuffer(DeviceExtension, 1, Video[x * 2]);
-					}
-				}
-			}
-			
-			DeviceExtension->LogicalOffset = (
-				(ConsoleDraw->CursorY-1) * DeviceExtension->Columns +
-				(ConsoleDraw->CursorX-1)) * 2;
-			AddToSendBuffer(DeviceExtension, 6, ESC, '[',
-				-(int)(ConsoleDraw->CursorY), ';',
-				-(int)(ConsoleDraw->CursorX), 'H');
-			
-			/* flush buffer */
-			AddToSendBuffer(DeviceExtension, 0);
-			
-			Irp->IoStatus.Information = 0;
-			Status = STATUS_SUCCESS;
-			break;
-		}
-		default:
-			DPRINT1("Green: IRP_MJ_DEVICE_CONTROL / unknown ioctl code 0x%lx\n",
-				Stack->Parameters.DeviceIoControl.IoControlCode);
-			Status = STATUS_NOT_IMPLEMENTED;
-	}
-	
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest (Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/dd/serial/rw.c

@@ -1,318 +0,0 @@
-/* $Id:
- * 
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            drivers/dd/serial/create.c
- * PURPOSE:         Serial IRP_MJ_READ/IRP_MJ_WRITE operations
- * 
- * PROGRAMMERS:     Herv<72> Poussineau (poussine@freesurf.fr)
- */
-
-#define NDEBUG
-#include "serial.h"
-
-static PVOID
-SerialGetUserBuffer(IN PIRP Irp)
-{
-	ASSERT(Irp);
-	
-	return Irp->AssociatedIrp.SystemBuffer;
-}
-
-static VOID
-ReadBytes(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp,
-	PWORKITEM_DATA WorkItemData)
-{
-	PSERIAL_DEVICE_EXTENSION DeviceExtension;
-	PUCHAR ComPortBase;
-	ULONG Length;
-	PUCHAR Buffer;
-	UCHAR ReceivedByte;
-	KTIMER TotalTimeoutTimer;
-	KIRQL Irql;
-	ULONG ObjectCount;
-	PVOID ObjectsArray[2];
-	ULONG_PTR Information = 0;
-	NTSTATUS Status;
-	
-	ASSERT(DeviceObject);
-	ASSERT(WorkItemData);
-	
-	DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ComPortBase = (PUCHAR)DeviceExtension->BaseAddress;
-	Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length;
-	Buffer = SerialGetUserBuffer(Irp);
-	
-	DPRINT("Serial: UseIntervalTimeout = %s, IntervalTimeout = %lu\n",
-		WorkItemData->UseIntervalTimeout ? "YES" : "NO",
-		WorkItemData->UseIntervalTimeout ? WorkItemData->IntervalTimeout.QuadPart : 0);
-	DPRINT("Serial: UseTotalTimeout = %s\n",
-		WorkItemData->UseTotalTimeout ? "YES" : "NO");
-	
-	ObjectCount = 1;
-	ObjectsArray[0] = &DeviceExtension->InputBufferNotEmpty;
-	if (WorkItemData->UseTotalTimeout)
-	{
-		KeInitializeTimer(&TotalTimeoutTimer);
-		KeSetTimer(&TotalTimeoutTimer, WorkItemData->TotalTimeoutTime, NULL);
-		ObjectsArray[ObjectCount] = &TotalTimeoutTimer;
-		ObjectCount++;
-	}
-	
-	/* while buffer is not fully filled */
-	while (Length > 0)
-	{
-		/* read already received bytes from buffer */
-		KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql);
-		while (!IsCircularBufferEmpty(&DeviceExtension->InputBuffer)
-			&& Length > 0)
-		{
-			PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte);
-			DPRINT("Serial: reading byte from buffer: 0x%02x\n", ReceivedByte);
-			
-			Buffer[Information++] = ReceivedByte;
-			Length--;
-		}
-		KeClearEvent(&DeviceExtension->InputBufferNotEmpty);
-		KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql);
-		
-		if (WorkItemData->DontWait
-			&& !(WorkItemData->ReadAtLeastOneByte && Information == 0))
-		{
-			DPRINT("Serial: buffer empty. Don't wait more bytes\n");
-			break;
-		}
-		
-		Status = KeWaitForMultipleObjects(
-			ObjectCount,
-			ObjectsArray,
-			WaitAny,
-			Executive,
-			KernelMode,
-			FALSE,
-			(WorkItemData->UseIntervalTimeout && Information > 0) ? &WorkItemData->IntervalTimeout : NULL,
-			NULL);
-		
-		if (Status == STATUS_TIMEOUT /* interval timeout */
-			|| Status == STATUS_WAIT_1) /* total timeout */
-		{
-			DPRINT("Serial: timeout when reading bytes. Status = 0x%08lx\n", Status);
-			break;
-		}
-	}
-	
-	/* stop total timeout timer */
-	if (WorkItemData->UseTotalTimeout)
-		KeCancelTimer(&TotalTimeoutTimer);
-	
-	Irp->IoStatus.Information = Information;
-	if (Information == 0)
-		Irp->IoStatus.Status = STATUS_TIMEOUT;
-	else
-		Irp->IoStatus.Status = STATUS_SUCCESS;
-}
-
-static VOID STDCALL
-SerialReadWorkItem(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PVOID pWorkItemData /* real type PWORKITEM_DATA */)
-{
-	PWORKITEM_DATA WorkItemData;
-	PIRP Irp;
-	
-	DPRINT("Serial: SerialReadWorkItem() called\n");
-	
-	WorkItemData = (PWORKITEM_DATA)pWorkItemData;
-	Irp = WorkItemData->Irp;
-	
-	ReadBytes(DeviceObject, Irp, WorkItemData);
-	
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	
-	IoFreeWorkItem(WorkItemData->IoWorkItem);
-	ExFreePoolWithTag(pWorkItemData, SERIAL_TAG);
-}
-
-NTSTATUS STDCALL
-SerialRead(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PIO_STACK_LOCATION Stack;
-	PSERIAL_DEVICE_EXTENSION DeviceExtension;
-	ULONG Length;
-	PUCHAR Buffer;
-	PWORKITEM_DATA WorkItemData;
-	PIO_WORKITEM WorkItem;
-	NTSTATUS Status;
-	
-	DPRINT("Serial: IRP_MJ_READ\n");
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	Length = Stack->Parameters.Read.Length;
-	Buffer = SerialGetUserBuffer(Irp);
-	DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	
-	if (Stack->Parameters.Read.ByteOffset.QuadPart != 0 || Buffer == NULL)
-	{
-		Status = STATUS_INVALID_PARAMETER;
-		goto ByeBye;
-	}
-	
-	if (Length == 0)
-	{
-		Status = STATUS_SUCCESS;
-		goto ByeBye;
-	}
-	
-	/* Allocate memory for parameters */
-	WorkItemData = ExAllocatePoolWithTag(PagedPool, sizeof(WORKITEM_DATA), SERIAL_TAG);
-	if (!WorkItemData)
-	{
-		Status = STATUS_INSUFFICIENT_RESOURCES;
-		goto ByeBye;
-	}
-	RtlZeroMemory(WorkItemData, sizeof(WORKITEM_DATA));
-	WorkItemData->Irp = Irp;
-	
-	/* Calculate time outs */
-	if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE &&
-		 DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == INFINITE &&
-		 DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant > 0 &&
-		 DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant < INFINITE)
-	{
-		/* read at least one byte, and at most bytes already received */
-		WorkItemData->DontWait = TRUE;
-		WorkItemData->ReadAtLeastOneByte = TRUE;
-	}
-	else if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout == INFINITE &&
-	         DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant == 0 &&
-	         DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier == 0)
-	{
-		/* read only bytes that are already in buffer */
-		WorkItemData->DontWait = TRUE;
-	}
-	else
-	{
-		/* use timeouts */
-		if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout != 0)
-			{
-				WorkItemData->UseIntervalTimeout = TRUE;
-				WorkItemData->IntervalTimeout.QuadPart = DeviceExtension->SerialTimeOuts.ReadIntervalTimeout;
-		}
-		if (DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier != 0 ||
-			 DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant != 0)
-		{
-			ULONG TotalTimeout;
-			LARGE_INTEGER SystemTime;
-			
-			WorkItemData->UseTotalTimeout = TRUE;
-			TotalTimeout = DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant +
-				DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier * Length;
-			KeQuerySystemTime(&SystemTime);
-			WorkItemData->TotalTimeoutTime.QuadPart = SystemTime.QuadPart +
-				TotalTimeout * 10000;
-		}
-	}
-	
-	/* Pend IRP */
-	WorkItem = IoAllocateWorkItem(DeviceObject);
-	if (WorkItem)
-	{
-                WorkItemData->IoWorkItem = WorkItem;
-                IoQueueWorkItem(WorkItem, SerialReadWorkItem, DelayedWorkQueue, WorkItemData);
-		IoMarkIrpPending(Irp);
-		return STATUS_PENDING;
-	}
-	
-	/* insufficient resources, we can't pend the Irp */
-	CHECKPOINT;
-	Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort);
-	if (!NT_SUCCESS(Status))
-	{
-		ExFreePoolWithTag(WorkItemData, SERIAL_TAG);
-		goto ByeBye;
-	}
-	ReadBytes(DeviceObject, Irp, WorkItemData);
-	Status = Irp->IoStatus.Status;
-	
-	IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort);
-
-ByeBye:
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return Status;
-}
-
-NTSTATUS STDCALL
-SerialWrite(
-	IN PDEVICE_OBJECT DeviceObject,
-	IN PIRP Irp)
-{
-	PIO_STACK_LOCATION Stack;
-	PSERIAL_DEVICE_EXTENSION DeviceExtension;
-	ULONG Length;
-	ULONG_PTR Information = 0;
-	PUCHAR Buffer;
-	PUCHAR ComPortBase;
-	KIRQL Irql;
-	NTSTATUS Status = STATUS_SUCCESS;
-	
-	DPRINT("Serial: IRP_MJ_WRITE\n");
-	
-	/* FIXME: pend operation if possible */
-	/* FIXME: use write timeouts */
-	
-	Stack = IoGetCurrentIrpStackLocation(Irp);
-	Length = Stack->Parameters.Write.Length;
-	Buffer = SerialGetUserBuffer(Irp);
-	DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-	ComPortBase = (PUCHAR)DeviceExtension->BaseAddress;
-	
-	if (Stack->Parameters.Write.ByteOffset.QuadPart != 0 || Buffer == NULL)
-	{
-		Status = STATUS_INVALID_PARAMETER;
-		goto ByeBye;
-	}
-	
-	Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort);
-	if (!NT_SUCCESS(Status))
-		goto ByeBye;
-	
-	/* push  bytes into output buffer */
-	KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql);
-	while (Information < Length)
-	{
-		Status = PushCircularBufferEntry(&DeviceExtension->OutputBuffer, Buffer[Information]);
-		if (!NT_SUCCESS(Status))
-		{
-			if (Status == STATUS_BUFFER_TOO_SMALL)
-			{
-				KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql);
-				SerialSendByte(NULL, DeviceExtension, NULL, NULL);
-				KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql);
-				continue;
-			}
-			else
-			{
-				DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort);
-				DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++;
-				break;
-			}
-		}
-		Information++;
-	}
-	KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql);
-	IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort);
-	
-	/* send bytes */
-	SerialSendByte(NULL, DeviceExtension, NULL, NULL);
-
-ByeBye:
-	Irp->IoStatus.Information = Information;
-	Irp->IoStatus.Status = Status;
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	return Status;
-}

drivers/fs/np/rw.c

@@ -1,765 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:  See COPYING in the top level directory
- * PROJECT:    ReactOS kernel
- * FILE:       drivers/fs/np/rw.c
- * PURPOSE:    Named pipe filesystem
- * PROGRAMMER: David Welch <welch@cwcom.net>
- */
-
-/* INCLUDES ******************************************************************/
-
-#include <ddk/ntddk.h>
-#include <rosrtl/minmax.h>
-#include "npfs.h"
-
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-#ifndef NDEBUG
-VOID HexDump(PUCHAR Buffer, ULONG Length)
-{
-  CHAR Line[65];
-  UCHAR ch;
-  const char Hex[] = "0123456789ABCDEF";
-  int i, j;
-
-  DbgPrint("---------------\n");
-
-  for (i = 0; i < ROUND_UP(Length, 16); i+= 16)
-    {
-      memset(Line, ' ', 64);
-      Line[64] = 0;
-
-      for (j = 0; j < 16 && j + i < Length; j++)
-        {
-          ch = Buffer[i + j];
-          Line[3*j + 0] = Hex[ch >> 4];
-	  Line[3*j + 1] = Hex[ch & 0x0f];
-	  Line[48 + j] = isprint(ch) ? ch : '.';
-        }
-      DbgPrint("%s\n", Line);
-    }
-  DbgPrint("---------------\n");
-}
-#endif
-
-static VOID STDCALL 
-NpfsReadWriteCancelRoutine(IN PDEVICE_OBJECT DeviceObject,
-                           IN PIRP Irp)
-{
-   PNPFS_CONTEXT Context;
-   PNPFS_DEVICE_EXTENSION DeviceExt;
-   PIO_STACK_LOCATION IoStack;
-   PNPFS_FCB Fcb;
-   BOOLEAN Complete = FALSE;
-
-   DPRINT("NpfsReadWriteCancelRoutine(DeviceObject %x, Irp %x)\n", DeviceObject, Irp);
-
-   IoReleaseCancelSpinLock(Irp->CancelIrql);
-
-   Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext;
-   DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-   IoStack = IoGetCurrentIrpStackLocation(Irp);
-   Fcb = IoStack->FileObject->FsContext;
-
-   KeLockMutex(&DeviceExt->PipeListLock);
-   ExAcquireFastMutex(&Fcb->DataListLock);
-   switch(IoStack->MajorFunction)   
-   {
-      case IRP_MJ_READ:
-         if (Fcb->ReadRequestListHead.Flink != &Context->ListEntry)
-	 {
-	    /* we are not the first in the list, remove an complete us */
-	    RemoveEntryList(&Context->ListEntry);
-	    Complete = TRUE;
-	 }
-	 else
-	 {
-	    KeSetEvent(&Fcb->ReadEvent, IO_NO_INCREMENT, FALSE);
-	 }
-	 break;
-      default:
-         KEBUGCHECK(0);
-   }
-   ExReleaseFastMutex(&Fcb->DataListLock);
-   KeUnlockMutex(&DeviceExt->PipeListLock);
-   if (Complete)
-   {
-      Irp->IoStatus.Status = STATUS_CANCELLED;
-      Irp->IoStatus.Information = 0;
-      IoCompleteRequest(Irp, IO_NO_INCREMENT);
-   }
-}
-
-static VOID STDCALL
-NpfsWaiterThread(PVOID InitContext)
-{
-   PNPFS_THREAD_CONTEXT ThreadContext = (PNPFS_THREAD_CONTEXT) InitContext;
-   ULONG CurrentCount;
-   ULONG Count = 0;
-   PIRP Irp = NULL;
-   PIRP NextIrp;
-   NTSTATUS Status;
-   BOOLEAN Terminate = FALSE;
-   BOOLEAN Cancel = FALSE;
-   PIO_STACK_LOCATION IoStack = NULL;
-   PNPFS_CONTEXT Context;
-   PNPFS_CONTEXT NextContext;
-   PNPFS_FCB Fcb;
-
-   KeLockMutex(&ThreadContext->DeviceExt->PipeListLock);
-
-   while (1)
-     {
-       CurrentCount = ThreadContext->Count;
-       KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock);
-       if (Irp)
-         {
-           if (Cancel)
-             {
-	       Irp->IoStatus.Status = STATUS_CANCELLED;
-               Irp->IoStatus.Information = 0;
-               IoCompleteRequest(Irp, IO_NO_INCREMENT);
-	     }
-	   else
-	     {
-               switch (IoStack->MajorFunction)
-	         {
-	           case IRP_MJ_READ:
-                     NpfsRead(IoStack->DeviceObject, Irp);
-		     break;
-		   default:
-		     KEBUGCHECK(0);
-		 }
-	     }
-         }
-       if (Terminate)
-         {
-	   break;
-	 }
-       Status = KeWaitForMultipleObjects(CurrentCount,
-	                                 ThreadContext->WaitObjectArray,
-					 WaitAny,
-					 Executive,
-					 KernelMode,
-					 FALSE,
-					 NULL,
-					 ThreadContext->WaitBlockArray);
-       if (!NT_SUCCESS(Status))
-         {
-           KEBUGCHECK(0);
-         }
-       KeLockMutex(&ThreadContext->DeviceExt->PipeListLock);
-       Count = Status - STATUS_SUCCESS;
-       ASSERT (Count < CurrentCount);
-       if (Count > 0)
-       {
-	  Irp = ThreadContext->WaitIrpArray[Count];
-	  ThreadContext->Count--;
-	  ThreadContext->DeviceExt->EmptyWaiterCount++;
-	  ThreadContext->WaitObjectArray[Count] = ThreadContext->WaitObjectArray[ThreadContext->Count];
-	  ThreadContext->WaitIrpArray[Count] = ThreadContext->WaitIrpArray[ThreadContext->Count];
-
-          Cancel = (NULL == IoSetCancelRoutine(Irp, NULL));
-	  Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext;
-	  IoStack = IoGetCurrentIrpStackLocation(Irp);
-
-	  if (Cancel)
-	  {
-	     Fcb = IoStack->FileObject->FsContext;
- 	     ExAcquireFastMutex(&Fcb->DataListLock);
-	     RemoveEntryList(&Context->ListEntry);
-	     switch (IoStack->MajorFunction)
-	     {
-	        case IRP_MJ_READ:
-                   if (!IsListEmpty(&Fcb->ReadRequestListHead))
-		   {
-		      /* put the next request on the wait list */
-                      NextContext = CONTAINING_RECORD(Fcb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry);
-		      ThreadContext->WaitObjectArray[ThreadContext->Count] = NextContext->WaitEvent;
-		      NextIrp = CONTAINING_RECORD(NextContext, IRP, Tail.Overlay.DriverContext);
-		      ThreadContext->WaitIrpArray[ThreadContext->Count] = NextIrp;
-		      ThreadContext->Count++;
-                      ThreadContext->DeviceExt->EmptyWaiterCount--;		   
-		   }
-		   break;
-		default:
-		   KEBUGCHECK(0);
-	     }
-	     ExReleaseFastMutex(&Fcb->DataListLock);
-	  }	    
-       }
-       else
-       {  
-	  /* someone has add a new wait request */
-          Irp = NULL;
-       }
-       if (ThreadContext->Count == 1 && ThreadContext->DeviceExt->EmptyWaiterCount >= MAXIMUM_WAIT_OBJECTS)
-        {
-          /* it exist an other thread with empty wait slots, we can remove our thread from the list */
-          RemoveEntryList(&ThreadContext->ListEntry);
-          ThreadContext->DeviceExt->EmptyWaiterCount -= MAXIMUM_WAIT_OBJECTS - 1;
-	  Terminate = TRUE;
-        }
-     }
-   KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock);
-   ExFreePool(ThreadContext);
-}
-
-static NTSTATUS
-NpfsAddWaitingReadWriteRequest(IN PDEVICE_OBJECT DeviceObject,
-			       IN PIRP Irp)
-{
-   PLIST_ENTRY ListEntry;
-   PNPFS_THREAD_CONTEXT ThreadContext = NULL;
-   NTSTATUS Status;
-   HANDLE hThread;
-   KIRQL oldIrql;
-
-   PNPFS_CONTEXT Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext;
-   PNPFS_DEVICE_EXTENSION DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension;;
-
-   DPRINT("NpfsAddWaitingReadWriteRequest(DeviceObject %p, Irp %p)\n", DeviceObject, Irp);
-
-   KeLockMutex(&DeviceExt->PipeListLock);
-
-   ListEntry = DeviceExt->ThreadListHead.Flink;
-   while (ListEntry != &DeviceExt->ThreadListHead)
-     {
-       ThreadContext = CONTAINING_RECORD(ListEntry, NPFS_THREAD_CONTEXT, ListEntry);
-       if (ThreadContext->Count < MAXIMUM_WAIT_OBJECTS)
-         {
-           break;
-         }
-       ListEntry = ListEntry->Flink;
-     }
-   if (ListEntry == &DeviceExt->ThreadListHead)
-     {
-       ThreadContext = ExAllocatePool(NonPagedPool, sizeof(NPFS_THREAD_CONTEXT));
-       if (ThreadContext == NULL)
-         {
-           KeUnlockMutex(&DeviceExt->PipeListLock);
-           return STATUS_NO_MEMORY;
-         }
-       ThreadContext->DeviceExt = DeviceExt;
-       KeInitializeEvent(&ThreadContext->Event, SynchronizationEvent, FALSE);
-       ThreadContext->Count = 1;
-       ThreadContext->WaitObjectArray[0] = &ThreadContext->Event;
-
-   
-       DPRINT("Creating a new system thread for waiting read/write requests\n");
-      
-       Status = PsCreateSystemThread(&hThread,
-		                     THREAD_ALL_ACCESS,
-				     NULL,
-				     NULL,
-				     NULL,
-				     NpfsWaiterThread,
-				     (PVOID)ThreadContext);
-       if (!NT_SUCCESS(Status))
-         {
-           ExFreePool(ThreadContext);
-           KeUnlockMutex(&DeviceExt->PipeListLock);
-           return Status;
-	 }
-       InsertHeadList(&DeviceExt->ThreadListHead, &ThreadContext->ListEntry);
-       DeviceExt->EmptyWaiterCount += MAXIMUM_WAIT_OBJECTS - 1;       
-     }
-   IoMarkIrpPending(Irp);
-
-   IoAcquireCancelSpinLock(&oldIrql);
-   if (Irp->Cancel)
-     {
-       IoReleaseCancelSpinLock(oldIrql);
-       Status = STATUS_CANCELLED;
-     }
-   else
-     {
-       IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine);
-       IoReleaseCancelSpinLock(oldIrql);
-       ThreadContext->WaitObjectArray[ThreadContext->Count] = Context->WaitEvent;
-       ThreadContext->WaitIrpArray[ThreadContext->Count] = Irp;
-       ThreadContext->Count++;
-       DeviceExt->EmptyWaiterCount--;
-       KeSetEvent(&ThreadContext->Event, IO_NO_INCREMENT, FALSE);
-       Status = STATUS_SUCCESS;
-     }
-   KeUnlockMutex(&DeviceExt->PipeListLock);
-   return Status;
-}
-
-NTSTATUS STDCALL
-NpfsRead(IN PDEVICE_OBJECT DeviceObject,
-	 IN PIRP Irp)
-{
-  PFILE_OBJECT FileObject;
-  NTSTATUS Status;
-  NTSTATUS OriginalStatus = STATUS_SUCCESS;
-  PNPFS_FCB Fcb;
-  PNPFS_CONTEXT Context;
-  KEVENT Event;
-  ULONG Length;
-  ULONG Information;
-  ULONG CopyLength;
-  ULONG TempLength;
-  BOOLEAN IsOriginalRequest = TRUE;
-  PVOID Buffer;
-
-  DPRINT("NpfsRead(DeviceObject %p, Irp %p)\n", DeviceObject, Irp);
-
-  if (Irp->MdlAddress == NULL)
-  {
-     DPRINT("Irp->MdlAddress == NULL\n");
-     Status = STATUS_UNSUCCESSFUL;
-     Irp->IoStatus.Information = 0;
-     goto done;
-  }
-
-  FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject;
-  Fcb = FileObject->FsContext;
-  Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext;
-
-  if (Fcb->Data == NULL)
-  {
-     DPRINT1("Pipe is NOT readable!\n");
-     Status = STATUS_UNSUCCESSFUL;
-     Irp->IoStatus.Information = 0;
-     goto done;
-  }
-
-  ExAcquireFastMutex(&Fcb->DataListLock);
-
-  if (IoIsOperationSynchronous(Irp))
-  {
-     InsertTailList(&Fcb->ReadRequestListHead, &Context->ListEntry);
-     if (Fcb->ReadRequestListHead.Flink != &Context->ListEntry)
-     {
-        KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
-	Context->WaitEvent = &Event;
-        ExReleaseFastMutex(&Fcb->DataListLock);
-        Status = KeWaitForSingleObject(&Event,
-	                               Executive,
-				       KernelMode,
-				       FALSE,
-				       NULL);
-	if (!NT_SUCCESS(Status))
-	{
-	   KEBUGCHECK(0);
-	}
-        ExAcquireFastMutex(&Fcb->DataListLock);
-     }
-     Irp->IoStatus.Information = 0;
-  }
-  else
-  {
-     KIRQL oldIrql;
-     if (IsListEmpty(&Fcb->ReadRequestListHead) ||
-	 Fcb->ReadRequestListHead.Flink != &Context->ListEntry)
-     {
-        /* this is a new request */
-        Irp->IoStatus.Information = 0;
-	Context->WaitEvent = &Fcb->ReadEvent;
-        InsertTailList(&Fcb->ReadRequestListHead, &Context->ListEntry);
-	if (Fcb->ReadRequestListHead.Flink != &Context->ListEntry)
-	{
-	   /* there was already a request on the list */
-           IoAcquireCancelSpinLock(&oldIrql);
-           if (Irp->Cancel)
-           {
-	      IoReleaseCancelSpinLock(oldIrql);
-	      RemoveEntryList(&Context->ListEntry);
-	      ExReleaseFastMutex(&Fcb->DataListLock);
-	      Status = STATUS_CANCELLED;
-	      goto done;
-           }
-           IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine);
-           IoReleaseCancelSpinLock(oldIrql);
-	   ExReleaseFastMutex(&Fcb->DataListLock);
-           IoMarkIrpPending(Irp);
-	   Status = STATUS_PENDING;
-	   goto done;
-	}
-     }
-  }
-
-  while (1)
-  {
-     Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress);
-     Information = Irp->IoStatus.Information;
-     Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length;
-     ASSERT (Information <= Length);
-     Buffer += Information;
-     Length -= Information;
-     Status = STATUS_SUCCESS;
-
-     while (1)
-     {
-        if (Fcb->ReadDataAvailable == 0)
-        {
-	   if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE)
-	   {
-	      KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE);
-	   }
-	   if (Information > 0 &&
-	       (Fcb->Pipe->ReadMode != FILE_PIPE_BYTE_STREAM_MODE ||
-	        Fcb->PipeState != FILE_PIPE_CONNECTED_STATE))
-	   {
-	      break;
-	   }
-      	   if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE)
-	   {
-	      DPRINT("PipeState: %x\n", Fcb->PipeState);
-	      Status = STATUS_PIPE_BROKEN;
-	      break;
-           }
-	   ExReleaseFastMutex(&Fcb->DataListLock);
-	   if (IoIsOperationSynchronous(Irp))
-	   {
-	      /* Wait for ReadEvent to become signaled */
-
-	      DPRINT("Waiting for readable data (%wZ)\n", &Fcb->Pipe->PipeName);
-	      Status = KeWaitForSingleObject(&Fcb->ReadEvent,
-				             UserRequest,
-				             KernelMode,
-				             FALSE,
-				             NULL);
-	      DPRINT("Finished waiting (%wZ)! Status: %x\n", &Fcb->Pipe->PipeName, Status);
-	      ExAcquireFastMutex(&Fcb->DataListLock);
-	   }
-	   else
-	   {
-              PNPFS_CONTEXT Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext;
-	    
-              Context->WaitEvent = &Fcb->ReadEvent;
-	      Status = NpfsAddWaitingReadWriteRequest(DeviceObject, Irp);
-	         
-	      if (NT_SUCCESS(Status))
-	      {
-	         Status = STATUS_PENDING;
-	      }
-	      ExAcquireFastMutex(&Fcb->DataListLock);
-	      break;
-	   }
-        } 
-        if (Fcb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)
-        {
-	   DPRINT("Byte stream mode\n");
-	   /* Byte stream mode */
-	   while (Length > 0 && Fcb->ReadDataAvailable > 0)
-	   {
-	      CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length);
-	      if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength)
-	      {
-	         memcpy(Buffer, Fcb->ReadPtr, CopyLength);
-	         Fcb->ReadPtr += CopyLength;
-	         if (Fcb->ReadPtr == Fcb->Data + Fcb->MaxDataLength)
-	         {
-		    Fcb->ReadPtr = Fcb->Data;
-	         }
-	      }
-              else
-	      {
-	         TempLength = Fcb->Data + Fcb->MaxDataLength - Fcb->ReadPtr;
-	         memcpy(Buffer, Fcb->ReadPtr, TempLength);
-	         memcpy(Buffer + TempLength, Fcb->Data, CopyLength - TempLength);
-	         Fcb->ReadPtr = Fcb->Data + CopyLength - TempLength;
-	      }
-
-	      Buffer += CopyLength;
-	      Length -= CopyLength;
-	      Information += CopyLength;
-
-	      Fcb->ReadDataAvailable -= CopyLength;
-	      Fcb->WriteQuotaAvailable += CopyLength;
-	   }
-
-	   if (Length == 0)
-	   {
-	      if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE)
-	      {
-	         KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE);
-	      }
-	      KeResetEvent(&Fcb->ReadEvent);
-              break;
-	   }
-        }
-        else
-        {
-	   DPRINT("Message mode\n");
-
-	   /* Message mode */
-	   if (Fcb->ReadDataAvailable)
-	   {
-	      /* Truncate the message if the receive buffer is too small */
-	      CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length);
-	      memcpy(Buffer, Fcb->Data, CopyLength);
-
-#ifndef NDEBUG
-	      DPRINT("Length %d Buffer %x\n",CopyLength,Buffer);
-	      HexDump((PUCHAR)Buffer, CopyLength);
-#endif
-
-	      Information = CopyLength;
-
-	      if (Fcb->ReadDataAvailable > Length)
-	      {
-	         memmove(Fcb->Data, Fcb->Data + Length,
-	                 Fcb->ReadDataAvailable - Length);
-	         Fcb->ReadDataAvailable -= Length;
-	         Status = STATUS_MORE_ENTRIES;
-	      }
-	      else
-	      {
-                 KeResetEvent(&Fcb->ReadEvent);
-                 if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE)
-                 {
-                    KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE);
-                 }
-	         Fcb->ReadDataAvailable = 0;
-	         Fcb->WriteQuotaAvailable = Fcb->MaxDataLength;
-	      }
-	   }
-
-	   if (Information > 0)
-	   {
-              break;
-	   }
-        }
-     }   
-     Irp->IoStatus.Information = Information;
-     Irp->IoStatus.Status = Status;
-
-     if (IoIsOperationSynchronous(Irp))
-     {
-        RemoveEntryList(&Context->ListEntry);
-        if (!IsListEmpty(&Fcb->ReadRequestListHead))
-	{
-	   Context = CONTAINING_RECORD(Fcb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry);
-           KeSetEvent(Context->WaitEvent, IO_NO_INCREMENT, FALSE);
-	}
-        ExReleaseFastMutex(&Fcb->DataListLock);
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
-	DPRINT("NpfsRead done (Status %lx)\n", Status);
-        return Status;
-     }
-     else
-     {
-        if (IsOriginalRequest)
-	{
-	   IsOriginalRequest = FALSE;
-	   OriginalStatus = Status;
-	}
-        if (Status == STATUS_PENDING)
-	{
-           ExReleaseFastMutex(&Fcb->DataListLock);
-	   DPRINT("NpfsRead done (Status %lx)\n", OriginalStatus);
-           return OriginalStatus;
-	}
-	RemoveEntryList(&Context->ListEntry);
-	IoCompleteRequest(Irp, IO_NO_INCREMENT);
-        if (IsListEmpty(&Fcb->ReadRequestListHead))
-	{
-           ExReleaseFastMutex(&Fcb->DataListLock);
-	   DPRINT("NpfsRead done (Status %lx)\n", OriginalStatus);
-           return OriginalStatus;
-	}
-        Context = CONTAINING_RECORD(Fcb->ReadRequestListHead.Flink, NPFS_CONTEXT, ListEntry);
-	Irp = CONTAINING_RECORD(Context, IRP, Tail.Overlay.DriverContext);
-     }
-  }	
-
-done:
-  Irp->IoStatus.Status = Status;
-
-  if (Status != STATUS_PENDING)
-    {
-      IoCompleteRequest(Irp, IO_NO_INCREMENT);
-    }
-  DPRINT("NpfsRead done (Status %lx)\n", Status);
-
-  return Status;
-}
-
-NTSTATUS STDCALL
-NpfsWrite(PDEVICE_OBJECT DeviceObject,
-	  PIRP Irp)
-{
-  PIO_STACK_LOCATION IoStack;
-  PFILE_OBJECT FileObject;
-  PNPFS_FCB Fcb = NULL;
-  PNPFS_FCB ReaderFcb;
-  PNPFS_PIPE Pipe = NULL;
-  PUCHAR Buffer;
-  NTSTATUS Status = STATUS_SUCCESS;
-  ULONG Length;
-  ULONG Offset;
-  ULONG Information;
-  ULONG CopyLength;
-  ULONG TempLength;
-
-  DPRINT("NpfsWrite()\n");
-
-  IoStack = IoGetCurrentIrpStackLocation(Irp);
-  FileObject = IoStack->FileObject;
-  DPRINT("FileObject %p\n", FileObject);
-  DPRINT("Pipe name %wZ\n", &FileObject->FileName);
-
-  Fcb = FileObject->FsContext;
-  ReaderFcb = Fcb->OtherSide;
-  Pipe = Fcb->Pipe;
-
-  Length = IoStack->Parameters.Write.Length;
-  Offset = IoStack->Parameters.Write.ByteOffset.u.LowPart;
-  Information = 0;
-
-  if (Irp->MdlAddress == NULL)
-    {
-      DPRINT("Irp->MdlAddress == NULL\n");
-      Status = STATUS_UNSUCCESSFUL;
-      Length = 0;
-      goto done;
-    }
-
-  if (ReaderFcb == NULL)
-    {
-      DPRINT("Pipe is NOT connected!\n");
-      if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE)
-        Status = STATUS_PIPE_LISTENING;
-      else if (Fcb->PipeState == FILE_PIPE_DISCONNECTED_STATE)
-        Status = STATUS_PIPE_DISCONNECTED;
-      else
-        Status = STATUS_UNSUCCESSFUL;
-      Length = 0;
-      goto done;
-    }
-
-  if (ReaderFcb->Data == NULL)
-    {
-      DPRINT("Pipe is NOT writable!\n");
-      Status = STATUS_UNSUCCESSFUL;
-      Length = 0;
-      goto done;
-    }
-
-  Status = STATUS_SUCCESS;
-  Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress);
-
-  ExAcquireFastMutex(&ReaderFcb->DataListLock);
-#ifndef NDEBUG
-  DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset);
-  HexDump(Buffer, Length);
-#endif
-
-  while(1)
-    {
-      if (ReaderFcb->WriteQuotaAvailable == 0)
-	{
-	  KeSetEvent(&ReaderFcb->ReadEvent, IO_NO_INCREMENT, FALSE);
-	  if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE)
-	    {
-	      Status = STATUS_PIPE_BROKEN;
-	      ExReleaseFastMutex(&ReaderFcb->DataListLock);
-	      goto done;
-	    }
-	  ExReleaseFastMutex(&ReaderFcb->DataListLock);
-
-	  DPRINT("Waiting for buffer space (%S)\n", Pipe->PipeName.Buffer);
-	  Status = KeWaitForSingleObject(&Fcb->WriteEvent, 
-	                                 UserRequest,
-				         KernelMode,
-				         FALSE,
-				         NULL);
-	  DPRINT("Finished waiting (%S)! Status: %x\n", Pipe->PipeName.Buffer, Status);
-
-	  ExAcquireFastMutex(&ReaderFcb->DataListLock);
-	  /*
-	   * It's possible that the event was signaled because the
-	   * other side of pipe was closed.
-	   */
-	  if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE)
-	    {
-	      DPRINT("PipeState: %x\n", Fcb->PipeState);
-	      Status = STATUS_PIPE_BROKEN;
-	      ExReleaseFastMutex(&ReaderFcb->DataListLock);
-	      goto done;
-	    }
-	}
-
-      if (Pipe->WriteMode == FILE_PIPE_BYTE_STREAM_MODE)
-	{
-	  DPRINT("Byte stream mode\n");
-	  while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0)
-	    {
-	      CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable);
-	      if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength)
-		{
-		  memcpy(ReaderFcb->WritePtr, Buffer, CopyLength);
-		  ReaderFcb->WritePtr += CopyLength;
-		  if (ReaderFcb->WritePtr == ReaderFcb->Data + ReaderFcb->MaxDataLength)
-		    {
-		      ReaderFcb->WritePtr = ReaderFcb->Data;
-		    }
-		}
-	      else
-		{
-		  TempLength = ReaderFcb->Data + ReaderFcb->MaxDataLength - ReaderFcb->WritePtr;
-		  memcpy(ReaderFcb->WritePtr, Buffer, TempLength);
-		  memcpy(ReaderFcb->Data, Buffer + TempLength, CopyLength - TempLength);
-		  ReaderFcb->WritePtr = ReaderFcb->Data + CopyLength - TempLength;
-		}
-
-	      Buffer += CopyLength;
-	      Length -= CopyLength;
-	      Information += CopyLength;
-
-	      ReaderFcb->ReadDataAvailable += CopyLength;
-	      ReaderFcb->WriteQuotaAvailable -= CopyLength;
-	    }
-
-	  if (Length == 0)
-	    {
-	      KeSetEvent(&ReaderFcb->ReadEvent, IO_NO_INCREMENT, FALSE);
-	      KeResetEvent(&Fcb->WriteEvent);
-	      break;
-	    }
-	}
-      else
-	{
-	  DPRINT("Message mode\n");
-	  if (Length > 0)
-	    {
-	      CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable);
-	      memcpy(ReaderFcb->Data, Buffer, CopyLength);
-
-	      Information = CopyLength;
-	      ReaderFcb->ReadDataAvailable = CopyLength;
-	      ReaderFcb->WriteQuotaAvailable = 0;
-	    }
-
-   	  if (Information > 0)
-   	    {
-   	      KeSetEvent(&ReaderFcb->ReadEvent, IO_NO_INCREMENT, FALSE);
-   	      KeResetEvent(&Fcb->WriteEvent);
-   	      break;
-   	    }
-	}
-    }
-
-  ExReleaseFastMutex(&ReaderFcb->DataListLock);
-
-done:
-  Irp->IoStatus.Status = Status;
-  Irp->IoStatus.Information = Information;
-
-  IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
-  DPRINT("NpfsWrite done (Status %lx)\n", Status);
-
-  return Status;
-}
-
-/* EOF */

drivers/usb/cromwell/uhci/makefile

@@ -1,16 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = export_driver
-
-TARGET_NAME = uhci
-
-TARGET_DDKLIBS = ntoskrnl.a usbcore.a
-
-TARGET_CFLAGS = -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -DDEBUG_MODE
-
-TARGET_OBJECTS = \
-  uhci-hcd.o uhci_main.o ../sys/ros_wrapper.o ../sys/linuxwrapper.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

drivers/usb/cromwell/uhci/uhci-debug.c

@@ -1,616 +0,0 @@
-/*
- * UHCI-specific debugging code. Invaluable when something
- * goes wrong, but don't get in my face.
- *
- * Kernel visible pointers are surrounded in []'s and bus
- * visible pointers are surrounded in ()'s
- *
- * (C) Copyright 1999 Linus Torvalds
- * (C) Copyright 1999-2001 Johannes Erdfelt
- */
-
-#if 0
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/smp_lock.h>
-#include <asm/io.h>
-#endif
-
-#include "uhci-hcd.h"
-
-/* Handle REALLY large printk's so we don't overflow buffers */
-static inline void lprintk(char *buf)
-{
-	char *p;
-
-	/* Just write one line at a time */
-	while (buf) {
-		p = strchr(buf, '\n');
-		if (p)
-			*p = 0;
-		printk(KERN_DEBUG "%s\n", buf);
-		buf = p;
-		if (buf)
-			buf++;
-	}
-}
-
-static inline int uhci_is_skeleton_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
-{
-	int i;
-
-	for (i = 0; i < UHCI_NUM_SKELQH; i++)
-		if (qh == uhci->skelqh[i])
-			return 1;
-
-	return 0;
-}
-
-static int uhci_show_td(struct uhci_td *td, char *buf, int len, int space)
-{
-	char *out = buf;
-	char *spid;
-	u32 status, token;
-
-	/* Try to make sure there's enough memory */
-	if (len < 160)
-		return 0;
-
-	status = td_status(td);
-	out += sprintf(out, "%*s[%p] link (%08x) ", space, "", td, le32_to_cpu(td->link));
-	out += sprintf(out, "e%d %s%s%s%s%s%s%s%s%s%sLength=%x ",
-		((status >> 27) & 3),
-		(status & TD_CTRL_SPD) ?      "SPD " : "",
-		(status & TD_CTRL_LS) ?       "LS " : "",
-		(status & TD_CTRL_IOC) ?      "IOC " : "",
-		(status & TD_CTRL_ACTIVE) ?   "Active " : "",
-		(status & TD_CTRL_STALLED) ?  "Stalled " : "",
-		(status & TD_CTRL_DBUFERR) ?  "DataBufErr " : "",
-		(status & TD_CTRL_BABBLE) ?   "Babble " : "",
-		(status & TD_CTRL_NAK) ?      "NAK " : "",
-		(status & TD_CTRL_CRCTIMEO) ? "CRC/Timeo " : "",
-		(status & TD_CTRL_BITSTUFF) ? "BitStuff " : "",
-		status & 0x7ff);
-
-	token = td_token(td);
-	switch (uhci_packetid(token)) {
-		case USB_PID_SETUP:
-			spid = "SETUP";
-			break;
-		case USB_PID_OUT:
-			spid = "OUT";
-			break;
-		case USB_PID_IN:
-			spid = "IN";
-			break;
-		default:
-			spid = "?";
-			break;
-	}
-
-	out += sprintf(out, "MaxLen=%x DT%d EndPt=%x Dev=%x, PID=%x(%s) ",
-		token >> 21,
-		((token >> 19) & 1),
-		(token >> 15) & 15,
-		(token >> 8) & 127,
-		(token & 0xff),
-		spid);
-	out += sprintf(out, "(buf=%08x)\n", le32_to_cpu(td->buffer));
-
-	return out - buf;
-}
-
-static int uhci_show_qh(struct uhci_qh *qh, char *buf, int len, int space)
-{
-	char *out = buf;
-	struct urb_priv *urbp;
-	struct list_head *head, *tmp;
-	struct uhci_td *td;
-	int i = 0, checked = 0, prevactive = 0;
-
-	/* Try to make sure there's enough memory */
-	if (len < 80 * 6)
-		return 0;
-
-	out += sprintf(out, "%*s[%p] link (%08x) element (%08x)\n", space, "",
-			qh, le32_to_cpu(qh->link), le32_to_cpu(qh->element));
-
-	if (qh->element & UHCI_PTR_QH)
-		out += sprintf(out, "%*s  Element points to QH (bug?)\n", space, "");
-
-	if (qh->element & UHCI_PTR_DEPTH)
-		out += sprintf(out, "%*s  Depth traverse\n", space, "");
-
-	if (qh->element & cpu_to_le32(8))
-		out += sprintf(out, "%*s  Bit 3 set (bug?)\n", space, "");
-
-	if (!(qh->element & ~(UHCI_PTR_QH | UHCI_PTR_DEPTH)))
-		out += sprintf(out, "%*s  Element is NULL (bug?)\n", space, "");
-
-	if (!qh->urbp) {
-		out += sprintf(out, "%*s  urbp == NULL\n", space, "");
-		goto out;
-	}
-
-	urbp = qh->urbp;
-
-	head = &urbp->td_list;
-	tmp = head->next;
-
-	td = list_entry(tmp, struct uhci_td, list);
-
-	if (cpu_to_le32(td->dma_handle) != (qh->element & ~UHCI_PTR_BITS))
-		out += sprintf(out, "%*s Element != First TD\n", space, "");
-
-	while (tmp != head) {
-		struct uhci_td *td = list_entry(tmp, struct uhci_td, list);
-
-		tmp = tmp->next;
-
-		out += sprintf(out, "%*s%d: ", space + 2, "", i++);
-		out += uhci_show_td(td, out, len - (out - buf), 0);
-
-		if (i > 10 && !checked && prevactive && tmp != head &&
-		    debug <= 2) {
-			struct list_head *ntmp = tmp;
-			struct uhci_td *ntd = td;
-			int active = 1, ni = i;
-
-			checked = 1;
-
-			while (ntmp != head && ntmp->next != head && active) {
-				ntd = list_entry(ntmp, struct uhci_td, list);
-
-				ntmp = ntmp->next;
-
-				active = td_status(ntd) & TD_CTRL_ACTIVE;
-
-				ni++;
-			}
-
-			if (active && ni > i) {
-				out += sprintf(out, "%*s[skipped %d active TD's]\n", space, "", ni - i);
-				tmp = ntmp;
-				td = ntd;
-				i = ni;
-			}
-		}
-
-		prevactive = td_status(td) & TD_CTRL_ACTIVE;
-	}
-
-	if (list_empty(&urbp->queue_list) || urbp->queued)
-		goto out;
-
-	out += sprintf(out, "%*sQueued QH's:\n", -space, "--");
-
-	head = &urbp->queue_list;
-	tmp = head->next;
-
-	while (tmp != head) {
-		struct urb_priv *nurbp = list_entry(tmp, struct urb_priv,
-						queue_list);
-		tmp = tmp->next;
-
-		out += uhci_show_qh(nurbp->qh, out, len - (out - buf), space);
-	}
-
-out:
-	return out - buf;
-}
-
-#define show_frame_num()	\
-	if (!shown) {		\
-	  shown = 1;		\
-	  out += sprintf(out, "- Frame %d\n", i); \
-	}
-
-#ifdef CONFIG_PROC_FS
-static const char *qh_names[] = {
-  "skel_int128_qh", "skel_int64_qh",
-  "skel_int32_qh", "skel_int16_qh",
-  "skel_int8_qh", "skel_int4_qh",
-  "skel_int2_qh", "skel_int1_qh",
-  "skel_ls_control_qh", "skel_fs_control_qh",
-  "skel_bulk_qh", "skel_term_qh"
-};
-
-#define show_qh_name()		\
-	if (!shown) {		\
-	  shown = 1;		\
-	  out += sprintf(out, "- %s\n", qh_names[i]); \
-	}
-
-static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
-{
-	char *out = buf;
-
-	/* Try to make sure there's enough memory */
-	if (len < 160)
-		return 0;
-
-	out += sprintf(out, "  stat%d     =     %04x  %s%s%s%s%s%s%s%s%s%s\n",
-		port,
-		status,
-		(status & USBPORTSC_SUSP) ?	" Suspend" : "",
-		(status & USBPORTSC_OCC) ?	" OverCurrentChange" : "",
-		(status & USBPORTSC_OC) ?	" OverCurrent" : "",
-		(status & USBPORTSC_PR) ?	" Reset" : "",
-		(status & USBPORTSC_LSDA) ?	" LowSpeed" : "",
-		(status & USBPORTSC_RD) ?	" ResumeDetect" : "",
-		(status & USBPORTSC_PEC) ?	" EnableChange" : "",
-		(status & USBPORTSC_PE) ?	" Enabled" : "",
-		(status & USBPORTSC_CSC) ?	" ConnectChange" : "",
-		(status & USBPORTSC_CCS) ?	" Connected" : "");
-
-	return out - buf;
-}
-
-static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
-{
-	char *out = buf;
-	unsigned int io_addr = uhci->io_addr;
-	unsigned short usbcmd, usbstat, usbint, usbfrnum;
-	unsigned int flbaseadd;
-	unsigned char sof;
-	unsigned short portsc1, portsc2;
-
-	/* Try to make sure there's enough memory */
-	if (len < 80 * 6)
-		return 0;
-
-	usbcmd    = inw(io_addr + 0);
-	usbstat   = inw(io_addr + 2);
-	usbint    = inw(io_addr + 4);
-	usbfrnum  = inw(io_addr + 6);
-	flbaseadd = inl(io_addr + 8);
-	sof       = inb(io_addr + 12);
-	portsc1   = inw(io_addr + 16);
-	portsc2   = inw(io_addr + 18);
-
-	out += sprintf(out, "  usbcmd    =     %04x   %s%s%s%s%s%s%s%s\n",
-		usbcmd,
-		(usbcmd & USBCMD_MAXP) ?    "Maxp64 " : "Maxp32 ",
-		(usbcmd & USBCMD_CF) ?      "CF " : "",
-		(usbcmd & USBCMD_SWDBG) ?   "SWDBG " : "",
-		(usbcmd & USBCMD_FGR) ?     "FGR " : "",
-		(usbcmd & USBCMD_EGSM) ?    "EGSM " : "",
-		(usbcmd & USBCMD_GRESET) ?  "GRESET " : "",
-		(usbcmd & USBCMD_HCRESET) ? "HCRESET " : "",
-		(usbcmd & USBCMD_RS) ?      "RS " : "");
-
-	out += sprintf(out, "  usbstat   =     %04x   %s%s%s%s%s%s\n",
-		usbstat,
-		(usbstat & USBSTS_HCH) ?    "HCHalted " : "",
-		(usbstat & USBSTS_HCPE) ?   "HostControllerProcessError " : "",
-		(usbstat & USBSTS_HSE) ?    "HostSystemError " : "",
-		(usbstat & USBSTS_RD) ?     "ResumeDetect " : "",
-		(usbstat & USBSTS_ERROR) ?  "USBError " : "",
-		(usbstat & USBSTS_USBINT) ? "USBINT " : "");
-
-	out += sprintf(out, "  usbint    =     %04x\n", usbint);
-	out += sprintf(out, "  usbfrnum  =   (%d)%03x\n", (usbfrnum >> 10) & 1,
-		0xfff & (4*(unsigned int)usbfrnum));
-	out += sprintf(out, "  flbaseadd = %08x\n", flbaseadd);
-	out += sprintf(out, "  sof       =       %02x\n", sof);
-	out += uhci_show_sc(1, portsc1, out, len - (out - buf));
-	out += uhci_show_sc(2, portsc2, out, len - (out - buf));
-
-	return out - buf;
-}
-
-static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp, char *buf, int len)
-{
-	struct list_head *tmp;
-	char *out = buf;
-	int count = 0;
-
-	if (len < 200)
-		return 0;
-
-	out += sprintf(out, "urb_priv [%p] ", urbp);
-	out += sprintf(out, "urb [%p] ", urbp->urb);
-	out += sprintf(out, "qh [%p] ", urbp->qh);
-	out += sprintf(out, "Dev=%d ", usb_pipedevice(urbp->urb->pipe));
-	out += sprintf(out, "EP=%x(%s) ", usb_pipeendpoint(urbp->urb->pipe), (usb_pipein(urbp->urb->pipe) ? "IN" : "OUT"));
-
-	switch (usb_pipetype(urbp->urb->pipe)) {
-	case PIPE_ISOCHRONOUS: out += sprintf(out, "ISO "); break;
-	case PIPE_INTERRUPT: out += sprintf(out, "INT "); break;
-	case PIPE_BULK: out += sprintf(out, "BLK "); break;
-	case PIPE_CONTROL: out += sprintf(out, "CTL "); break;
-	}
-
-	out += sprintf(out, "%s", (urbp->fsbr ? "FSBR " : ""));
-	out += sprintf(out, "%s", (urbp->fsbr_timeout ? "FSBR_TO " : ""));
-
-	if (urbp->urb->status != -EINPROGRESS)
-		out += sprintf(out, "Status=%d ", urbp->urb->status);
-	//out += sprintf(out, "Inserttime=%lx ",urbp->inserttime);
-	//out += sprintf(out, "FSBRtime=%lx ",urbp->fsbrtime);
-
-	count = 0;
-	list_for_each(tmp, &urbp->td_list)
-		count++;
-	out += sprintf(out, "TDs=%d ",count);
-
-	if (urbp->queued)
-		out += sprintf(out, "queued\n");
-	else {
-		count = 0;
-		list_for_each(tmp, &urbp->queue_list)
-			count++;
-		out += sprintf(out, "queued URBs=%d\n", count);
-	}
-
-	return out - buf;
-}
-
-static int uhci_show_lists(struct uhci_hcd *uhci, char *buf, int len)
-{
-	char *out = buf;
-	struct list_head *head, *tmp;
-	int count;
-
-	out += sprintf(out, "Main list URBs:");
-	if (list_empty(&uhci->urb_list))
-		out += sprintf(out, " Empty\n");
-	else {
-		out += sprintf(out, "\n");
-		count = 0;
-		head = &uhci->urb_list;
-		tmp = head->next;
-		while (tmp != head) {
-			struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list);
-
-			out += sprintf(out, "  %d: ", ++count);
-			out += uhci_show_urbp(uhci, urbp, out, len - (out - buf));
-			tmp = tmp->next;
-		}
-	}
-
-	out += sprintf(out, "Remove list URBs:");
-	if (list_empty(&uhci->urb_remove_list))
-		out += sprintf(out, " Empty\n");
-	else {
-		out += sprintf(out, "\n");
-		count = 0;
-		head = &uhci->urb_remove_list;
-		tmp = head->next;
-		while (tmp != head) {
-			struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list);
-
-			out += sprintf(out, "  %d: ", ++count);
-			out += uhci_show_urbp(uhci, urbp, out, len - (out - buf));
-			tmp = tmp->next;
-		}
-	}
-
-	out += sprintf(out, "Complete list URBs:");
-	if (list_empty(&uhci->complete_list))
-		out += sprintf(out, " Empty\n");
-	else {
-		out += sprintf(out, "\n");
-		count = 0;
-		head = &uhci->complete_list;
-		tmp = head->next;
-		while (tmp != head) {
-			struct urb_priv *urbp = list_entry(tmp, struct urb_priv, urb_list);
-
-			out += sprintf(out, "  %d: ", ++count);
-			out += uhci_show_urbp(uhci, urbp, out, len - (out - buf));
-			tmp = tmp->next;
-		}
-	}
-
-	return out - buf;
-}
-
-static int uhci_sprint_schedule(struct uhci_hcd *uhci, char *buf, int len)
-{
-	unsigned long flags;
-	char *out = buf;
-	int i, j;
-	struct uhci_qh *qh;
-	struct uhci_td *td;
-	struct list_head *tmp, *head;
-
-	spin_lock_irqsave(&uhci->schedule_lock, flags);
-
-	out += sprintf(out, "HC status\n");
-	out += uhci_show_status(uhci, out, len - (out - buf));
-
-	out += sprintf(out, "Frame List\n");
-	for (i = 0; i < UHCI_NUMFRAMES; ++i) {
-		int shown = 0;
-		td = uhci->fl->frame_cpu[i];
-		if (!td)
-			continue;
-
-		if (td->dma_handle != (dma_addr_t)uhci->fl->frame[i]) {
-			show_frame_num();
-			out += sprintf(out, "    frame list does not match td->dma_handle!\n");
-		}
-		show_frame_num();
-
-		head = &td->fl_list;
-		tmp = head;
-		do {
-			td = list_entry(tmp, struct uhci_td, fl_list);
-			tmp = tmp->next;
-			out += uhci_show_td(td, out, len - (out - buf), 4);
-		} while (tmp != head);
-	}
-
-	out += sprintf(out, "Skeleton QH's\n");
-
-	for (i = 0; i < UHCI_NUM_SKELQH; ++i) {
-		int shown = 0;
-
-		qh = uhci->skelqh[i];
-
-		if (debug > 1) {
-			show_qh_name();
-			out += uhci_show_qh(qh, out, len - (out - buf), 4);
-		}
-
-		/* Last QH is the Terminating QH, it's different */
-		if (i == UHCI_NUM_SKELQH - 1) {
-			if (qh->link != UHCI_PTR_TERM)
-				out += sprintf(out, "    bandwidth reclamation on!\n");
-
-			if (qh->element != cpu_to_le32(uhci->term_td->dma_handle))
-				out += sprintf(out, "    skel_term_qh element is not set to term_td!\n");
-
-			continue;
-		}
-
-		j = (i < 7) ? 7 : i+1;		/* Next skeleton */
-		if (list_empty(&qh->list)) {
-			if (i < UHCI_NUM_SKELQH - 1) {
-				if (qh->link !=
-				    (cpu_to_le32(uhci->skelqh[j]->dma_handle) | UHCI_PTR_QH)) {
-					show_qh_name();
-					out += sprintf(out, "    skeleton QH not linked to next skeleton QH!\n");
-				}
-			}
-
-			continue;
-		}
-
-		show_qh_name();
-
-		head = &qh->list;
-		tmp = head->next;
-
-		while (tmp != head) {
-			qh = list_entry(tmp, struct uhci_qh, list);
-
-			tmp = tmp->next;
-
-			out += uhci_show_qh(qh, out, len - (out - buf), 4);
-		}
-
-		if (i < UHCI_NUM_SKELQH - 1) {
-			if (qh->link !=
-			    (cpu_to_le32(uhci->skelqh[j]->dma_handle) | UHCI_PTR_QH))
-				out += sprintf(out, "    last QH not linked to next skeleton!\n");
-		}
-	}
-
-	if (debug > 2)
-		out += uhci_show_lists(uhci, out, len - (out - buf));
-
-	spin_unlock_irqrestore(&uhci->schedule_lock, flags);
-
-	return out - buf;
-}
-
-#define MAX_OUTPUT	(64 * 1024)
-
-static struct proc_dir_entry *uhci_proc_root = NULL;
-
-struct uhci_proc {
-	int size;
-	char *data;
-	struct uhci_hcd *uhci;
-};
-
-static int uhci_proc_open(struct inode *inode, struct file *file)
-{
-	const struct proc_dir_entry *dp = PDE(inode);
-	struct uhci_hcd *uhci = dp->data;
-	struct uhci_proc *up;
-	int ret = -ENOMEM;
-
-	lock_kernel();
-	up = kmalloc(sizeof(*up), GFP_KERNEL);
-	if (!up)
-		goto out;
-
-	up->data = kmalloc(MAX_OUTPUT, GFP_KERNEL);
-	if (!up->data) {
-		kfree(up);
-		goto out;
-	}
-
-	up->size = uhci_sprint_schedule(uhci, up->data, MAX_OUTPUT);
-
-	file->private_data = up;
-
-	ret = 0;
-out:
-	unlock_kernel();
-	return ret;
-}
-
-static loff_t uhci_proc_lseek(struct file *file, loff_t off, int whence)
-{
-	struct uhci_proc *up;
-	loff_t new = -1;
-
-	lock_kernel();
-	up = file->private_data;
-
-	switch (whence) {
-	case 0:
-		new = off;
-		break;
-	case 1:
-		new = file->f_pos + off;
-		break;
-	}
-	if (new < 0 || new > up->size) {
-		unlock_kernel();
-		return -EINVAL;
-	}
-	unlock_kernel();
-	return (file->f_pos = new);
-}
-
-static ssize_t uhci_proc_read(struct file *file, char *buf, size_t nbytes,
-			loff_t *ppos)
-{
-	struct uhci_proc *up = file->private_data;
-	unsigned int pos;
-	unsigned int size;
-
-	pos = *ppos;
-	size = up->size;
-	if (pos >= size)
-		return 0;
-	if (nbytes >= size)
-		nbytes = size;
-	if (pos + nbytes > size)
-		nbytes = size - pos;
-
-	if (!access_ok(VERIFY_WRITE, buf, nbytes))
-		return -EINVAL;
-
-	if (copy_to_user(buf, up->data + pos, nbytes))
-		return -EFAULT;
-
-	*ppos += nbytes;
-
-	return nbytes;
-}
-
-static int uhci_proc_release(struct inode *inode, struct file *file)
-{
-	struct uhci_proc *up = file->private_data;
-
-	kfree(up->data);
-	kfree(up);
-
-	return 0;
-}
-
-static struct file_operations uhci_proc_operations = {
-	.open =		uhci_proc_open,
-	.llseek =	uhci_proc_lseek,
-	.read =		uhci_proc_read,
-//	write:		uhci_proc_write,
-	.release =	uhci_proc_release,
-};
-#endif

drivers/usb/cromwell/uhci/uhci-hcd.h

@@ -1,419 +0,0 @@
-#ifndef __LINUX_UHCI_HCD_H
-#define __LINUX_UHCI_HCD_H
-
-#if 0
-#include <linux/list.h>
-#include <linux/usb.h>
-#endif
-
-#define usb_packetid(pipe)	(usb_pipein(pipe) ? USB_PID_IN : USB_PID_OUT)
-#define PIPE_DEVEP_MASK		0x0007ff00
-
-/*
- * Universal Host Controller Interface data structures and defines
- */
-
-/* Command register */
-#define USBCMD		0
-#define   USBCMD_RS		0x0001	/* Run/Stop */
-#define   USBCMD_HCRESET	0x0002	/* Host reset */
-#define   USBCMD_GRESET		0x0004	/* Global reset */
-#define   USBCMD_EGSM		0x0008	/* Global Suspend Mode */
-#define   USBCMD_FGR		0x0010	/* Force Global Resume */
-#define   USBCMD_SWDBG		0x0020	/* SW Debug mode */
-#define   USBCMD_CF		0x0040	/* Config Flag (sw only) */
-#define   USBCMD_MAXP		0x0080	/* Max Packet (0 = 32, 1 = 64) */
-
-/* Status register */
-#define USBSTS		2
-#define   USBSTS_USBINT		0x0001	/* Interrupt due to IOC */
-#define   USBSTS_ERROR		0x0002	/* Interrupt due to error */
-#define   USBSTS_RD		0x0004	/* Resume Detect */
-#define   USBSTS_HSE		0x0008	/* Host System Error - basically PCI problems */
-#define   USBSTS_HCPE		0x0010	/* Host Controller Process Error - the scripts were buggy */
-#define   USBSTS_HCH		0x0020	/* HC Halted */
-
-/* Interrupt enable register */
-#define USBINTR		4
-#define   USBINTR_TIMEOUT	0x0001	/* Timeout/CRC error enable */
-#define   USBINTR_RESUME	0x0002	/* Resume interrupt enable */
-#define   USBINTR_IOC		0x0004	/* Interrupt On Complete enable */
-#define   USBINTR_SP		0x0008	/* Short packet interrupt enable */
-
-#define USBFRNUM	6
-#define USBFLBASEADD	8
-#define USBSOF		12
-
-/* USB port status and control registers */
-#define USBPORTSC1	16
-#define USBPORTSC2	18
-#define   USBPORTSC_CCS		0x0001	/* Current Connect Status ("device present") */
-#define   USBPORTSC_CSC		0x0002	/* Connect Status Change */
-#define   USBPORTSC_PE		0x0004	/* Port Enable */
-#define   USBPORTSC_PEC		0x0008	/* Port Enable Change */
-#define   USBPORTSC_LS		0x0030	/* Line Status */
-#define   USBPORTSC_RD		0x0040	/* Resume Detect */
-#define   USBPORTSC_LSDA	0x0100	/* Low Speed Device Attached */
-#define   USBPORTSC_PR		0x0200	/* Port Reset */
-#define   USBPORTSC_OC		0x0400	/* Over Current condition */
-#define   USBPORTSC_SUSP	0x1000	/* Suspend */
-
-/* Legacy support register */
-#define USBLEGSUP		0xc0
-#define   USBLEGSUP_DEFAULT	0x2000	/* only PIRQ enable set */
-
-#define UHCI_NULL_DATA_SIZE	0x7FF	/* for UHCI controller TD */
-
-#define UHCI_PTR_BITS		cpu_to_le32(0x000F)
-#define UHCI_PTR_TERM		cpu_to_le32(0x0001)
-#define UHCI_PTR_QH		cpu_to_le32(0x0002)
-#define UHCI_PTR_DEPTH		cpu_to_le32(0x0004)
-#define UHCI_PTR_BREADTH	cpu_to_le32(0x0000)
-
-#define UHCI_NUMFRAMES		1024	/* in the frame list [array] */
-#define UHCI_MAX_SOF_NUMBER	2047	/* in an SOF packet */
-#define CAN_SCHEDULE_FRAMES	1000	/* how far future frames can be scheduled */
-
-struct uhci_frame_list {
-	__u32 frame[UHCI_NUMFRAMES];
-
-	void *frame_cpu[UHCI_NUMFRAMES];
-
-	dma_addr_t dma_handle;
-};
-
-struct urb_priv;
-
-/*
- * One role of a QH is to hold a queue of TDs for some endpoint.  Each QH is
- * used with one URB, and qh->element (updated by the HC) is either:
- *   - the next unprocessed TD for the URB, or
- *   - UHCI_PTR_TERM (when there's no more traffic for this endpoint), or
- *   - the QH for the next URB queued to the same endpoint.
- *
- * The other role of a QH is to serve as a "skeleton" framelist entry, so we
- * can easily splice a QH for some endpoint into the schedule at the right
- * place.  Then qh->element is UHCI_PTR_TERM.
- *
- * In the frame list, qh->link maintains a list of QHs seen by the HC:
- *     skel1 --> ep1-qh --> ep2-qh --> ... --> skel2 --> ...
- */
-struct uhci_qh {
-	/* Hardware fields */
-	__u32 link;			/* Next queue */
-	__u32 element;			/* Queue element pointer */
-
-	/* Software fields */
-	dma_addr_t dma_handle;
-
-	struct usb_device *dev;
-	struct urb_priv *urbp;
-
-	struct list_head list;		/* P: uhci->frame_list_lock */
-	struct list_head remove_list;	/* P: uhci->remove_list_lock */
-} __attribute__((aligned(16)));
-
-/*
- * for TD <status>:
- */
-#define td_status(td)		le32_to_cpu((td)->status)
-#define TD_CTRL_SPD		(1 << 29)	/* Short Packet Detect */
-#define TD_CTRL_C_ERR_MASK	(3 << 27)	/* Error Counter bits */
-#define TD_CTRL_C_ERR_SHIFT	27
-#define TD_CTRL_LS		(1 << 26)	/* Low Speed Device */
-#define TD_CTRL_IOS		(1 << 25)	/* Isochronous Select */
-#define TD_CTRL_IOC		(1 << 24)	/* Interrupt on Complete */
-#define TD_CTRL_ACTIVE		(1 << 23)	/* TD Active */
-#define TD_CTRL_STALLED		(1 << 22)	/* TD Stalled */
-#define TD_CTRL_DBUFERR		(1 << 21)	/* Data Buffer Error */
-#define TD_CTRL_BABBLE		(1 << 20)	/* Babble Detected */
-#define TD_CTRL_NAK		(1 << 19)	/* NAK Received */
-#define TD_CTRL_CRCTIMEO	(1 << 18)	/* CRC/Time Out Error */
-#define TD_CTRL_BITSTUFF	(1 << 17)	/* Bit Stuff Error */
-#define TD_CTRL_ACTLEN_MASK	0x7FF	/* actual length, encoded as n - 1 */
-
-#define TD_CTRL_ANY_ERROR	(TD_CTRL_STALLED | TD_CTRL_DBUFERR | \
-				 TD_CTRL_BABBLE | TD_CTRL_CRCTIME | TD_CTRL_BITSTUFF)
-
-#define uhci_maxerr(err)		((err) << TD_CTRL_C_ERR_SHIFT)
-#define uhci_status_bits(ctrl_sts)	((ctrl_sts) & 0xFE0000)
-#define uhci_actual_length(ctrl_sts)	(((ctrl_sts) + 1) & TD_CTRL_ACTLEN_MASK) /* 1-based */
-
-/*
- * for TD <info>: (a.k.a. Token)
- */
-#define td_token(td)		le32_to_cpu((td)->token)
-#define TD_TOKEN_DEVADDR_SHIFT	8
-#define TD_TOKEN_TOGGLE_SHIFT	19
-#define TD_TOKEN_TOGGLE		(1 << 19)
-#define TD_TOKEN_EXPLEN_SHIFT	21
-#define TD_TOKEN_EXPLEN_MASK	0x7FF		/* expected length, encoded as n - 1 */
-#define TD_TOKEN_PID_MASK	0xFF
-
-#define uhci_explen(len)	((len) << TD_TOKEN_EXPLEN_SHIFT)
-
-#define uhci_expected_length(token) ((((token) >> 21) + 1) & TD_TOKEN_EXPLEN_MASK)
-#define uhci_toggle(token)	(((token) >> TD_TOKEN_TOGGLE_SHIFT) & 1)
-#define uhci_endpoint(token)	(((token) >> 15) & 0xf)
-#define uhci_devaddr(token)	(((token) >> TD_TOKEN_DEVADDR_SHIFT) & 0x7f)
-#define uhci_devep(token)	(((token) >> TD_TOKEN_DEVADDR_SHIFT) & 0x7ff)
-#define uhci_packetid(token)	((token) & TD_TOKEN_PID_MASK)
-#define uhci_packetout(token)	(uhci_packetid(token) != USB_PID_IN)
-#define uhci_packetin(token)	(uhci_packetid(token) == USB_PID_IN)
-
-/*
- * The documentation says "4 words for hardware, 4 words for software".
- *
- * That's silly, the hardware doesn't care. The hardware only cares that
- * the hardware words are 16-byte aligned, and we can have any amount of
- * sw space after the TD entry as far as I can tell.
- *
- * But let's just go with the documentation, at least for 32-bit machines.
- * On 64-bit machines we probably want to take advantage of the fact that
- * hw doesn't really care about the size of the sw-only area.
- *
- * Alas, not anymore, we have more than 4 words for software, woops.
- * Everything still works tho, surprise! -jerdfelt
- *
- * td->link points to either another TD (not necessarily for the same urb or
- * even the same endpoint), or nothing (PTR_TERM), or a QH (for queued urbs)
- */
-struct uhci_td {
-	/* Hardware fields */
-	__u32 link;
-	__u32 status;
-	__u32 token;
-	__u32 buffer;
-
-	/* Software fields */
-	dma_addr_t dma_handle;
-
-	struct usb_device *dev;
-	struct urb *urb;
-
-	struct list_head list;		/* P: urb->lock */
-
-	int frame;			/* for iso: what frame? */
-	struct list_head fl_list;	/* P: uhci->frame_list_lock */
-} __attribute__((aligned(16)));
-
-/*
- * The UHCI driver places Interrupt, Control and Bulk into QH's both
- * to group together TD's for one transfer, and also to faciliate queuing
- * of URB's. To make it easy to insert entries into the schedule, we have
- * a skeleton of QH's for each predefined Interrupt latency, low speed
- * control, high speed control and terminating QH (see explanation for
- * the terminating QH below).
- *
- * When we want to add a new QH, we add it to the end of the list for the
- * skeleton QH.
- *
- * For instance, the queue can look like this:
- *
- * skel int128 QH
- * dev 1 interrupt QH
- * dev 5 interrupt QH
- * skel int64 QH
- * skel int32 QH
- * ...
- * skel int1 QH
- * skel low speed control QH
- * dev 5 control QH
- * skel high speed control QH
- * skel bulk QH
- * dev 1 bulk QH
- * dev 2 bulk QH
- * skel terminating QH
- *
- * The terminating QH is used for 2 reasons:
- * - To place a terminating TD which is used to workaround a PIIX bug
- *   (see Intel errata for explanation)
- * - To loop back to the high speed control queue for full speed bandwidth
- *   reclamation
- *
- * Isochronous transfers are stored before the start of the skeleton
- * schedule and don't use QH's. While the UHCI spec doesn't forbid the
- * use of QH's for Isochronous, it doesn't use them either. Since we don't
- * need to use them either, we follow the spec diagrams in hope that it'll
- * be more compatible with future UHCI implementations.
- */
-
-#define UHCI_NUM_SKELQH		12
-#define skel_int128_qh		skelqh[0]
-#define skel_int64_qh		skelqh[1]
-#define skel_int32_qh		skelqh[2]
-#define skel_int16_qh		skelqh[3]
-#define skel_int8_qh		skelqh[4]
-#define skel_int4_qh		skelqh[5]
-#define skel_int2_qh		skelqh[6]
-#define skel_int1_qh		skelqh[7]
-#define skel_ls_control_qh	skelqh[8]
-#define skel_hs_control_qh	skelqh[9]
-#define skel_bulk_qh		skelqh[10]
-#define skel_term_qh		skelqh[11]
-
-/*
- * Search tree for determining where <interval> fits in the skelqh[]
- * skeleton.
- *
- * An interrupt request should be placed into the slowest skelqh[]
- * which meets the interval/period/frequency requirement.
- * An interrupt request is allowed to be faster than <interval> but not slower.
- *
- * For a given <interval>, this function returns the appropriate/matching
- * skelqh[] index value.
- */
-static inline int __interval_to_skel(int interval)
-{
-	if (interval < 16) {
-		if (interval < 4) {
-			if (interval < 2)
-				return 7;	/* int1 for 0-1 ms */
-			return 6;		/* int2 for 2-3 ms */
-		}
-		if (interval < 8)
-			return 5;		/* int4 for 4-7 ms */
-		return 4;			/* int8 for 8-15 ms */
-	}
-	if (interval < 64) {
-		if (interval < 32)
-			return 3;		/* int16 for 16-31 ms */
-		return 2;			/* int32 for 32-63 ms */
-	}
-	if (interval < 128)
-		return 1;			/* int64 for 64-127 ms */
-	return 0;				/* int128 for 128-255 ms (Max.) */
-}
-
-/*
- * Device states for the host controller.
- *
- * To prevent "bouncing" in the presence of electrical noise,
- * we insist on a 1-second "grace" period, before switching to
- * the RUNNING or SUSPENDED states, during which the state is
- * not allowed to change.
- *
- * The resume process is divided into substates in order to avoid
- * potentially length delays during the timer handler.
- *
- * States in which the host controller is halted must have values <= 0.
- */
-enum uhci_state {
-	UHCI_RESET,
-	UHCI_RUNNING_GRACE,		/* Before RUNNING */
-	UHCI_RUNNING,			/* The normal state */
-	UHCI_SUSPENDING_GRACE,		/* Before SUSPENDED */
-	UHCI_SUSPENDED = -10,		/* When no devices are attached */
-	UHCI_RESUMING_1,
-	UHCI_RESUMING_2
-};
-
-#define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd)
-
-/*
- * This describes the full uhci information.
- *
- * Note how the "proper" USB information is just
- * a subset of what the full implementation needs.
- */
-struct uhci_hcd {
-	struct usb_hcd hcd;
-
-#ifdef CONFIG_PROC_FS
-	/* procfs */
-	struct proc_dir_entry *proc_entry;
-#endif
-
-	/* Grabbed from PCI */
-	unsigned long io_addr;
-
-	struct pci_pool *qh_pool;
-	struct pci_pool *td_pool;
-
-	struct usb_bus *bus;
-
-	struct uhci_td *term_td;	/* Terminating TD, see UHCI bug */
-	struct uhci_qh *skelqh[UHCI_NUM_SKELQH];	/* Skeleton QH's */
-
-	spinlock_t frame_list_lock;
-	struct uhci_frame_list *fl;		/* P: uhci->frame_list_lock */
-	int fsbr;				/* Full speed bandwidth reclamation */
-	unsigned long fsbrtimeout;		/* FSBR delay */
-
-	enum uhci_state state;			/* FIXME: needs a spinlock */
-	unsigned long state_end;		/* Time of next transition */
-	int resume_detect;			/* Need a Global Resume */
-
-	/* Main list of URB's currently controlled by this HC */
-	spinlock_t urb_list_lock;
-	struct list_head urb_list;		/* P: uhci->urb_list_lock */
-
-	/* List of QH's that are done, but waiting to be unlinked (race) */
-	spinlock_t qh_remove_list_lock;
-	struct list_head qh_remove_list;	/* P: uhci->qh_remove_list_lock */
-
-	/* List of asynchronously unlinked URB's */
-	spinlock_t urb_remove_list_lock;
-	struct list_head urb_remove_list;	/* P: uhci->urb_remove_list_lock */
-
-	/* List of URB's awaiting completion callback */
-	spinlock_t complete_list_lock;
-	struct list_head complete_list;		/* P: uhci->complete_list_lock */
-
-	int rh_numports;
-
-	struct timer_list stall_timer;
-};
-
-struct urb_priv {
-	struct list_head urb_list;
-
-	struct urb *urb;
-	struct usb_device *dev;
-
-	struct uhci_qh *qh;		/* QH for this URB */
-	struct list_head td_list;	/* P: urb->lock */
-
-	int fsbr : 1;			/* URB turned on FSBR */
-	int fsbr_timeout : 1;		/* URB timed out on FSBR */
-	int queued : 1;			/* QH was queued (not linked in) */
-	int short_control_packet : 1;	/* If we get a short packet during */
-					/*  a control transfer, retrigger */
-					/*  the status phase */
-
-	int status;			/* Final status */
-
-	unsigned long inserttime;	/* In jiffies */
-	unsigned long fsbrtime;		/* In jiffies */
-
-	struct list_head queue_list;	/* P: uhci->frame_list_lock */
-	struct list_head complete_list;	/* P: uhci->complete_list_lock */
-};
-
-/*
- * Locking in uhci.c
- *
- * spinlocks are used extensively to protect the many lists and data
- * structures we have. It's not that pretty, but it's necessary. We
- * need to be done with all of the locks (except complete_list_lock) when
- * we call urb->complete. I've tried to make it simple enough so I don't
- * have to spend hours racking my brain trying to figure out if the
- * locking is safe.
- *
- * Here's the safe locking order to prevent deadlocks:
- *
- * #1 uhci->urb_list_lock
- * #2 urb->lock
- * #3 uhci->urb_remove_list_lock, uhci->frame_list_lock, 
- *   uhci->qh_remove_list_lock
- * #4 uhci->complete_list_lock
- *
- * If you're going to grab 2 or more locks at once, ALWAYS grab the lock
- * at the lowest level FIRST and NEVER grab locks at the same level at the
- * same time.
- * 
- * So, if you need uhci->urb_list_lock, grab it before you grab urb->lock
- */
-
-#endif
-

drivers/usb/cromwell/uhci/uhci-hub.c

@@ -1,184 +0,0 @@
-/*
- * Universal Host Controller Interface driver for USB.
- *
- * Maintainer: Johannes Erdfelt <johannes@erdfelt.com>
- *
- * (C) Copyright 1999 Linus Torvalds
- * (C) Copyright 1999-2002 Johannes Erdfelt, johannes@erdfelt.com
- * (C) Copyright 1999 Randy Dunlap
- * (C) Copyright 1999 Georg Acher, acher@in.tum.de
- * (C) Copyright 1999 Deti Fliegl, deti@fliegl.de
- * (C) Copyright 1999 Thomas Sailer, sailer@ife.ee.ethz.ch
- */
-
-static __u8 root_hub_hub_des[] =
-{
-	0x09,			/*  __u8  bLength; */
-	0x29,			/*  __u8  bDescriptorType; Hub-descriptor */
-	0x02,			/*  __u8  bNbrPorts; */
-	0x00,			/* __u16  wHubCharacteristics; */
-	0x00,
-	0x01,			/*  __u8  bPwrOn2pwrGood; 2ms */
-	0x00,			/*  __u8  bHubContrCurrent; 0 mA */
-	0x00,			/*  __u8  DeviceRemovable; *** 7 Ports max *** */
-	0xff			/*  __u8  PortPwrCtrlMask; *** 7 ports max *** */
-};
-
-static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf)
-{
-	struct uhci_hcd *uhci = hcd_to_uhci(hcd);
-	unsigned int io_addr = uhci->io_addr;
-	int i, len = 1;
-
-	*buf = 0;
-	for (i = 0; i < uhci->rh_numports; i++) {
-		*buf |= ((inw(io_addr + USBPORTSC1 + i * 2) & 0xa) > 0 ? (1 << (i + 1)) : 0);
-		len = (i + 1) / 8 + 1;
-	}
-
-	return !!*buf;
-}
-
-#define OK(x)			len = (x); break
-
-#define CLR_RH_PORTSTAT(x) \
-	status = inw(io_addr + USBPORTSC1 + 2 * (wIndex-1)); \
-	status = (status & 0xfff5) & ~(x); \
-	outw(status, io_addr + USBPORTSC1 + 2 * (wIndex-1))
-
-#define SET_RH_PORTSTAT(x) \
-	status = inw(io_addr + USBPORTSC1 + 2 * (wIndex-1)); \
-	status = (status & 0xfff5) | (x); \
-	outw(status, io_addr + USBPORTSC1 + 2 * (wIndex-1))
-
-
-/* size of returned buffer is part of USB spec */
-static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
-			u16 wIndex, char *buf, u16 wLength)
-{
-	struct uhci_hcd *uhci = hcd_to_uhci(hcd);
-	int i, status, retval = 0, len = 0;
-	unsigned int io_addr = uhci->io_addr;
-	__u16 cstatus;
-	char c_p_r[8];
-
-	for (i = 0; i < 8; i++)
-		c_p_r[i] = 0;
-
-	switch (typeReq) {
-		/* Request Destination:
-		   without flags: Device,
-		   RH_INTERFACE: interface,
-		   RH_ENDPOINT: endpoint,
-		   RH_CLASS means HUB here,
-		   RH_OTHER | RH_CLASS  almost ever means HUB_PORT here
-		*/
-
-	case GetHubStatus:
-		*(__u32 *)buf = cpu_to_le32(0);
-		OK(4);		/* hub power */
-	case GetPortStatus:
-		status = inw(io_addr + USBPORTSC1 + 2 * (wIndex - 1));
-		cstatus = ((status & USBPORTSC_CSC) >> (1 - 0)) |
-			((status & USBPORTSC_PEC) >> (3 - 1)) |
-			(c_p_r[wIndex - 1] << (0 + 4));
-			status = (status & USBPORTSC_CCS) |
-			((status & USBPORTSC_PE) >> (2 - 1)) |
-			((status & USBPORTSC_SUSP) >> (12 - 2)) |
-			((status & USBPORTSC_PR) >> (9 - 4)) |
-			(1 << 8) |      /* power on */
-			((status & USBPORTSC_LSDA) << (-8 + 9));
-
-		*(__u16 *)buf = cpu_to_le16(status);
-		*(__u16 *)(buf + 2) = cpu_to_le16(cstatus);
-		OK(4);
-	case SetHubFeature:
-		switch (wValue) {
-		case C_HUB_OVER_CURRENT:
-		case C_HUB_LOCAL_POWER:
-			break;
-		default:
-			goto err;
-		}
-		break;
-	case ClearHubFeature:
-		switch (wValue) {
-		case C_HUB_OVER_CURRENT:
-			OK(0);	/* hub power over current */
-		default:
-			goto err;
-		}
-		break;
-	case SetPortFeature:
-		if (!wIndex || wIndex > uhci->rh_numports)
-			goto err;
-
-		switch (wValue) {
-		case USB_PORT_FEAT_SUSPEND:
-			SET_RH_PORTSTAT(USBPORTSC_SUSP);
-			OK(0);
-		case USB_PORT_FEAT_RESET:
-			SET_RH_PORTSTAT(USBPORTSC_PR);
-			mdelay(50);	/* USB v1.1 7.1.7.3 */
-			c_p_r[wIndex - 1] = 1;
-			CLR_RH_PORTSTAT(USBPORTSC_PR);
-			udelay(10);
-			SET_RH_PORTSTAT(USBPORTSC_PE);
-			mdelay(10);
-			SET_RH_PORTSTAT(0xa);
-			OK(0);
-		case USB_PORT_FEAT_POWER:
-			OK(0); /* port power ** */
-		case USB_PORT_FEAT_ENABLE:
-			SET_RH_PORTSTAT(USBPORTSC_PE);
-			OK(0);
-		default:
-			goto err;
-		}
-		break;
-	case ClearPortFeature:
-		if (!wIndex || wIndex > uhci->rh_numports)
-			goto err;
-
-		switch (wValue) {
-		case USB_PORT_FEAT_ENABLE:
-			CLR_RH_PORTSTAT(USBPORTSC_PE);
-			OK(0);
-		case USB_PORT_FEAT_C_ENABLE:
-			SET_RH_PORTSTAT(USBPORTSC_PEC);
-			OK(0);
-		case USB_PORT_FEAT_SUSPEND:
-			CLR_RH_PORTSTAT(USBPORTSC_SUSP);
-			OK(0);
-		case USB_PORT_FEAT_C_SUSPEND:
-			/*** WR_RH_PORTSTAT(RH_PS_PSSC); */
-			OK(0);
-		case USB_PORT_FEAT_POWER:
-			OK(0);	/* port power */
-		case USB_PORT_FEAT_C_CONNECTION:
-			SET_RH_PORTSTAT(USBPORTSC_CSC);
-			OK(0);
-		case USB_PORT_FEAT_C_OVER_CURRENT:
-			OK(0);	/* port power over current */
-		case USB_PORT_FEAT_C_RESET:
-			c_p_r[wIndex - 1] = 0;
-			OK(0);
-		default:
-			goto err;
-		}
-		break;
-	case GetHubDescriptor:
-		len = min_t(unsigned int, wLength,
-			  min_t(unsigned int, sizeof(root_hub_hub_des), wLength));
-		memcpy(buf, root_hub_hub_des, len);
-		if (len > 2)
-			buf[2] = uhci->rh_numports;
-		OK(len);
-	default:
-err:
-		retval = -EPIPE;
-	}
-
-	return retval;
-}
-

drivers/usb/cromwell/uhci/uhci.def

@@ -1,2 +0,0 @@
-LIBRARY uhci.sys
-EXPORTS

drivers/usb/cromwell/uhci/uhci.rc

@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"USB UHCI Device Driver\0"
-#define REACTOS_STR_INTERNAL_NAME	"uhci\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"uhci.sys\0"
-#include <reactos/version.rc>

drivers/usb/cromwell/uhci/uhci_config.h

@@ -1,5 +0,0 @@
-/*
- * Configs for UHCI
- */
-
-#define CONFIG_PCI

drivers/usb/cromwell/uhci/uhci_main.c

@@ -1,309 +0,0 @@
-/*
-   ReactOS specific functions for UHCI module
-   by Aleksey Bragin (aleksey@reactos.com)
-   Some parts of code are inspired (or even just copied) from ReactOS Videoport driver
-*/
-
-#include <ddk/ntddk.h>
-#include <debug.h>
-#include "../linux/linux_wrapper.h"
-#include "../host/ohci_main.h"
-
-// declare basic init funcs
-void init_wrapper(struct pci_dev *probe_dev);
-int uhci_hcd_init(void);
-void uhci_hcd_cleanup(void);
-int STDCALL usb_init(void);
-void STDCALL usb_exit(void);
-extern struct pci_driver uhci_pci_driver;
-extern const struct pci_device_id uhci_pci_ids[];
-
-
-
-// This should be removed, but for testing purposes it's here
-struct pci_dev *dev;
-//struct pci_device_id *dev_id;
-
-
-#define USB_UHCI_TAG TAG('u','s','b','u')
-
-NTSTATUS STDCALL AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo)
-{
-	PDEVICE_OBJECT fdo;
-	NTSTATUS Status;
-	WCHAR DeviceBuffer[20];
-	UNICODE_STRING DeviceName;
-	POHCI_DRIVER_EXTENSION DriverExtension;
-	POHCI_DEVICE_EXTENSION DeviceExtension;
-	ULONG Size, DeviceNumber;
-
-	DPRINT1("uhci: AddDevice called\n");
-
-	// Allocate driver extension now
-	DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject);
-	if (DriverExtension == NULL)
-	{
-		Status = IoAllocateDriverObjectExtension(
-					DriverObject,
-					DriverObject,
-					sizeof(OHCI_DRIVER_EXTENSION),
-					(PVOID *)&DriverExtension);
-
-		if (!NT_SUCCESS(Status))
-		{
-			DPRINT1("Allocating DriverObjectExtension failed.\n");
-			return Status;
-		}
-	}
-   
-	// Create a unicode device name
-	DeviceNumber = 0; //TODO: Allocate new device number every time
-	swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber);
-	RtlInitUnicodeString(&DeviceName, DeviceBuffer);
-
-	Status = IoCreateDevice(DriverObject,
-		                    sizeof(OHCI_DEVICE_EXTENSION)/* + DriverExtension->InitializationData.HwDeviceExtensionSize*/,
-							&DeviceName,
-							FILE_DEVICE_CONTROLLER,
-							0,
-							FALSE,
-							&fdo);
-
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("IoCreateDevice call failed with status 0x%08x\n", Status);
-		return Status;
-	}
-
-	// zerofill device extension
-	DeviceExtension = (POHCI_DEVICE_EXTENSION)pdo->DeviceExtension;
-	RtlZeroMemory(DeviceExtension, sizeof(OHCI_DEVICE_EXTENSION));
-	DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(fdo, pdo);
-
-	fdo->Flags &= ~DO_DEVICE_INITIALIZING;
-
-	// Initialize device extension
-	DeviceExtension->DeviceNumber = DeviceNumber;
-	DeviceExtension->PhysicalDeviceObject = pdo;
-	DeviceExtension->FunctionalDeviceObject = fdo;
-	DeviceExtension->DriverExtension = DriverExtension;
-
-	/* Get bus number from the upper level bus driver. */
-	Size = sizeof(ULONG);
-	Status = IoGetDeviceProperty(
-				pdo,
-				DevicePropertyBusNumber,
-				Size,
-				&DeviceExtension->SystemIoBusNumber,
-				&Size);
-	
-	if (!NT_SUCCESS(Status))
-	{
-		DPRINT("Couldn't get an information from bus driver. Panic!!!\n");
-		return Status;
-	}
-
-	DPRINT("Done AddDevice\n");
-	return STATUS_SUCCESS;
-}
-
-VOID STDCALL DriverUnload(PDRIVER_OBJECT DriverObject)
-{
-	DPRINT1("DriverUnload()\n");
-
-	// Exit usb device
-	usb_exit();
-
-	// Remove device (ohci_pci_driver.remove)
-	uhci_pci_driver.remove(dev);
-
-	ExFreePool(dev->slot_name);
-	ExFreePool(dev);
-
-	// Perform some cleanup
-	uhci_hcd_cleanup();
-}
-
-NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject)
-{
-	NTSTATUS Status;
-	POHCI_DEVICE_EXTENSION DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-
-	// Fill generic linux structs
-	dev = ExAllocatePoolWithTag(PagedPool, sizeof(struct pci_dev), USB_UHCI_TAG);
-	
-	init_wrapper(dev);
-	dev->irq = DeviceExtension->InterruptLevel;
-	dev->dev_ext = (PVOID)DeviceExtension;
-	dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name
-
-	strcpy(dev->dev.name, "UnivHCI PCI-USB Controller");
-	strcpy(dev->slot_name, "UHCD PCI Slot");
-
-	// Init the OHCI HCD. Probe will be called automatically, but will fail because id=NULL
-	Status = uhci_hcd_init();
-	//FIXME: Check status returned value
-
-	// Init core usb
-	usb_init();
-
-	// Probe device with real id now
-	uhci_pci_driver.probe(dev, uhci_pci_ids);
-
-	DPRINT("InitLinuxWrapper() done\n");
-
-	return STATUS_SUCCESS;
-}
-
-NTSTATUS STDCALL
-OHCD_PnPStartDevice(IN PDEVICE_OBJECT DeviceObject,
-					IN PIRP	Irp)
-{
-	PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
-	PDRIVER_OBJECT DriverObject;
-	POHCI_DRIVER_EXTENSION DriverExtension;
-	POHCI_DEVICE_EXTENSION DeviceExtension;
-	PCM_RESOURCE_LIST AllocatedResources;
-
-	/*
-	* Get the initialization data we saved in VideoPortInitialize.
-	*/
-	DriverObject = DeviceObject->DriverObject;
-	DriverExtension	= IoGetDriverObjectExtension(DriverObject, DriverObject);
-	DeviceExtension	= (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
-
-	/*
-	* Store	some resources in the DeviceExtension.
-	*/
-	AllocatedResources = Stack->Parameters.StartDevice.AllocatedResources;
-	if (AllocatedResources != NULL)
-	{
-		CM_FULL_RESOURCE_DESCRIPTOR	*FullList;
-		CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor;
-		ULONG ResourceCount;
-		ULONG ResourceListSize;
-
-		/* Save	the	resource list */
-		ResourceCount =	AllocatedResources->List[0].PartialResourceList.Count;
-		ResourceListSize =
-			FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList.
-			PartialDescriptors[ResourceCount]);
-		DeviceExtension->AllocatedResources	= ExAllocatePool(PagedPool,	ResourceListSize);
-		if (DeviceExtension->AllocatedResources	== NULL)
-		{
-			return STATUS_INSUFFICIENT_RESOURCES;
-		}
-
-		RtlCopyMemory(DeviceExtension->AllocatedResources,
-			AllocatedResources,
-			ResourceListSize);
-
-		/* Get the interrupt level/vector -	needed by HwFindAdapter	sometimes */
-		for	(FullList =	AllocatedResources->List;
-			FullList < AllocatedResources->List	+ AllocatedResources->Count;
-			FullList++)
-		{
-			/* FIXME: Is this ASSERT ok	for	resources from the PNP manager?	*/
-			/*ASSERT(FullList->InterfaceType == PCIBus &&
-				FullList->BusNumber	== DeviceExtension->SystemIoBusNumber &&
-				1 == FullList->PartialResourceList.Version &&
-				1 == FullList->PartialResourceList.Revision);*/
-			for	(Descriptor	= FullList->PartialResourceList.PartialDescriptors;
-				Descriptor < FullList->PartialResourceList.PartialDescriptors +	FullList->PartialResourceList.Count;
-				Descriptor++)
-			{
-				if (Descriptor->Type ==	CmResourceTypeInterrupt)
-				{
-					DeviceExtension->InterruptLevel	= Descriptor->u.Interrupt.Level;
-					DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector;
-				}
-				else if (Descriptor->Type ==	CmResourceTypeMemory)
-				{
-					DeviceExtension->BaseAddress	= Descriptor->u.Memory.Start;
-					DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length;
-				}
-			}
-		}
-	}
-	DPRINT1("Interrupt level: 0x%x Interrupt	Vector:	0x%x\n",
-		DeviceExtension->InterruptLevel,
-		DeviceExtension->InterruptVector);
-
-	/*
-	* Init wrapper with this object
-	*/
-	return InitLinuxWrapper(DeviceObject);
-}
-
-// Dispatch PNP
-NTSTATUS STDCALL DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp)
-{
-   PIO_STACK_LOCATION IrpSp;
-   NTSTATUS Status;
-
-   IrpSp = IoGetCurrentIrpStackLocation(Irp);
-
-   switch (IrpSp->MinorFunction)
-   {
-      case IRP_MN_START_DEVICE:
-         //Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp);
-         //if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status))
-         
-		 Status = OHCD_PnPStartDevice(DeviceObject, Irp);
-         Irp->IoStatus.Status = Status;
-         Irp->IoStatus.Information = 0;
-         IoCompleteRequest(Irp, IO_NO_INCREMENT);
-         break;
-
-
-      case IRP_MN_REMOVE_DEVICE:
-      case IRP_MN_QUERY_REMOVE_DEVICE:
-      case IRP_MN_CANCEL_REMOVE_DEVICE:
-      case IRP_MN_SURPRISE_REMOVAL:
-
-      case IRP_MN_STOP_DEVICE:
-         //Status = IntVideoPortForwardIrpAndWait(DeviceObject, Irp);
-         //if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status))
-            Status = STATUS_SUCCESS;
-         Irp->IoStatus.Status = Status;
-         Irp->IoStatus.Information = 0;
-         IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
-		 IoDeleteDevice(DeviceObject); // just delete device for now
-         break;
-
-      case IRP_MN_QUERY_STOP_DEVICE:
-      case IRP_MN_CANCEL_STOP_DEVICE:
-         Status = STATUS_SUCCESS;
-         Irp->IoStatus.Status = STATUS_SUCCESS;
-         Irp->IoStatus.Information = 0;
-         IoCompleteRequest(Irp, IO_NO_INCREMENT);
-         break;
-         
-      default:
-         return STATUS_NOT_IMPLEMENTED;
-         break;
-   }
-   
-   return Status;
-}
-
-NTSTATUS STDCALL DispatchPower(PDEVICE_OBJECT fido, PIRP Irp)
-{
-	DbgPrint("IRP_MJ_POWER dispatch\n");
-	return STATUS_SUCCESS;
-}
-
-/*
- * Standard DriverEntry method.
- */
-NTSTATUS STDCALL
-DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath)
-{
-	DriverObject->DriverUnload = DriverUnload;
-	DriverObject->DriverExtension->AddDevice = AddDevice;
-	DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp;
-	DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower;
-
-	return STATUS_SUCCESS;
-}

drivers/video/miniport/vga/vgamp.h

@@ -1,124 +0,0 @@
-/*
- * ReactOS VGA miniport video driver
- *
- * Copyright (C) 2004 Filip Navara, Herve Poussineau
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef VGAMP_H
-#define VGAMP_H
-
-/* INCLUDES *******************************************************************/
-
-#include <ddk/miniport.h>
-#include <ddk/video.h>
-#include <ddk/ntddvdeo.h>
-#include <debug.h>
-
-void
-InitVGAMode();
-
-static VP_STATUS STDCALL
-VGAFindAdapter(
-   PVOID DeviceExtension,
-   PVOID Context,
-   PWSTR ArgumentString,
-   PVIDEO_PORT_CONFIG_INFO ConfigInfo,
-   PUCHAR Again);
-
-static BOOLEAN STDCALL
-VGAInitialize(
-   PVOID DeviceExtension);
-
-static BOOLEAN STDCALL
-VGAStartIO(
-   PVOID DeviceExtension,
-   PVIDEO_REQUEST_PACKET RequestPacket);
-
-/*static BOOLEAN STDCALL
-VGAInterrupt(PVOID DeviceExtension);*/
-
-static BOOLEAN STDCALL
-VGAResetHw(
-   PVOID DeviceExtension,
-   ULONG Columns,
-   ULONG Rows);
-
-/*static VOID STDCALL
-VGATimer(PVOID DeviceExtension);*/
-
-/* Mandatory IoControl routines */
-BOOL
-VGAMapVideoMemory(
-   IN PVOID DeviceExtension,
-   IN PVIDEO_MEMORY RequestedAddress,
-   OUT PVIDEO_MEMORY_INFORMATION MapInformation,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAQueryAvailModes(
-   OUT PVIDEO_MODE_INFORMATION ReturnedModes,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAQueryCurrentMode(
-   OUT PVIDEO_MODE_INFORMATION CurrentMode,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAQueryNumAvailModes(
-   OUT PVIDEO_NUM_MODES NumberOfModes,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGASetColorRegisters(
-   IN PVIDEO_CLUT ColorLookUpTable,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGASetPaletteRegisters(
-   IN PWORD PaletteRegisters,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGASetCurrentMode(
-   IN PVIDEO_MODE RequestedMode,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAShareVideoMemory(
-   IN PVIDEO_SHARE_MEMORY RequestedMemory,
-   OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAUnmapVideoMemory(
-   IN PVOID DeviceExtension,
-   IN PVIDEO_MEMORY MemoryToUnmap,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-BOOL
-VGAUnshareVideoMemory(
-   IN PVIDEO_MEMORY MemoryToUnshare,
-   OUT PSTATUS_BLOCK StatusBlock);
-
-/* Optional IoControl routines */
-/* None actually */
-
-#endif /* VGAMP_H */

include/idl/svcctl.idl

@@ -1,127 +0,0 @@
-/*
- * Service Control Manager (SCM) interface definition
- */
-
-//#include <windef.h>
-//#include <winsvc.h>
-
-#define DWORD unsigned long
-#define BOOL unsigned long
-#define SC_HANDLE unsigned int
-#define SC_LOCK unsigned int
-#define LPCSTR char*
-#define LPCWSTR wchar_t*
-#define LPDWORD unsigned long*
-
-[
-  uuid(367abb81-9844-35f1-ad32-98f038001003),
-  version(2.0),
-  pointer_default(unique),
-  explicit_handle
-]
-interface svcctl
-{
-cpp_quote("#if 0")
-  typedef struct _SERVICE_STATUS
-  {
-    DWORD dwServiceType;
-    DWORD dwCurrentState;
-    DWORD dwControlsAccepted;
-    DWORD dwWin32ExitCode;
-    DWORD dwServiceSpecificExitCode;
-    DWORD dwCheckPoint;
-    DWORD dwWaitHint;
-  } SERVICE_STATUS, *LPSERVICE_STATUS;
-cpp_quote("#endif")
-
-  /* Function 0 */
-  DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle,
-                               [in] SC_HANDLE hSCObject);
-
-  /* Function 1 */
-  BOOL ScmrControlService([in] handle_t BindingHandle,
-                          [in] SC_HANDLE hService,
-                          [in] DWORD dwControl,
-                          [out] LPSERVICE_STATUS lpServiceStatus);
-
-  /* Function 2 */
-  DWORD ScmrDeleteService([in] handle_t BindingHandle,
-                          [in] SC_HANDLE hService);
-
-  /* Function 3 */
-  DWORD ScmrLockServiceDatabase([in] handle_t BindingHandle,
-                                [in] SC_HANDLE hSCManager,
-                                [out] SC_LOCK *hLock);
-
-  /* Function 4 */
-  DWORD ScmrQueryServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */
-
-  /* Function 5 */
-  DWORD ScmrSetServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */
-
-  /* Function 6 */
-  DWORD ScmrQueryServiceStatus([in] handle_t BindingHandle,
-                               [in] SC_HANDLE hSCManager,
-                               [out] LPSERVICE_STATUS lpServiceStatus);
-
-  /* Function 7 */
-  DWORD ScmrSetServiceStatus([in] handle_t BindingHandle); /* FIXME */
-
-  /* Function 8 */
-  DWORD ScmrUnlockServiceDatabase([in] handle_t BindingHandle,
-                                  [in] SC_LOCK hLock);
-
-  /* Function 9 */
-  DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle,
-                                   [in] BOOL BootAcceptable);
-
-
-  /* Function 12 */
-//  DWORD ScmrCreateServiceW([in] handle_t BindingHandle,
-//                           [in] SC_HANDLE hSCManager,
-//                           [in, string, ref] LPCWSTR lpServiceName,
-//                           [in, string, ref] LPCWSTR lpDisplayName,
-//                           [in] DWORD dwDesiredAccess,
-//                           [in] DWORD dwServiceType,
-//                           [in] DWORD dwStartType,
-//                           [in] DWORD dwErrorControl,
-//                           [in, string, ref] LPCWSTR lpBinaryPathName,
-//                           [in, string, unique] LPCWSTR lpLoadOrderGroup,
-//                           [out] LPDWORD lpdwTagId,
-//                           [in, size_is(dwDepwndenciesLength), unique] LPCWSTR lpDependencies,
-//                           [in] DWORD dwDependenciesLength,
-//                           [in, string, unique] LPCWSTR lpServiceStartName,
-//                           [in, size_is(dwPasswordLength), unique] LPCWSTR lpPassword,
-//                           [in] DWORD dwPasswordLength,
-//                           [out] SC_HANDLE *hService);
-
-
-  /* Function 15 */
-  DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle,
-                           [in, string, unique] LPCWSTR lpMachineName,
-                           [in, string, unique] LPCWSTR lpDatabaseName,
-                           [in] DWORD dwDesiredAccess,
-                           [out] SC_HANDLE *hScm);
-
-  /* Function 16 */
-  SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle,
-                             [in] SC_HANDLE hSCManager,
-                             [in, string] LPCWSTR lpServiceName,
-                             [in] DWORD dwDesiredAccess,
-                             [out] SC_HANDLE *hScm);
-
-
-  /* Function 27 */
-  DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle,
-                           [in, string, unique] LPCSTR lpMachineName,
-                           [in, string, unique] LPCSTR lpDatabaseName,
-                           [in] DWORD dwDesiredAccess,
-                           [out] SC_HANDLE *hScm);
-
-  /* Function 28 */
-  SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle,
-                             [in] SC_HANDLE hSCManager,
-                             [in, string] LPCSTR lpServiceName,
-                             [in] DWORD dwDesiredAccess,
-                             [out] SC_HANDLE *hScm);
-}

include/pseh/native.h

@@ -1,242 +0,0 @@
-/*
- Copyright (c) 2004/2005 KJK::Hyperion
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-*/
-
-#ifndef KJK_PSEH_NATIVE_H_
-#define KJK_PSEH_NATIVE_H_
-
-#include <excpt.h>
-#include <pseh/excpt.h>
-
-/*
- Note: just define __inline to an empty symbol if your C compiler doesn't
- support it
-*/
-#ifdef __cplusplus
-# ifndef __inline
-#  define __inline inline
-# endif
-#endif
-
-typedef long (__stdcall * _SEHFilter_t)
-(
- long,
- struct _EXCEPTION_POINTERS *,
- void *
-);
-
-typedef void (__stdcall * _SEHFinally_t)
-(
- int,
- void *
-);
-
-static __inline long _SEHCallFilter
-(
- _SEHFilter_t _SEHFilter,
- long _SEHExceptionCode,
- struct _EXCEPTION_POINTERS * _SEHExceptionPointers,
- void * _SEHPVLocals
-)
-{
- if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER))
-  return _SEH_EXECUTE_HANDLER;
- else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH))
-  return _SEH_CONTINUE_SEARCH;
- else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION))
-  return _SEH_CONTINUE_EXECUTION;
- else if(_SEHFilter)
-  return _SEHFilter(_SEHExceptionCode, _SEHExceptionPointers, _SEHPVLocals);
- else
-  return _SEH_CONTINUE_SEARCH;
-}
-
-static __inline void _SEHCallFinally
-(
- _SEHFinally_t _SEHFinally,
- int _SEHAbnormalTermination,
- void * _SEHPVLocals
-)
-{
- if(_SEHFinally)
-  (_SEHFinally)(_SEHAbnormalTermination, _SEHPVLocals);
-}
-
-/* SHARED LOCALS */
-/* Access the locals for the current frame */
-#define _SEH_ACCESS_LOCALS(LOCALS_) \
- _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \
- _SEHPLocals = _SEH_PVOID_CAST(_SEH_LOCALS_TYPENAME(LOCALS_) *, _SEHPVLocals);
-
-/* Access local variable VAR_ */
-#define _SEH_VAR(VAR_) _SEHPLocals->VAR_
-
-/* FILTER FUNCTIONS */
-/* Declares a filter function's prototype */
-#define _SEH_FILTER(NAME_) \
- long __stdcall NAME_ \
- ( \
-  long _SEHExceptionCode, \
-  struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \
-  void * _SEHPVLocals \
- )
-
-/* Declares a static filter */
-#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2))
-
-/* Declares a PSEH filter wrapping a regular filter function */
-#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \
- static __inline _SEH_FILTER(WRAPPER_) \
- { \
-  return (NAME_)(_SEHExceptionPointers); \
- }
-
-/* FINALLY FUNCTIONS */
-/* Declares a finally function's prototype */
-#define _SEH_FINALLY(NAME_) \
- void __stdcall NAME_ \
- ( \
-  int _SEHAbnormalTermination, \
-  void * _SEHPVLocals \
- )
-
-/* Declares a PSEH finally function wrapping a regular function */
-#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \
- _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ())
-
-#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \
- static __inline _SEH_FINALLY(WRAPPER_) \
- { \
-  NAME_ ARGS_; \
- }
-
-#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \
- static __inline _SEH_FINALLY(WRAPPER_) \
- { \
-  _SEH_ACCESS_LOCALS(LOCALS_); \
-  NAME_ ARGS_; \
- }
-
-/* SAFE BLOCKS */
-#define _SEH_TRY_FINALLY(FINALLY_) \
- _SEH_TRY_FILTER_FINALLY \
- ( \
-  _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \
-  (FINALLY_) \
- )
-
-#define _SEH_END_FINALLY _SEH_HANDLE _SEH_END
-
-#define _SEH_TRY_FILTER(FILTER_) \
- _SEH_TRY_FILTER_FINALLY((FILTER_), NULL)
-
-#define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \
- _SEH_TRY_FILTER_FINALLY \
- ( \
-  _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \
-  (FINALLY_) \
- )
-
-#define _SEH_TRY \
- _SEH_TRY_HANDLE_FINALLY(NULL)
-
-#define _SEH_CALL_FILTER(FILTER_) \
- _SEHCallFilter                                                                \
- (                                                                             \
-  (FILTER_),                                                                   \
-  GetExceptionCode(),                                                          \
-  GetExceptionPointers(),                                                      \
-  _SEHPVLocals                                                                 \
- )
-
-#define _SEH_CALL_FINALLY(FINALLY_) \
- _SEHCallFinally((FINALLY_), (AbnormalTermination() != 0), _SEHPVLocals)
-
-#define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \
- __try                                                                         \
- {                                                                             \
-  _SEHFinally_t _SEHFinally = (FINALLY_);                                      \
-  _SEHFilter_t _SEHFilter = (FILTER_);                                         \
-  void * _SEHPVLocals = &_SEHLocals;                                           \
-  (void)_SEHPVLocals;                                                          \
-                                                                               \
-  __try                                                                        \
-  {
-
-#define _SEH_HANDLE \
-  }                                                                            \
-  __except(_SEH_CALL_FILTER(_SEHFilter))                                       \
-  {                                                                            \
-   struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\
-   long _SEHExceptionCode = GetExceptionCode();                                \
-
-#define _SEH_END \
-  }                                                                            \
- }                                                                             \
- __finally                                                                     \
- {                                                                             \
-  _SEH_CALL_FINALLY(_SEHFinally);                                              \
- }
-
-#define _SEH_LEAVE __leave
-
-#define _SEH_GetExceptionCode() (_SEHExceptionCode)
-#define _SEH_GetExceptionPointers() (_SEHExceptionPointers)
-#define _SEH_AbnormalTermination() (_SEHAbnormalTermination)
-
-/* New syntax */
-
-#define _SEH2_TRY \
- {                                                                             \
-  void * _SEHPVLocals = &_SEHLocals;                                           \
-  (void)_SEHPVLocals;                                                          \
-                                                                               \
-  __try                                                                        \
-  {
-
-#define _SEH2_EXCEPT(FILTER_) \
-  }                                                                            \
-  __except(_SEH_CALL_FILTER(FILTER_))                                          \
-  {                                                                            \
-   struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\
-   long _SEHExceptionCode = GetExceptionCode();                                \
-
-#define _SEH2_FINALLY(FINALLY_) \
-  }                                                                            \
-  __finally                                                                    \
-  {                                                                            \
-   _SEH_CALL_FINALLY(FINALLY_)
-
-#define _SEH2_END \
-  }                                                                            \
- }
-
-#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER))
-
-#define _SEH2_LEAVE _SEH_LEAVE
-
-#define _SEH2_GetExceptionCode     _SEH_GetExceptionCode
-#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers
-#define _SEH2_AbnormalTermination  _SEH_AbnormalTermination
-
-#endif
-
-/* EOF */

include/rosdhcp_public.h

@@ -1,46 +0,0 @@
-#ifndef ROSDHCP_PUBLIC_H
-#define ROSDHCP_PUBLIC_H
-
-enum {
-    DhcpReqLeaseIpAddress,
-    DhcpReqQueryHWInfo,
-    DhcpReqReleaseIpAddress,
-    DhcpReqRenewIpAddress,
-    DhcpReqStaticRefreshParams,
-};
-
-typedef struct _COMM_DHCP_REQ {
-    UINT Type;
-    DWORD AdapterIndex;
-    union {
-        struct {
-            BOOL Inserted;
-        } PnpEvent;
-        struct {
-            LPWSTR AdapterName;
-            DHCPCAPI_PARAMS_ARRAY Params;
-        } RegisterParamChange;
-        struct {
-            LPWSTR AdapterName;
-            LPWSTR RequestId;
-        } RequestParams, UndoRequestParams;
-        struct {
-            DWORD IPAddress;
-            DWORD Netmask;
-        } StaticRefreshParams;
-    } Body;
-} COMM_DHCP_REQ;
-
-typedef union _COMM_DHCP_REPLY {
-    DWORD Reply;
-    struct {
-        DWORD AdapterIndex;
-        DWORD MediaType;
-        DWORD Mtu;
-        DWORD Speed;
-    } QueryHWInfo;
-} COMM_DHCP_REPLY;
-
-#define DHCP_PIPE_NAME "\\\\.\\pipe\\dhcpclient"
-
-#endif/*ROSDHCP_PUBLIC_H*/

lib/aclui/aclui_Sv.rc

@@ -1,42 +0,0 @@
-/*
- * Copyright 2005 Andreas Bjerkeholt
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-IDD_SECPAGE DIALOGEX 0, 0, 227, 215
-STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION
-CAPTION "S<>kerhet"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "&Grupp eller anv<6E>ndarnamn:", -1, 7, 7, 105, 8
-  CONTROL "", IDC_ACELIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE
-  PUSHBUTTON "&L<>gg till...", IDC_ACELIST_ADD, 116, 87, 50, 14
-  PUSHBUTTON "&Ta bort", IDC_ACELIST_REMOVE, 170, 87, 50, 14
-  LTEXT "Till<6C>t", -1, 135, 107, 32, 8, SS_CENTER
-  LTEXT "Neka", -1, 176, 107, 32, 8, SS_CENTER
-END
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_PSP_TITLE "Beh<65>righeter f<>r %1"
-}
-

lib/comctl32/comctl_Sv.rc

@@ -1,87 +0,0 @@
-/*
- * Copyright 2005 Andreas Bjerkeholt
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Egenskaper f<>r "
-FONT 8, "MS Shell Dlg"
-BEGIN
-  DEFPUSHBUTTON "OK",     IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
-  PUSHBUTTON    "Avbryt", IDCANCEL,58,122,50,14
-  PUSHBUTTON    "&Verkst<73>ll", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
-  PUSHBUTTON    "Hj<48>lp",   IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
-  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Guide"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  DEFPUSHBUTTON "Slutf<74>r",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&N<>sta >", IDC_NEXT_BUTTON,121,138,50,14
-  PUSHBUTTON    "< &F<>reg<65>ende", IDC_BACK_BUTTON,71,138,50,14
-  PUSHBUTTON    "Avbryt",  IDCANCEL,178,138,50,14
-  PUSHBUTTON    "Hj<48>lp",    IDHELP,235,138,50,14,WS_GROUP
-  LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
-  CONTROL       "Tab",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
-  LTEXT	        "",        IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Anpassa verktygsf<73>ltet"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  DEFPUSHBUTTON "&St<53>ng",     IDCANCEL,308,6,44,14
-  PUSHBUTTON    "&<26>terst<73>ll",     IDC_RESET_BTN,308,23,44,14
-  PUSHBUTTON    "&Hj<48>lp",      IDC_HELP_BTN,308,40,44,14
-  PUSHBUTTON    "Flytta &upp",   IDC_MOVEUP_BTN,308,74,44,14
-  PUSHBUTTON    "Flytta &ned", IDC_MOVEDN_BTN,308,91,44,14
-  LTEXT         "T&illg<6C>ngliga knappar:", -1,4,5,84,10
-  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-  PUSHBUTTON    "&L<>gg till ->",    IDOK, 131, 42, 44, 14
-  PUSHBUTTON    "<- &Ta bort", IDC_REMOVE_BTN,131,62,44,14
-  LTEXT         "Knappar i v&erktygsf<73>ltet:", -1,182,5,85,10
-  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_CLOSE    "St<53>ng"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDM_TODAY    "Idag:"
-    IDM_GOTODAY  "G<> till idag"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_SEPARATOR "Separator"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    HKY_NONE "Ingen"
-}

lib/cpl/desk/screensaver.c

@@ -1,312 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Display Control Panel
- * FILE:            lib/cpl/desk/screensaver.c
- * PURPOSE:         Screen saver property page
- * 
- * PROGRAMMERS:     Trevor McCort (lycan359@gmail.com)
- */
-
-#include <windows.h>
-#include <commctrl.h>
-
-#include "resource.h"
-#include <cpl.h>
-#include <tchar.h>
-#include "desk.h"
-
-#define MAX_SCREENSAVERS 100
-
-void AddListViewItems2();
-void CheckRegScreenSaverIsSecure();
-
-typedef struct {
-    BOOL  bIsScreenSaver; /* Is this background a wallpaper */
-    TCHAR szFilename[MAX_PATH];
-    TCHAR szDisplayName[256];
-} ScreenSaverItem;
-
-int ImageListSelection       = 0;
-ScreenSaverItem g_ScreenSaverItems[MAX_SCREENSAVERS];
-
-HWND g_hScreenBackgroundPage          = NULL;
-HWND g_hScreengroundList          = NULL;
-HWND ControlScreenSaverIsSecure = NULL;
-
-void ListViewItemAreChanged(int itemIndex)
-{
-    ScreenSaverItem *ScreenSaverItem = NULL;
-    
-    ImageListSelection = itemIndex;
-    ScreenSaverItem = &g_ScreenSaverItems[ImageListSelection];
-    
-    PropSheet_Changed(GetParent(g_hScreenBackgroundPage), g_hScreenBackgroundPage);
-}
-
-INT_PTR
-CALLBACK
-ScreenSaverPageProc(HWND hwndDlg,
-                    UINT uMsg,
-                    WPARAM wParam,
-                    LPARAM lParam)
-{
-    g_hScreenBackgroundPage = hwndDlg;
-    
-    switch(uMsg) {
-        case WM_INITDIALOG:
-        {
-            g_hScreengroundList = GetDlgItem(g_hScreenBackgroundPage, IDC_SCREENS_CHOICES);
-            AddListViewItems2();
-            CheckRegScreenSaverIsSecure();
-        } break;
-        case WM_COMMAND:
-        {
-            DWORD controlId = LOWORD(wParam);
-            DWORD command   = HIWORD(wParam);
- 
-            switch(controlId) {
-                case IDC_SCREENS_POWER_BUTTON: // Start Powercfg.Cpl
-                {
-                    if(command == BN_CLICKED)
-                        WinExec("rundll32 shell32.dll,Control_RunDLL powercfg.cpl,,",SW_SHOWNORMAL);
-                } break;
-                case IDC_SCREENS_TESTSC: // Screensaver Preview
-                {
-                    if(command == BN_CLICKED)
-                        MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK);
-                        
-                } break;
-                case IDC_SCREENS_DELETE: // Delete Screensaver
-                {
-                    if(command == BN_CLICKED) {
-                        if (ImageListSelection == 0) // Can NOT delete None sry:-)
-                           return FALSE;
-                        DeleteFileW(g_ScreenSaverItems[ImageListSelection].szFilename);
-                    }
-                } break;
-                case IDC_SCREENS_SETTINGS: // Screensaver Settings
-                {
-                    if(command == BN_CLICKED)
-                        MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK);
-                } break;
-                case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure
-                {
-                    if(command == BN_CLICKED)
-                        MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK);
-                } break;
-                case IDC_SCREENS_TIME: // Delay before show screensaver
-                {
-                } break;
-                default:
-                    break;
-            } break;
-        }
-        case WM_NOTIFY:
-        {
-           LPNMHDR lpnm = (LPNMHDR)lParam;
-                
-           switch(lpnm->code) {   
-             case PSN_APPLY:
-             {
-                return TRUE;
-             } break;
-             case LVN_ITEMCHANGED:
-             {
-                LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam;
-                if((nm->uNewState & LVIS_SELECTED) == 0)
-                  return FALSE;
-                ListViewItemAreChanged(nm->iItem);
-                break;
-             } break;
-            default:
-                break;
-           }
-        } break;
-    }
-    
-    return FALSE;
-}
-
-void CheckRegScreenSaverIsSecure()
-{
-    HKEY hKey;
-    TCHAR szBuffer[2];
-    DWORD bufferSize = sizeof(szBuffer);
-    DWORD varType = REG_SZ;
-    LONG result;
-    
-    ControlScreenSaverIsSecure = GetDlgItem(g_hScreenBackgroundPage, IDC_SCREENS_USEPASSCHK);
-
-    RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &hKey);
-    result = RegQueryValueEx(hKey, TEXT("ScreenSaverIsSecure"), 0, &varType, (LPBYTE)szBuffer, &bufferSize);
-    if(result == ERROR_SUCCESS)
-        if(_ttoi(szBuffer) == 1) {
-          SendMessage(ControlScreenSaverIsSecure, BM_SETCHECK, (WPARAM)BST_CHECKED, 0);
-          goto End;
-        }
-    SendMessage(ControlScreenSaverIsSecure, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0);
-End:
-    RegCloseKey(hKey);
-}
-
-/* Add the bitmaps in the C:\ReactOS directory and the current wallpaper if any */
-void AddListViewItems2()
-{
-    WIN32_FIND_DATA fd;
-    HANDLE hFind;
-    TCHAR szSearchPath[MAX_PATH];
-    LV_ITEM listItem;
-    LV_COLUMN dummy;
-    RECT clientRect;
-    HKEY regKey;
-    SHFILEINFO sfi;
-    HIMAGELIST himl;
-    HIMAGELIST g_hScreenShellImageList    = NULL;
-    TCHAR wallpaperFilename[MAX_PATH];
-    DWORD bufferSize = sizeof(wallpaperFilename);
-    DWORD varType = REG_SZ;
-    LONG result;
-    UINT i = 0;
-    int g_ScreenlistViewItemCount         = 0;
-    ScreenSaverItem *ScreenSaverItem = NULL;
-    
-    GetClientRect(g_hScreengroundList, &clientRect);
-    
-    ZeroMemory(&dummy, sizeof(LV_COLUMN));
-    dummy.mask      = LVCF_SUBITEM | LVCF_WIDTH;
-    dummy.iSubItem  = 0;
-    dummy.cx        = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL);
-    
-    ListView_InsertColumn(g_hScreengroundList, 0, &dummy);
-
-    /* Add the "None" item */
-    ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount];
-    
-    ScreenSaverItem->bIsScreenSaver = FALSE;
-
-    LoadString(hApplet,
-               IDS_NONE,
-               ScreenSaverItem->szDisplayName,
-               sizeof(ScreenSaverItem->szDisplayName) / sizeof(TCHAR));
-    
-    ZeroMemory(&listItem, sizeof(LV_ITEM));
-    listItem.mask       = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
-    listItem.state      = LVIS_SELECTED;
-    listItem.pszText    = ScreenSaverItem->szDisplayName;
-    listItem.iImage     = -1;
-    listItem.iItem      = g_ScreenlistViewItemCount;
-    listItem.lParam     = g_ScreenlistViewItemCount;
-    
-    ListView_InsertItem(g_hScreengroundList, &listItem);
-    ListView_SetItemState(g_hScreengroundList, g_ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED);
-
-    g_ScreenlistViewItemCount++;
-
-    /* Add current screensaver if any */
-    RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey);
-    
-    result = RegQueryValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize);
-    
-    if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0))
-    {
-        himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename,
-                                         0,
-                                         &sfi,
-                                         sizeof(sfi),
-                                         SHGFI_SYSICONINDEX | SHGFI_SMALLICON |
-                                         SHGFI_DISPLAYNAME);
-
-        if(himl != NULL)
-        {
-            if(i++ == 0)
-            {
-                g_hScreenShellImageList = himl;
-                ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL);
-            }
-
-            ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount];
-            
-            ScreenSaverItem->bIsScreenSaver = TRUE;
-
-            _tcscpy(ScreenSaverItem->szDisplayName, sfi.szDisplayName);
-            _tcscpy(ScreenSaverItem->szFilename, wallpaperFilename);
-
-            ZeroMemory(&listItem, sizeof(LV_ITEM));
-            listItem.mask       = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
-            listItem.state      = LVIS_SELECTED;
-            listItem.pszText    = ScreenSaverItem->szDisplayName;
-            listItem.iImage     = sfi.iIcon;
-            listItem.iItem      = g_ScreenlistViewItemCount;
-            listItem.lParam     = g_ScreenlistViewItemCount;
-
-            ListView_InsertItem(g_hScreengroundList, &listItem);
-            ListView_SetItemState(g_hScreengroundList, g_ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED);
-
-            g_ScreenlistViewItemCount++;
-        }
-    }
-    
-    RegCloseKey(regKey);
-
-    /* Add all the screensavers in the C:\ReactOS\System32 directory. */
-
-    GetSystemDirectory(szSearchPath, MAX_PATH);
-    _tcscat(szSearchPath, TEXT("\\*.scr"));
-    
-    hFind = FindFirstFile(szSearchPath, &fd);
-    while(hFind != INVALID_HANDLE_VALUE)
-    {
-        /* Don't add any hidden screensavers */
-        if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0)
-        {
-            TCHAR filename[MAX_PATH];
-            
-            GetSystemDirectory(filename, MAX_PATH);
-
-            _tcscat(filename, TEXT("\\"));
-            _tcscat(filename, fd.cFileName);
-            
-            himl = (HIMAGELIST)SHGetFileInfo(filename,
-                                             0,
-                                             &sfi,
-                                             sizeof(sfi),
-                                             SHGFI_SYSICONINDEX | SHGFI_SMALLICON |
-                                             SHGFI_DISPLAYNAME);
-
-            if(himl == NULL)
-            {
-                break;
-            }
-            
-            if(i++ == 0)
-            {
-                g_hScreenShellImageList = himl;
-                ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL);
-            }
-
-            ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount];
-
-            ScreenSaverItem->bIsScreenSaver = TRUE;
-            
-            _tcscpy(ScreenSaverItem->szDisplayName, sfi.szDisplayName);
-            _tcscpy(ScreenSaverItem->szFilename, filename);
-
-            ZeroMemory(&listItem, sizeof(LV_ITEM));
-            listItem.mask       = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
-            listItem.pszText    = ScreenSaverItem->szDisplayName;
-            listItem.state      = 0;
-            listItem.iImage     = sfi.iIcon;
-            listItem.iItem      = g_ScreenlistViewItemCount;
-            listItem.lParam     = g_ScreenlistViewItemCount;
-            
-            ListView_InsertItem(g_hScreengroundList, &listItem);
-            
-            g_ScreenlistViewItemCount++;
-        }
-        
-        if(!FindNextFile(hFind, &fd))
-            hFind = INVALID_HANDLE_VALUE;
-    }
-}
-

lib/cpl/intl/locale.c

@@ -1,183 +0,0 @@
-/*
- *  ReactOS
- *  Copyright (C) 2004, 2005 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id$
- *
- * PROJECT:         ReactOS International Control Panel
- * FILE:            lib/cpl/intl/locale.c
- * PURPOSE:         Locale property page
- * PROGRAMMER:      Eric Kohl
- *                  Klemens Friedl
- *                  Aleksey Bragin
- */
-
-#define WINVER 0x0501
-
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdio.h>
-
-#include "intl.h"
-#include "resource.h"
-
-HWND hList;
-
-BOOL CALLBACK LocalesEnumProc(
-  LPTSTR lpLocale // locale id
-)
-{
-	LCID lcid;
-	TCHAR lang[255];
-	int index;
-
-	swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul?
-
-	GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang));
-
-    index = SendMessageW(hList,
-		   CB_ADDSTRING,
-		   0,
-		   (LPARAM)lang);
-
-	SendMessageW(hList,
-		   CB_SETITEMDATA,
-		   index,
-		   (LPARAM)lcid);
-
-	return TRUE;
-}
-
-
-static VOID
-CreateLanguagesList(HWND hwnd)
-{
-	TCHAR langSel[255];
-
-	hList = hwnd;
-	EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED);
-
-	// Select current locale
-	GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System?
-	
-	SendMessageW(hList,
-		   CB_SELECTSTRING,
-		   -1,
-		   (LPARAM)langSel);
-}
-
-/*
-static VOID
-ShowLanguagesList(HWND hwnd)
-{
-  TIME_ZONE_INFORMATION TimeZoneInfo;
-  PTIMEZONE_ENTRY Entry;
-  DWORD dwIndex;
-  DWORD i;
-
-  GetTimeZoneInformation(&TimeZoneInfo);
-
-  dwIndex = 0;
-  i = 0;
-  Entry = TimeZoneListHead;
-  while (Entry != NULL)
-    {
-      SendMessageW(hwnd,
-		   CB_ADDSTRING,
-		   0,
-		   (LPARAM)Entry->Description);
-
-      if (!wcscmp(Entry->StandardName, TimeZoneInfo.StandardName))
-	dwIndex = i;
-
-      i++;
-      Entry = Entry->Next;
-    }
-
-  SendMessageW(hwnd,
-	       CB_SETCURSEL,
-	       (WPARAM)dwIndex,
-	       0);
-}
-*/
-
-/* Property page dialog callback */
-INT_PTR CALLBACK
-LocalePageProc(HWND hwndDlg,
-	       UINT uMsg,
-	       WPARAM wParam,
-	       LPARAM lParam)
-{
-	switch(uMsg)
-	{
-	case WM_INITDIALOG:
-		CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST));
-		break;
-	case WM_COMMAND:
-		switch (LOWORD(wParam))
-		{
-		case IDC_LANGUAGELIST:
-			if (HIWORD(wParam) == CBN_SELCHANGE)
-			{
-				PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
-			}
-			break;
-		}
-		break;
-
-	case WM_NOTIFY:
-		{
-			LPNMHDR lpnm = (LPNMHDR)lParam;
-			if (lpnm->code == PSN_APPLY)
-			{
-				// Apply changes
-				LCID NewLcid;
-				int iCurSel;
-				char tmp[100];
-
-				// Acquire new value
-				iCurSel = SendMessageW(hList,
-					CB_GETCURSEL,
-					0,
-					0);
-				if (iCurSel == CB_ERR)
-					break;
-
-				NewLcid = SendMessageW(hList,
-					CB_GETITEMDATA,
-					iCurSel,
-					0);
-
-				if (NewLcid == CB_ERR)
-					break;
-
-
-				//TOOD: Actually set new locale
-
-				sprintf(tmp, "%x, cursel=%d", NewLcid, iCurSel);
-				MessageBoxA(hwndDlg, tmp, "debug", MB_OK);
-			}
-		}
-		break;
-	}
-	return FALSE;
-}
-
-
-/* EOF */

lib/cpl/timedate/Sv.rc

@@ -1,47 +0,0 @@
-/*
- * Swedish resources by Andreas Bjerkeholt
- *
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Datum && Tid"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    GROUPBOX "&Datum", -1, 4, 2, 122, 125
-    CONTROL "", IDC_DATEPICKER, "SysDateTimePick32",
-            DTS_SHORTDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP,
-            11, 17, 108, 12
-    CONTROL "", IDC_MONTHCALENDAR, "SysMonthCal32",
-            WS_CHILD | WS_VISIBLE | WS_TABSTOP,
-            11, 37, 108, 80
-    GROUPBOX "&Tid", -1, 132, 2, 113, 125
-    CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32",
-            DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP,
-            144, 17, 90, 12
-    LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8
-END
-
-
-IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Tidszon"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136,
-             CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    AUTOCHECKBOX "&Justera klockan automatiskt f<>r sommar- och vintertid",
-                 IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP
-END
-
-
-STRINGTABLE
-BEGIN
-    IDS_CPLNAME "Datum/Tid"
-    IDS_CPLDESCRIPTION "<22>ndrar information om datum, tid och tidszon."
-    IDS_TIMEZONETEXT "Aktuell tidszon: %s"
-    IDS_TIMEZONEINVALID "Felaktig"
-    IDS_TIMEZONEUNKNOWN "Ok<4F>nd"
-END

lib/dhcpcapi/dhcpcapi.c

@@ -1,140 +0,0 @@
-/* $Id: dllmain.c 12852 2005-01-06 13:58:04Z mf $
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/dhcpcapi/dhcpcapi.c
- * PURPOSE:         Client API for DHCP
- * PROGRAMMER:      arty (ayerkes@speakeasy.net)
- * UPDATE HISTORY:
- *                  Created 12/04/2005
- */
-
-#include <roscfg.h>
-#include <winsock2.h>
-#include <dhcpcsdk.h>
-#include <rosdhcp_public.h>
-
-#define DHCP_TIMEOUT 1000
-
-#define EXPORT __declspec(dllexport) WINAPI
-
-DWORD EXPORT DhcpCApiInitialize(LPDWORD Version) {
-    *Version = 2;
-    return 0;
-}
-
-VOID EXPORT DhcpCApiCleanup() {
-}
-
-DWORD EXPORT DhcpQueryHWInfo( DWORD AdapterIndex,
-                                     PDWORD MediaType, 
-                                     PDWORD Mtu, 
-                                     PDWORD Speed ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqQueryHWInfo;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    if( !Reply.Reply ) return 0;
-    else {
-        *MediaType = Reply.QueryHWInfo.MediaType;
-        *Mtu = Reply.QueryHWInfo.Mtu;
-        *Speed = Reply.QueryHWInfo.Speed;
-        return 1;
-    }
-}
-
-DWORD EXPORT DhcpLeaseIpAddress( DWORD AdapterIndex ) {   
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqLeaseIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD EXPORT DhcpReleaseIpAddressLease( DWORD AdapterIndex ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqReleaseIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD EXPORT DhcpRenewIpAddressLease( DWORD AdapterIndex ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqRenewIpAddress;
-    Req.AdapterIndex = AdapterIndex;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-DWORD EXPORT DhcpStaticRefreshParams( DWORD AdapterIndex, 
-                                             DWORD Address, 
-                                             DWORD Netmask ) {
-    COMM_DHCP_REQ Req;
-    COMM_DHCP_REPLY Reply;
-    DWORD BytesRead;
-    BOOL Result;
-
-    Req.Type = DhcpReqStaticRefreshParams;
-    Req.AdapterIndex = AdapterIndex;
-    Req.Body.StaticRefreshParams.IPAddress = Address;
-    Req.Body.StaticRefreshParams.Netmask = Netmask;
-
-    Result = CallNamedPipe
-        ( DHCP_PIPE_NAME, &Req, sizeof(Req), &Reply, sizeof(Reply),
-          &BytesRead, DHCP_TIMEOUT );
-
-    return Reply.Reply;
-}
-
-INT STDCALL
-DllMain(PVOID hinstDll,
-	ULONG dwReason,
-	PVOID reserved)
-{
-   switch (dwReason)
-     {
-     case DLL_PROCESS_ATTACH:
-	DisableThreadLibraryCalls(hinstDll);
-	break;
-
-     case DLL_PROCESS_DETACH:
-	break;
-     }
-
-   return TRUE;
-}
-
-/* EOF */

lib/dhcpcapi/dhcpcapi.def

@@ -1,16 +0,0 @@
-; $Id: dhcpcapi.def 14337 2005-03-26 22:10:04Z $
-;
-; dhcpcapi.def
-;
-; ReactOS Operating System
-;
-LIBRARY dhcpcapi.dll
-EXPORTS
-DhcpCApiInitialize@4
-DhcpCApiCleanup@0
-DhcpQueryHWInfo@16
-DhcpLeaseIpAddress@4
-DhcpReleaseIpAddressLease@4
-DhcpRenewIpAddressLease@4
-DhcpStaticRefreshParams@12
-; EOF

lib/dhcpcapi/dhcpcapi.rc

@@ -1,7 +0,0 @@
-#include <defines.h>
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client API\0"
-#define REACTOS_STR_INTERNAL_NAME	"dhcpcapi\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpcapi.dll\0"
-#include <reactos/version.rc>

lib/dhcpcapi/makefile

@@ -1,27 +0,0 @@
-# $Id: makefile 12852 2005-01-06 13:58:04Z mf $
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = dynlink
-
-TARGET_NAME = dhcpcapi
-
-TARGET_CFLAGS = -Wall -Werror \
-                -D__USE_W32API \
-                -D_WIN32_IE=0x0500 \
-                -D_WIN32_WINNT=0x501 \
-                -DWINVER=0x600 \
-
-TARGET_LFLAGS = -nostartfiles -nostdlib
-
-TARGET_SDKLIBS = ntdll.a kernel32.a
-
-TARGET_OBJECTS = dhcpcapi.o
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk

lib/kbdru/Jamfile

@@ -1,15 +0,0 @@
-SubDir ROS_TOP lib kbdru ;
-
-# This stuff should actually be moved to Jamrules
-# in order to more easily support other compilers
-CCFLAGS += -Wall -fno-builtin ;
-
-# NOTE - I'm no Jam expert, yet. This stuff should be
-# abstracted into the Jamrules file.
-LINKFLAGS = -nostartfiles -nostdlib -shared ;
-LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ;
-
-SRCS = kbdru
-
-SharedLibrary kbdru : $(SRCS) ;
-LINKLIBS = ;

lib/kbdru/kbdru.c

@@ -1,452 +0,0 @@
-/*
- * ReactOS Russian ASCII Keyboard layout
- * Copyright (C) 2005 ReactOS
- * Author: Aleksey Bragin
- * License: LGPL, see: LGPL.txt
- * 
- * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
- * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
- */
-
-#include <windows.h>
-#include <internal/kbd.h>
-
-#ifdef _M_IA64
-#define ROSDATA static __declspec(allocate(".data"))
-#else
-#pragma data_seg(".data")
-#define ROSDATA static
-#endif
-
-#define VK_EMPTY 0xff   /* The non-existent VK */
-#define KSHIFT   0x001  /* Shift modifier */
-#define KCTRL    0x002  /* Ctrl modifier */
-#define KALT     0x004  /* Alt modifier */
-#define KEXT     0x100  /* Extended key code */
-#define KMULTI   0x200  /* Multi-key */
-#define KSPEC    0x400  /* Special key */
-#define KNUMP    0x800  /* Number-pad */
-#define KNUMS    0xc00  /* Special + number pad */
-#define KMEXT    0x300  /* Multi + ext */
-
-#define SHFT_INVALID 0x0F
-
-/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */
-#ifndef VK_OEM_1
-#define VK_OEM_1  0xba
-#endif
-#ifndef VK_OEM_PLUS
-#define VK_OEM_PLUS 0xbb
-#endif
-#ifndef VK_OEM_COMMA
-#define VK_OEM_COMMA 0xbc
-#endif
-#ifndef VK_OEM_MINUS
-#define VK_OEM_MINUS 0xbd
-#endif
-#ifndef VK_OEM_PERIOD
-#define VK_OEM_PERIOD 0xbe
-#endif
-#ifndef VK_OEM_2
-#define VK_OEM_2 0xbf
-#endif
-#ifndef VK_OEM_3
-#define VK_OEM_3 0xc0
-#endif
-#ifndef VK_OEM_4
-#define VK_OEM_4 0xdb
-#endif
-#ifndef VK_OEM_5
-#define VK_OEM_5 0xdc
-#endif
-#ifndef VK_OEM_6
-#define VK_OEM_6 0xdd
-#endif
-#ifndef VK_OEM_7
-#define VK_OEM_7 0xde
-#endif
-#ifndef VK_OEM_8
-#define VK_OEM_8 0xdf
-#endif
-#ifndef VK_OEM_AX
-#define VK_OEM_AX 0xe1
-#endif
-#ifndef VK_OEM_102
-#define VK_OEM_102 0xe1
-#endif
-
-ROSDATA USHORT scancode_to_vk[] = {
-  /* Numbers Row */
-  /* - 00 - */
-  /* 1 ...         2 ...         3 ...         4 ... */     
-  VK_EMPTY,     VK_ESCAPE,    '1',          '2',
-  '3',          '4',          '5',          '6',
-  '7',          '8',          '9',          '0',
-  VK_OEM_MINUS, VK_OEM_PLUS,  VK_BACK,
-  /* - 0f - */
-  /* First Letters Row */
-  VK_TAB,       'Q',          'W',          'E',
-  'R',          'T',          'Y',          'U',
-  'I',          'O',          'P',          
-  VK_OEM_4,     VK_OEM_6,     VK_RETURN,
-  /* - 1d - */
-  /* Second Letters Row */
-  VK_LCONTROL,  
-  'A',          'S',          'D',          'F',
-  'G',          'H',          'J',          'K',
-  'L',          VK_OEM_1,     VK_OEM_7,     VK_OEM_3, 
-  VK_LSHIFT,    VK_OEM_5,
-  /* - 2c - */
-  /* Third letters row */
-  'Z',          'X',          'C',          'V',
-  'B',          'N',          'M',          VK_OEM_COMMA,
-  VK_OEM_PERIOD,VK_OEM_2,     VK_RSHIFT | KEXT,
-  /* - 37 - */
-  /* Bottom Row */
-  0x26a,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
-  
-  /* - 3b - */
-  /* F-Keys */
-  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
-  VK_F7, VK_F8, VK_F9, VK_F10,
-  /* - 45 - */
-  /* Locks */
-  VK_NUMLOCK | KMEXT,   
-  VK_SCROLL | KMULTI,    
-  /* - 47 - */
-  /* Number-Pad */
-  VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS, VK_SUBTRACT,
-  VK_LEFT | KNUMS,      VK_CLEAR | KNUMS,      VK_RIGHT | KNUMS, VK_ADD,
-  VK_END | KNUMS,       VK_DOWN | KNUMS,       VK_NEXT | KNUMS,
-  VK_INSERT | KNUMS,    VK_DELETE | KNUMS,
-  /* - 54 - */
-  /* Presumably PrtSc */
-  VK_SNAPSHOT,
-  /* - 55 - */
-  /* Oddities, and the remaining standard F-Keys */
-  VK_EMPTY,     VK_OEM_102,     VK_F11,       VK_F12,
-  /* - 59 - */
-  VK_CLEAR,     VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP,  VK_EREOF, /* EREOF */
-  VK_OEM_BACKTAB,    VK_OEM_AUTO,  VK_EMPTY,    VK_ZOOM,            /* ZOOM */
-  VK_HELP,      
-  /* - 64 - */
-  /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
-  VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
-  VK_F21, VK_F22, VK_F23, 
-  /* - 6f - */
-  /* Not sure who uses these codes */
-  VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET,
-  /* - 72 - */
-  VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY,
-  /* - 76 - */
-  /* One more f-key */
-  VK_F24,
-  /* - 77 - */
-  VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */
-  0,
-  /* - 80 - */
-  0
-};
-
-ROSDATA VSC_VK extcode0_to_vk[] = {
-  { 0x10, VK_MEDIA_PREV_TRACK | KEXT },
-  { 0x19, VK_MEDIA_NEXT_TRACK | KEXT },
-  { 0x1D, VK_RCONTROL | KEXT },
-  { 0x20, VK_VOLUME_MUTE | KEXT },
-  { 0x21, VK_LAUNCH_APP2 | KEXT },
-  { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT },
-  { 0x24, VK_MEDIA_STOP | KEXT },
-  { 0x2E, VK_VOLUME_DOWN | KEXT },
-  { 0x30, VK_VOLUME_UP | KEXT },
-  { 0x32, VK_BROWSER_HOME | KEXT },
-  { 0x35, VK_DIVIDE | KEXT },
-  { 0x37, VK_SNAPSHOT | KEXT },
-  { 0x38, VK_RMENU | KEXT },
-  { 0x47, VK_HOME | KEXT },
-  { 0x48, VK_UP | KEXT },
-  { 0x49, VK_PRIOR | KEXT },
-  { 0x4B, VK_LEFT | KEXT },
-  { 0x4D, VK_RIGHT | KEXT },
-  { 0x4F, VK_END | KEXT },
-  { 0x50, VK_DOWN | KEXT },
-  { 0x51, VK_NEXT | KEXT },
-  { 0x52, VK_INSERT | KEXT },
-  { 0x53, VK_DELETE | KEXT },
-  { 0x5B, VK_LWIN | KEXT },
-  { 0x5C, VK_RWIN | KEXT },
-  { 0x5D, VK_APPS | KEXT },
-  { 0x5F, VK_SLEEP | KEXT },
-  { 0x65, VK_BROWSER_SEARCH | KEXT },
-  { 0x66, VK_BROWSER_FAVORITES | KEXT },
-  { 0x67, VK_BROWSER_REFRESH | KEXT },
-  { 0x68, VK_BROWSER_STOP | KEXT },
-  { 0x69, VK_BROWSER_FORWARD | KEXT },
-  { 0x6A, VK_BROWSER_BACK | KEXT },
-  { 0x6B, VK_LAUNCH_APP1 | KEXT },
-  { 0x6C, VK_LAUNCH_MAIL | KEXT },
-  { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT },
-  { 0x1C, VK_RETURN | KEXT },
-  { 0x46, VK_CANCEL | KEXT },
-  { 0, 0 },
-};
-
-ROSDATA VSC_VK extcode1_to_vk[] = {
-  { 0x1d, VK_PAUSE},
-  { 0, 0 },
-};
-
-ROSDATA VK_TO_BIT modifier_keys[] = {
-  { VK_SHIFT,   KSHIFT },
-  { VK_CONTROL, KCTRL },
-  { VK_MENU,    KALT },
-  { 0,          0 }
-};
-
-typedef struct _mymod {
-  PVOID mod_keys;
-  WORD maxmod;
-  BYTE mod_max[7];
-} INTERNAL_KBD_MODIFIERS;
-
-ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = {
-  modifier_keys,
-  3,
-  { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
-};
-
-#define NOCAPS 0
-#define CAPS   KSHIFT /* Caps -> shift */
-
-ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
-  {VK_OEM_3,     CAPS, 0x451, 0x401},
-  { '1',         NOCAPS, '1', '!' },
-  { '3',         NOCAPS, '3', 0x2116 },
-  { '4',         NOCAPS, '4', ';' },
-  { '5',         NOCAPS, '5', '%' },
-  { '7',         NOCAPS, '7', '?' },
-  { '8',         NOCAPS, '8', '*' },
-  { '9',         NOCAPS, '9', '(' },
-  { '0',         NOCAPS, '0', ')' },
-  { VK_OEM_PLUS, NOCAPS, '=', '+' },
-
-  /* First letter row */
-  { 'Q',         CAPS,   0x439, 0x419 },
-  { 'W',         CAPS,   0x446, 0x426 },
-  { 'E',         CAPS,   0x443, 0x423 },
-  { 'R',         CAPS,   0x43a, 0x41a },
-  { 'T',         CAPS,   0x435, 0x415 },
-  { 'Y',         CAPS,   0x43d, 0x41d },
-  { 'U',         CAPS,   0x433, 0x413 },
-  { 'I',         CAPS,   0x448, 0x428 },
-  { 'O',         CAPS,   0x449, 0x429 },
-  { 'P',         CAPS,   0x437, 0x417 },
-  { VK_OEM_4,    CAPS,   0x445, 0x425 },
-  { VK_OEM_6,    CAPS,   0x44a, 0x42a },
-
-  /* Second letter row */
-  { 'A',         CAPS,   0x444, 0x424 },
-  { 'S',         CAPS,   0x44b, 0x42b },
-  { 'D',         CAPS,   0x432, 0x412 },
-  { 'F',         CAPS,   0x430, 0x410 },
-  { 'G',         CAPS,   0x43f, 0x41f },
-  { 'H',         CAPS,   0x440, 0x420 },
-  { 'J',         CAPS,   0x43e, 0x41e },
-  { 'K',         CAPS,   0x43b, 0x41b },
-  { 'L',         CAPS,   0x434, 0x414 },
-  { VK_OEM_1,    CAPS,   0x436, 0x416 },
-  { VK_OEM_7,    CAPS,   0x44d, 0x42d },
-
-  /* Third letter row */
-  { 'Z',         CAPS,   0x44f, 0x42f },
-  { 'X',         CAPS,   0x447, 0x427 },
-  { 'C',         CAPS,   0x441, 0x421 },
-  { 'V',         CAPS,   0x43c, 0x41c },
-  { 'B',         CAPS,   0x438, 0x418 },
-  { 'N',         CAPS,   0x442, 0x422 },
-  { 'M',         CAPS,   0x44c, 0x42c },
-  { VK_OEM_COMMA,CAPS,   0x431, 0x411 },
-  { VK_OEM_PERIOD,CAPS,  0x44e, 0x42e },
-  { VK_OEM_2,	NOCAPS,    '.', ',' },
-
-  /* Specials */
-  { 0x6e, 	NOCAPS, ',', ','},
-  { VK_TAB,	NOCAPS, 9, 9},
-  { VK_ADD,        NOCAPS, '+', '+' },
-  { VK_DIVIDE,     NOCAPS, '/', '/' },
-  { VK_MULTIPLY,   NOCAPS, '*', '*' },
-  { VK_SUBTRACT,   NOCAPS, '-', '-' },
-  { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
-  /* Normal, Shifted, Ctrl */
-  /* Legacy (telnet-style) ascii escapes */
-  { VK_OEM_5, NOCAPS, 0x5c,0x2f, 0x1c },
-  { VK_OEM_102, NOCAPS, 0x5c,0x2f, 0x1c },
-  { VK_BACK, NOCAPS, 0x8, 0x8, 0x7f },	
-  { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, 0x1b },
-  { VK_RETURN,NOCAPS, '\r', '\r', '\n' },
-  { VK_SPACE, NOCAPS, ' ', ' ', ' ' },
-  { VK_CANCEL, NOCAPS, 0x03, 0x03, 0x03 },
-  { 0,0 }
-};
-
-ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
-  /* Normal, Shifted, Ctrl, Ctrl-Alt */
-  /* Legacy Ascii generators */
-  { '2', NOCAPS, '2', '\"', WCH_NONE,0},
-  { '6', NOCAPS, '6', ':', WCH_NONE,0x001e},
-  { VK_OEM_MINUS, NOCAPS, 0x2d, '_', WCH_NONE, 0x001f}, // different '-'
-  { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
-  { VK_NUMPAD0, 0, '0' },
-  { VK_NUMPAD1, 0, '1' },
-  { VK_NUMPAD2, 0, '2' },
-  { VK_NUMPAD3, 0, '3' },
-  { VK_NUMPAD4, 0, '4' },
-  { VK_NUMPAD5, 0, '5' },
-  { VK_NUMPAD6, 0, '6' },
-  { VK_NUMPAD7, 0, '7' },
-  { VK_NUMPAD8, 0, '8' },
-  { VK_NUMPAD9, 0, '9' },
-  { 0,0 }
-};
-
-#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
-
-ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
-  vk_master(3,key_to_chars_3mod),
-  vk_master(4,key_to_chars_4mod),
-  vk_master(2,key_to_chars_2mod),
-  vk_master(1,keypad_numbers),
-  { 0,0,0 }
-};
-
-ROSDATA VSC_LPWSTR key_names[] = {
-  { 0x01, L"Esc" },
-  { 0x0e, L"Backspace" },
-  { 0x0f, L"Tab" },
-  { 0x1c, L"Enter" },
-  { 0x1d, L"Ctrl" },
-  { 0x2a, L"Shift" },
-  { 0x36, L"Right Shift" },
-  { 0x37, L"Num *" },
-  { 0x38, L"Alt" },
-  { 0x39, L"Space" },
-  { 0x3a, L"Caps Lock" },
-  { 0x3b, L"F1" },
-  { 0x3c, L"F2" },
-  { 0x3d, L"F3" },
-  { 0x3e, L"F4" },
-  { 0x3f, L"F5" },
-  { 0x40, L"F6" },
-  { 0x41, L"F7" },
-  { 0x42, L"F8" },
-  { 0x43, L"F9" },
-  { 0x44, L"F10" },
-  { 0x45, L"Pause" },
-  { 0x46, L"Scroll Lock" },
-  { 0x47, L"Num 7" },
-  { 0x48, L"Num 8" },
-  { 0x49, L"Num 9" },
-  { 0x4a, L"Num -" },
-  { 0x4b, L"Num 4" },
-  { 0x4c, L"Num 5" },
-  { 0x4d, L"Num 6" },
-  { 0x4e, L"Num +" },
-  { 0x4f, L"Num 1" },
-  { 0x50, L"Num 2" },
-  { 0x51, L"Num 3" },
-  { 0x52, L"Num 0" },
-  { 0x53, L"Num Del" },
-  { 0x54, L"Sys Req" },
-  { 0x57, L"F11" },
-  { 0x58, L"F12" },
-  { 0x7c, L"F13" },
-  { 0x7d, L"F14" },
-  { 0x7e, L"F15" },
-  { 0x7f, L"F16" },
-  { 0x80, L"F17" },
-  { 0x81, L"F18" },
-  { 0x82, L"F19" },
-  { 0x83, L"F20" },
-  { 0x84, L"F21" },
-  { 0x85, L"F22" },
-  { 0x86, L"F23" },
-  { 0x87, L"F24" },
-  { 0, NULL }
-};
-
-ROSDATA VSC_LPWSTR extended_key_names[] = {
-  { 0x1c, L"Num Enter" },
-  { 0x1d, L"Right Control" },
-  { 0x35, L"Num /" },
-  { 0x37, L"Prnt Scrn" },
-  { 0x38, L"Right Alt" },
-  { 0x45, L"Num Lock" },
-  { 0x46, L"Break" },
-  { 0x47, L"Home" },
-  { 0x48, L"Up" },
-  { 0x49, L"Page Up" },
-  { 0x4b, L"Left" },
-//{ 0x4c, L"Center" },
-  { 0x4d, L"Right" },
-  { 0x4f, L"End" },
-  { 0x50, L"Down" },
-  { 0x51, L"Page Down" },
-  { 0x52, L"Insert" },
-  { 0x53, L"Delete" },
-  { 0x54, L"<ReactOS>" },
-  { 0x56, L"Help" },
-  { 0x5b, L"Left <ReactOS>" },
-  { 0x5c, L"Right <ReactOS>" },
-  { 0x5d, L"Application" },
-  { 0, NULL }
-};
-
-/* Finally, the master table */
-ROSDATA KBDTABLES keyboard_layout_table = {
-  /* modifier assignments */
-  (PMODIFIERS)&modifier_bits,
-  
-  /* character from vk tables */
-  vk_to_wchar_master_table,
-  
-  /* diacritical marks */
-  NULL,
-
-  /* Key names */
-  (VSC_LPWSTR *)key_names,
-  (VSC_LPWSTR *)extended_key_names,
-  NULL, /* Dead key names */
-
-  /* scan code to virtual key maps */
-  scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
-  extcode0_to_vk,
-  extcode1_to_vk,
-
-  MAKELONG(0,1), /* Version 1.0 */
-
-  /* Ligatures -- Russian doesn't have any */
-  0,
-  0,
-  NULL
-};
-
-PKBDTABLES STDCALL KbdLayerDescriptor() {
-  return &keyboard_layout_table;
-}
-
-INT STDCALL
-DllMain(
-  PVOID hinstDll,
-  ULONG dwReason,
-  PVOID reserved)
-{
-  return 1;
-}
-

lib/kbdru/kbdru.def

@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdru.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF

lib/kbdru/kbdru.rc

@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS RU Keyboard Layout\0"
-#define REACTOS_STR_INTERNAL_NAME	"kbdru\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"kbdru.dll\0"
-#include <reactos/version.rc>

lib/kbdru/makefile

@@ -1,39 +0,0 @@
-# $Id: makefile 12852 2005-01-06 13:58:04Z mf $
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = dynlink
-
-TARGET_NAME = kbdru
-
-TARGET_BASE = 0x5500000
-
-TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include
-
-# require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS
-
-TARGET_LFLAGS = -nostartfiles -nostdlib
-
-TARGET_SDKLIBS =
-
-TARGET_GCCLIBS = gcc
-
-TARGET_PCH = 
-
-TARGET_CLEAN = 
-
-TARGET_OBJECTS = kbdru.o
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk
-
-%/TAGS:
-	etags -o $(@D)/TAGS $(@D)/\*.c
-
-etags: ./TAGS

lib/kbdsg/Jamfile

@@ -1,15 +0,0 @@
-SubDir ROS_TOP lib kbdsg ;
-
-# This stuff should actually be moved to Jamrules
-# in order to more easily support other compilers
-CCFLAGS += -Wall -fno-builtin ;
-
-# NOTE - I'm no Jam expert, yet. This stuff should be
-# abstracted into the Jamrules file.
-LINKFLAGS = -nostartfiles -nostdlib -shared ;
-LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ;
-
-SRCS = kbdsg
-
-SharedLibrary kbdsg : $(SRCS) ;
-LINKLIBS = ;

lib/kbdsg/kbdsg.c

@@ -1,529 +0,0 @@
-/*
- * ReactOS German (Switzerland) ASCII Keyboard layout
- * Copyright (C) 2005 ReactOS
- * License: LGPL, see: LGPL.txt
- * 
- * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
- * and http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
- * and http://www.unicode.org/charts/
- */
-
-
-#include <windows.h>
-#include <internal/kbd.h>
-
-#ifdef _M_IA64
-#define ROSDATA static __declspec(allocate(".data"))
-#else
-#pragma data_seg(".data")
-#define ROSDATA static
-#endif
-
-#define VK_EMPTY 0xff   /* The non-existent VK */
-#define KSHIFT   0x001  /* Shift modifier */
-#define KCTRL    0x002  /* Ctrl modifier */
-#define KALT     0x004  /* Alt modifier */
-#define KEXT     0x100  /* Extended key code */
-#define KMULTI   0x200  /* Multi-key */
-#define KSPEC    0x400  /* Special key */
-#define KNUMP    0x800  /* Number-pad */
-#define KNUMS    0xc00  /* Special + number pad */
-#define KMEXT    0x300  /* Multi + ext */
-
-#define SHFT_INVALID 0x0F
-
-/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */
-#ifndef VK_OEM_1
-#define VK_OEM_1  0xba
-#endif
-#ifndef VK_OEM_PLUS
-#define VK_OEM_PLUS 0xbb /* actually this is <20> ! ] on the Swiss German Keyboard */
-#endif
-#ifndef VK_OEM_COMMA
-#define VK_OEM_COMMA 0xbc
-#endif
-#ifndef VK_OEM_MINUS
-#define VK_OEM_MINUS 0xbd
-#endif
-#ifndef VK_OEM_PERIOD
-#define VK_OEM_PERIOD 0xbe
-#endif
-#ifndef VK_OEM_2
-#define VK_OEM_2 0xbf
-#endif
-#ifndef VK_OEM_3
-#define VK_OEM_3 0xc0
-#endif
-#ifndef VK_OEM_4
-#define VK_OEM_4 0xdb
-#endif
-#ifndef VK_OEM_5
-#define VK_OEM_5 0xdc
-#endif
-#ifndef VK_OEM_6
-#define VK_OEM_6 0xdd
-#endif
-#ifndef VK_OEM_7
-#define VK_OEM_7 0xde
-#endif
-#ifndef VK_OEM_8
-#define VK_OEM_8 0xdf
-#endif
-#ifndef VK_OEM_102
-#define VK_OEM_102 0xe1
-#endif
-
-ROSDATA USHORT scancode_to_vk[] = {
-  /* Numbers Row */
-  /* - 00 - */
-  /* 1 ...         2 ...         3 ...         4 ... */     
-  VK_EMPTY,     VK_ESCAPE,    '1',          '2',
-  '3',          '4',          '5',          '6',
-  '7',          '8',          '9',          '0',
-  VK_OEM_4, VK_OEM_6,  VK_BACK,
-  /* - 0f - */
-  /* First Letters Row */
-  VK_TAB,       'Q',          'W',          'E',
-  'R',          'T',          'Z',          'U',
-  'I',          'O',          'P',          
-  VK_OEM_1,     VK_OEM_PLUS,     VK_RETURN,
-  /* - 1d - */
-  /* Second Letters Row */
-  VK_LCONTROL,
-  'A',          'S',          'D',          'F',
-  'G',          'H',          'J',          'K',
-  'L',          VK_OEM_3,     VK_OEM_7,     VK_OEM_5, 
-  /* - 2c - */
-  /* Third letters row */
-  VK_LSHIFT,    VK_OEM_2,
-  'Y',          'X',          'C',          'V',
-  'B',          'N',          'M',          VK_OEM_COMMA,
-  VK_OEM_PERIOD, VK_OEM_MINUS,     VK_RSHIFT,
-  /* - 37 - */
-  /* Bottom Row */
-  VK_MULTIPLY,  VK_LMENU,     VK_SPACE,   VK_CAPITAL,
-  
-  /* - 3b - */
-  /* F-Keys */
-  VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, 
-  VK_F7, VK_F8, VK_F9, VK_F10,
-  /* - 45 - */
-  /* Locks */
-  VK_NUMLOCK | KMEXT,   
-  VK_SCROLL | KMULTI,    
-  /* - 47 - */
-  /* Number-Pad */
-  VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS, VK_SUBTRACT,
-  VK_LEFT | KNUMS,      VK_CLEAR | KNUMS,      VK_RIGHT | KNUMS, VK_ADD,
-  VK_END | KNUMS,       VK_DOWN | KNUMS,       VK_NEXT | KNUMS,
-  VK_INSERT | KNUMS,    VK_DELETE | KNUMS,
-  /* - 54 - */
-  /* Presumably PrtSc */
-  VK_SNAPSHOT,
-  /* - 55 - */
-  /* Oddities, and the remaining standard F-Keys */
-  VK_EMPTY,   VK_OEM_102,     VK_F11,       VK_F12,
-  /* - 59 - */
-  VK_CLEAR,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /* EREOF */
-  VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /* ZOOM */
-  VK_HELP,      
-  /* - 64 - */
-  /* Even more F-Keys (for example, NCR keyboards from the early 90's) */
-  VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
-  VK_F21, VK_F22, VK_F23, 
-  /* - 6f - */
-  /* Not sure who uses these codes */
-  VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  /* - 72 - */
-  VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  /* - 76 - */
-  /* One more f-key */
-  VK_F24,
-  /* - 77 - */
-  VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
-  VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
-  VK_EMPTY,
-  /* - 80 - */
-  0
-};
-
-ROSDATA VSC_VK extcode0_to_vk[] = {
-  { 0x10, VK_MEDIA_PREV_TRACK | KEXT },
-  { 0x19, VK_MEDIA_NEXT_TRACK | KEXT },
-  { 0x1D, VK_RCONTROL | KEXT },
-  { 0x20, VK_VOLUME_MUTE | KEXT },
-  { 0x21, VK_LAUNCH_APP2 | KEXT },
-  { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT },
-  { 0x24, VK_MEDIA_STOP | KEXT },
-  { 0x2E, VK_VOLUME_DOWN | KEXT },
-  { 0x30, VK_VOLUME_UP | KEXT },
-  { 0x32, VK_BROWSER_HOME | KEXT },
-  { 0x35, VK_DIVIDE | KEXT },
-  { 0x37, VK_SNAPSHOT | KEXT },
-  { 0x38, VK_RMENU | KEXT },
-  { 0x47, VK_HOME | KEXT },
-  { 0x48, VK_UP | KEXT },
-  { 0x49, VK_PRIOR | KEXT },
-  { 0x4B, VK_LEFT | KEXT },
-  { 0x4D, VK_RIGHT | KEXT },
-  { 0x4F, VK_END | KEXT },
-  { 0x50, VK_DOWN | KEXT },
-  { 0x51, VK_NEXT | KEXT },
-  { 0x52, VK_INSERT | KEXT },
-  { 0x53, VK_DELETE | KEXT },
-  { 0x5B, VK_LWIN | KEXT },
-  { 0x5C, VK_RWIN | KEXT },
-  { 0x5D, VK_APPS | KEXT },
-  { 0x5F, VK_SLEEP | KEXT },
-  { 0x65, VK_BROWSER_SEARCH | KEXT },
-  { 0x66, VK_BROWSER_FAVORITES | KEXT },
-  { 0x67, VK_BROWSER_REFRESH | KEXT },
-  { 0x68, VK_BROWSER_STOP | KEXT },
-  { 0x69, VK_BROWSER_FORWARD | KEXT },
-  { 0x6A, VK_BROWSER_BACK | KEXT },
-  { 0x6B, VK_LAUNCH_APP1 | KEXT },
-  { 0x6C, VK_LAUNCH_MAIL | KEXT },
-  { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT },
-  { 0x1C, VK_RETURN | KEXT },
-  { 0x46, VK_CANCEL | KEXT },
-  { 0, 0 },
-};
-
-ROSDATA VSC_VK extcode1_to_vk[] = {
-  { 0x1d, VK_PAUSE},
-  { 0, 0 },
-};
-
-ROSDATA VK_TO_BIT modifier_keys[] = {
-  { VK_SHIFT,   KSHIFT },
-  { VK_CONTROL, KCTRL },
-  { VK_MENU,    KALT },
-  { 0,          0 }
-};
-
-typedef struct _mymod {
-  PVOID mod_keys;
-  WORD maxmod;
-  BYTE mod_max[7];
-} INTERNAL_KBD_MODIFIERS;
-
-ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = {
-  modifier_keys,
-  6,
-  { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */
-};
-
-
-/* ############################################ */
-/* ############################################ */
-/* ############################################ */
-/* ############################################ */
-/* ############################################ */
-
-#define NOCAPS 0
-#define CAPS   KSHIFT /* Caps -> shift */
-
-ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
-  { VK_OEM_5, NOCAPS, 0xa7, 0xb0}, /* <20> <20> */
-
-  /* Normal vs Shifted */
-  /* The numbers */
-  /* Ctrl-2 generates NUL */
-  { 0xff,        NOCAPS, 0xa7, 0x9B }, /* what is this for? */
-  { '4',         NOCAPS, '4',  0xE7 },
-  { '5',         NOCAPS, '5',  '%' },
-  { '9',         NOCAPS, '9',  ')' },
-  { '0',         NOCAPS, '0',  '=' },
-  
-  /* First letter row */
-  { 'W',         CAPS,   'w', 'W' },
-  { 'R',         CAPS,   'r', 'R' },
-  { 'T',         CAPS,   't', 'T' },
-  { 'Z',         CAPS,   'z', 'Z' },
-  { 'U',         CAPS,   'u', 'U' },
-  { 'I',         CAPS,   'i', 'I' },
-  { 'O',         CAPS,   'o', 'O' },
-  { 'P',         CAPS,   'p', 'P' },
-  /* Second letter row */
-  { 'A',         CAPS,   'a', 'A' },
-  { 'S',         CAPS,   's', 'S' },
-  { 'D',         CAPS,   'd', 'D' },
-  { 'F',         CAPS,   'f', 'F' },
-  { 'G',         CAPS,   'g', 'G' },
-  { 'H',         CAPS,   'h', 'H' },
-  { 'J',         CAPS,   'j', 'J' },
-  { 'K',         CAPS,   'k', 'K' },
-  { 'L',         CAPS,   'l', 'L' },
-  /* Third letter row */
-  { 'Y',         CAPS,   'y', 'Y' },
-  { 'X',         CAPS,   'x', 'X' },
-  { 'V',         CAPS,   'v', 'V' },
-  { 'B',         CAPS,   'b', 'B' },
-  { 'N',         CAPS,   'n', 'N' },
-
-  /* Specials */
-  { VK_OEM_COMMA,  NOCAPS, ',', ';' },
-  { VK_OEM_PERIOD, NOCAPS, '.', ':' },
-  { VK_OEM_MINUS,  NOCAPS, '-', '_' },
-  { VK_DECIMAL,    NOCAPS, '.', '.' },
-  { VK_TAB,        NOCAPS, '\t', '\t' },
-  { VK_ADD,        NOCAPS, '+', '+' },
-  { VK_DIVIDE,     NOCAPS, 0x2f, 0x2f }, /* '/' */
-  { VK_MULTIPLY,   NOCAPS, '*', '*' },
-  { VK_SUBTRACT,   NOCAPS, '-', '-' },
-  { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
-  /* Normal, Shifted, Alt Gr */
-  /* Legacy (telnet-style) ascii escapes */
-  { VK_OEM_4, NOCAPS, '\''     , '?'     , WCH_DEAD },          /* ' ? <20> */
-      { 0xff, NOCAPS,  WCH_NONE, WCH_NONE, 0xb4 },
-  { 'Q', CAPS, 'q', 'Q', '@' },
-  { 'C', CAPS, 'c', 'C', 0xa9},    /* c C Copyright-Sign */ 
-  { 'E', CAPS, 'e', 'E', 0x20ac }, /* e E <20> */
-  { 'M', CAPS, 'm', 'M', 0xb5 },   /* m M mu-Sign */
-  { VK_OEM_102, NOCAPS, '<', '>', '\\' },
-  { 0,0 }
-};
-
-ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
-  /* Normal, Shifted, Alt Gr, C-S-x */
-  /* Legacy Ascii generators */
-  { VK_BACK, NOCAPS, '\b', '\b', WCH_NONE, 0x7f },
-  { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, WCH_NONE, 0x1b },
-  { VK_RETURN, NOCAPS, '\r', '\r', WCH_NONE, '\n' },
-  { VK_SPACE, NOCAPS, ' ', ' ', WCH_NONE, ' ' },
-  { VK_CANCEL, NOCAPS, 0x03, 0x03, WCH_NONE, 0x03 },
-  { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = {
-  /* Normal, Shifted, Alt Gr, Ctrl */
-  { '1', NOCAPS, '1', '+',  '|',  WCH_NONE, 0x00 },
-  { '2', NOCAPS, '2', '\"', '@',  WCH_NONE, 0x00 },
-  { '3', NOCAPS, '3', '*',  '#',  WCH_NONE, 0x00 },
-  { '6', NOCAPS, '6', '&',  0xac, WCH_NONE, 0x00 },
-  { '7', NOCAPS, '7', '/',  0xa6, WCH_NONE, 0x00 },
-  { '8', NOCAPS, '8', '(',  0xa2, WCH_NONE, 0x00 },
-  { VK_OEM_1, KCTRL, 0xfc, 0xe8, 0x5b, 0Xdc, 0xc8 },                    /*    <20> <20> [ <20> <20>   */
-  { VK_OEM_2, NOCAPS, 0x24, 0xa3, 0x7d, WCH_NONE, 0x00 },                    /*    $ <20> }    */
-  { VK_OEM_3, KCTRL, 0xf6, 0xe9, WCH_NONE, 0xd6, 0xc9 },                     /* <20> <20> <20> <20>*/
-  { VK_OEM_6, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_DEAD,  WCH_NONE, 0x00 },       /*    ^ ` ~    */
-      { 0xff, NOCAPS, 0x5e    , 0x27    , 0x7e     , WCH_NONE, 0x00 },
-  { VK_OEM_7, KCTRL, 0xe4, 0xe0, 0x7b, 0xc4, 0xc0 },   /* <20> <20> { <20> <20> */
-  { VK_OEM_PLUS, NOCAPS, WCH_DEAD, 0x21    , 0x5D    , WCH_NONE, 0x00 },    /*    <20> ! ]    */ 
-         { 0xff, NOCAPS, 0xa8    , WCH_NONE, WCH_NONE, WCH_NONE, 0x00 },
-  { 0, 0 }
-};
-
-ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
-  { VK_DECIMAL, 0, '.' }, /* I have no idea why this has to be like this. Shouldn't it be a "."? */
-  { VK_NUMPAD0, 0, '0' },
-  { VK_NUMPAD1, 0, '1' },
-  { VK_NUMPAD2, 0, '2' },
-  { VK_NUMPAD3, 0, '3' },
-  { VK_NUMPAD4, 0, '4' },
-  { VK_NUMPAD5, 0, '5' },
-  { VK_NUMPAD6, 0, '6' },
-  { VK_NUMPAD7, 0, '7' },
-  { VK_NUMPAD8, 0, '8' },
-  { VK_NUMPAD9, 0, '9' },
-//  { VK_BACK,    0, '\010' },
-  { 0,0 }
-};
-
-#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
-
-ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
-  vk_master(3,key_to_chars_3mod),
-  vk_master(4,key_to_chars_4mod),
-  vk_master(5,key_to_chars_5mod),
-  vk_master(2,key_to_chars_2mod),
-  vk_master(1,keypad_numbers),
-  { 0,0,0 }
-};
-
-ROSDATA VSC_LPWSTR key_names[] = {
-  { 0x00, L"" },
-  { 0x01, L"Esc" },
-  { 0x0e, L"R\x00fc" L"ck" },
-  { 0x0f, L"Tabulator" },
-  { 0x1c, L"Eingabe" },
-  { 0x1d, L"Ctrl" },
-  { 0x2a, L"Umschalt Links" },
-  { 0x36, L"Umschalt Rechts" },
-  { 0x37, L" (Zehnertastatur)" },
-  { 0x38, L"Alt" },
-  { 0x39, L"Leer" },
-  { 0x3a, L"Caps Lock" },
-  { 0x3b, L"F1" },
-  { 0x3c, L"F2" },
-  { 0x3d, L"F3" },
-  { 0x3e, L"F4" },
-  { 0x3f, L"F5" },
-  { 0x40, L"F6" },
-  { 0x41, L"F7" },
-  { 0x42, L"F8" },
-  { 0x43, L"F9" },
-  { 0x44, L"F10" },
-  { 0x45, L"Pause" },
-  { 0x46, L"Rollen-Feststell" },
-  { 0x47, L"7 (Zehnertastatur)" },
-  { 0x48, L"8 (Zehnertastatur)" },
-  { 0x49, L"9 (Zehnertastatur)" },
-  { 0x4a, L"- (Zehnertastatur)" },
-  { 0x4b, L"4 (Zehnertastatur)" },
-  { 0x4c, L"5 (Zehnertastatur)" },
-  { 0x4d, L"6 (Zehnertastatur)" },
-  { 0x4e, L"+ (Zehnertastatur)" },
-  { 0x4f, L"1 (Zehnertastatur)" },
-  { 0x50, L"2 (Zehnertastatur)" },
-  { 0x51, L"3 (Zehnertastatur)" },
-  { 0x52, L"0 (Zehnertastatur)" },
-  { 0x53, L"Punkt (Zehnertastatur)" },
-  { 0x54, L"Sys Req" },
-  { 0x57, L"F11" },
-  { 0x58, L"F12" },
-  { 0x7c, L"F13" },
-  { 0x7d, L"F14" },
-  { 0x7e, L"F15" },
-  { 0x7f, L"F16" },
-  { 0x80, L"F17" },
-  { 0x81, L"F18" },
-  { 0x82, L"F19" },
-  { 0x83, L"F20" },
-  { 0x84, L"F21" },
-  { 0x85, L"F22" },
-  { 0x86, L"F23" },
-  { 0x87, L"F24" },
-  { 0, NULL },
-};
-
-ROSDATA VSC_LPWSTR extended_key_names[] = {
-  { 0x1c, L"Eingabe (Zehnertastatur" },
-  { 0x1d, L"Strg-Rechts" },
-  { 0x35, L" (Zehnertastatur)" },
-  { 0x37, L"Druck" },
-  { 0x38, L"Alt Gr" },
-  { 0x45, L"Num-Feststell" },
-  { 0x46, L"Untbr" },
-  { 0x47, L"Pos1" },
-  { 0x48, L"Nach-Oben" },
-  { 0x49, L"Bild-Nach-Oben" },
-  { 0x4b, L"Nach-Links" },
-//{ 0x4c, L"Center" },
-  { 0x4d, L"Nach-Rechts" },
-  { 0x4f, L"Ende" },
-  { 0x50, L"Nach-Unten" },
-  { 0x51, L"Bild-Nach-Unten" },
-  { 0x52, L"Einfg" },
-  { 0x53, L"Entf" },
-  { 0x54, L"<ReactOS>" },
-  { 0x55, L"Hilfe" },
-  { 0x56, L"Linke <ReactOS>" },
-  { 0x5b, L"Rechte <ReactOS>" },
-  { 0, NULL },
-};
-
-ROSDATA DEADKEY_LPWSTR dead_key_names[] = {
-    L"\x00b4"	L"Akut",
-    L"`"	L"Gravis",
-    L"^"	L"Zirkumflex",
-    NULL
-};
-
-#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags
-
-ROSDATA DEADKEY dead_key[] = {
-  { DEADTRANS(L'a', L'^', 0xe2, 0x00) },/* ^ */
-  { DEADTRANS(L'e', L'^', 0xea, 0x00) },
-  { DEADTRANS(L'i', L'^', 0xee, 0x00) },
-  { DEADTRANS(L'o', L'^', 0xf4, 0x00) },
-  { DEADTRANS(L'u', L'^', 0xfb, 0x00) },
-  { DEADTRANS(L'A', L'^', 0xc2, 0x00) },
-  { DEADTRANS(L'E', L'^', 0xca, 0x00) },
-  { DEADTRANS(L'I', L'^', 0xce, 0x00) },
-  { DEADTRANS(L'O', L'^', 0xd4, 0x00) },
-  { DEADTRANS(L'U', L'^', 0xdb, 0x00) },
-  { DEADTRANS(L' ', L'^', L'^', 0x00) },
-  { DEADTRANS(L'a', 0xb4, 0xe1, 0x00) }, /* <20> */
-  { DEADTRANS(L'e', 0xb4, 0xe9, 0x00) },
-  { DEADTRANS(L'i', 0xb4, 0xed, 0x00) },
-  { DEADTRANS(L'o', 0xb4, 0xf3, 0x00) },
-  { DEADTRANS(L'u', 0xb4, 0xfa, 0x00) },
-  { DEADTRANS(L'y', 0xb4, 0xfd, 0x00) },
-  { DEADTRANS(L'A', 0xb4, 0xc1, 0x00) },
-  { DEADTRANS(L'E', 0xb4, 0xc9, 0x00) },
-  { DEADTRANS(L'I', 0xb4, 0xcd, 0x00) },
-  { DEADTRANS(L'O', 0xb4, 0xd3, 0x00) },
-  { DEADTRANS(L'U', 0xb4, 0xda, 0x00) },
-  { DEADTRANS(L'Y', 0xb4, 0xdd, 0x00) },
-  { DEADTRANS(L' ', 0xb4, 0xb4, 0x00) },
-  { DEADTRANS(L'a', L'`', 0xe0, 0x00) }, /* ` */
-  { DEADTRANS(L'e', L'`', 0xe8, 0x00) },
-  { DEADTRANS(L'i', L'`', 0xec, 0x00) },
-  { DEADTRANS(L'o', L'`', 0xf2, 0x00) },
-  { DEADTRANS(L'u', L'`', 0xf9, 0x00) },
-  { DEADTRANS(L'A', L'`', 0xc0, 0x00) },
-  { DEADTRANS(L'E', L'`', 0xc8, 0x00) },
-  { DEADTRANS(L'I', L'`', 0xcc, 0x00) },
-  { DEADTRANS(L'O', L'`', 0xd2, 0x00) },
-  { DEADTRANS(L'U', L'`', 0xd9, 0x00) },
-  { DEADTRANS(L' ', L'`', L'`', 0x00) },
-  { DEADTRANS(L' ', 0xa8, 0xa8, 0x00) }, /* <20> */
-  { DEADTRANS(L'a', 0xa8, 0xe4, 0x00) },
-  { DEADTRANS(L'e', 0xa8, 0xeb, 0x00) },  
-  { DEADTRANS(L'i', 0xa8, 0xef, 0x00) },
-  { DEADTRANS(L'o', 0xa8, 0xf6, 0x00) },
-  { DEADTRANS(L'u', 0xa8, 0xfc, 0x00) },
-  { DEADTRANS(L'y', 0xa8, 0xff, 0x00) },
-  { DEADTRANS(L'A', 0xa8, 0xc4, 0x00) },
-  { DEADTRANS(L'E', 0xa8, 0xcb, 0x00) },
-  { DEADTRANS(L'I', 0xa8, 0xcf, 0x00) },  
-  { DEADTRANS(L'O', 0xa8, 0xd6, 0x00) },
-  { DEADTRANS(L'U', 0xa8, 0xdc, 0x00) },  
-  { DEADTRANS(L' ', 0x7e, 0x7e, 0x00) }, /* ~ */
-  { DEADTRANS(L'a', 0x7e, 0xe3, 0x00) },
-  { DEADTRANS(L'o', 0x7e, 0xf5, 0x00) },
-  { DEADTRANS(L'n', 0x7e, 0xf1, 0x00) },
-  { DEADTRANS(L'A', 0x7e, 0xc3, 0x00) },
-  { DEADTRANS(L'O', 0x7e, 0xd5, 0x00) },
-  { DEADTRANS(L'N', 0x7e, 0xd1, 0x00) },
-  { 0, 0 }
-};
-
-/* Finally, the master table */
-ROSDATA KBDTABLES keyboard_layout_table = {
-  /* modifier assignments */
-  (PMODIFIERS)&modifier_bits,
-  
-  /* character from vk tables */
-  vk_to_wchar_master_table,
-  
-  /* diacritical marks -- currently implemented by wine code */
-  dead_key,
-
-  /* Key names */
-  (VSC_LPWSTR *)key_names,
-  (VSC_LPWSTR *)extended_key_names,
-  dead_key_names, /* Dead key names */
-
-  /* scan code to virtual key maps */
-  scancode_to_vk,
-  sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
-  extcode0_to_vk,
-  extcode1_to_vk,
-
-  MAKELONG(1,1), /* Version 1.0 */
-
-  /* Ligatures -- German doesn't have any */
-  0,
-  0,
-  NULL
-};
-
-PKBDTABLES STDCALL KbdLayerDescriptor() {
-  return &keyboard_layout_table;
-}
-

lib/kbdsg/kbdsg.def

@@ -1,8 +0,0 @@
-;
-; ReactOS Operating System
-;
-LIBRARY kbdsg.dll
-
-EXPORTS
-KbdLayerDescriptor@0
-;EOF

lib/kbdsg/kbdsg.rc

@@ -1,5 +0,0 @@
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS German (Switzerland) Keyboard Layout\0"
-#define REACTOS_STR_INTERNAL_NAME	"kbdsg\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"kbdsg.dll\0"
-#include <reactos/version.rc>

lib/kbdsg/makefile

@@ -1,41 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = dynlink
-
-TARGET_NAME = kbdsg
-
-TARGET_BASE = 0x5500000
-
-TARGET_ENTRY = 0x00000000
-
-TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include
-
-# require os code to explicitly request A/W version of structs/functions
-TARGET_CFLAGS += -D_DISABLE_TIDENTS
-
-TARGET_LFLAGS = -nostartfiles -nostdlib
-
-TARGET_SDKLIBS =
-
-TARGET_GCCLIBS = gcc
-
-TARGET_PCH = 
-
-TARGET_CLEAN = 
-
-TARGET_OBJECTS = kbdsg.o
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk
-
-%/TAGS:
-	etags -o $(@D)/TAGS $(@D)/\*.c
-
-etags: ./TAGS

lib/kernel32/misc/version.c

@@ -1,236 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/kernel32/misc/version.c
- * PURPOSE:         Version functions
- * PROGRAMMER:      Ariadne ( ariadne@xs4all.nl)
- * UPDATE HISTORY:
- *                  Created 01/11/98
- */
-
-#include <k32.h>
-
-#define NDEBUG
-#include "../include/debug.h"
-
-
-/* FUNCTIONS ******************************************************************/
-
-
-/*
- * @implemented
- */
-DWORD
-STDCALL
-GetVersion(VOID)
-{
-  PPEB pPeb = NtCurrentPeb();
-  DWORD nVersion;
-
-  nVersion = MAKEWORD(pPeb->OSMajorVersion, pPeb->OSMinorVersion);
-
-  /* behave consistently when posing as another operating system */
-  /* build number */
-  if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_WINDOWS)
-    nVersion |= ((DWORD)(pPeb->OSBuildNumber)) << 16;
- 
-  /* non-NT platform flag */
-  if(pPeb->OSPlatformId != VER_PLATFORM_WIN32_NT)
-    nVersion |= 0x80000000;
-
-  return nVersion;
-}
-
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-GetVersionExW(
-    LPOSVERSIONINFOW lpVersionInformation
-    )
-{
-  NTSTATUS Status;
-  
-  if(lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOW) &&
-     lpVersionInformation->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW))
-  {
-    /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large
-       enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER
-       would've been much more appropriate... */
-    SetLastError(ERROR_INSUFFICIENT_BUFFER);
-    return FALSE;
-  }
-
-  Status = RtlGetVersion((PRTL_OSVERSIONINFOW)lpVersionInformation);
-  if(NT_SUCCESS(Status))
-  {
-    int ln, maxlen;
-    
-    /* append a reactos specific string to the szCSDVersion string */
-
-    /* FIXME - we shouldn't do this when there is a (ros-specific) compatibility
-               flag set so we don't screw applications that might depend on a
-               certain string */
-
-    ln = wcslen(lpVersionInformation->szCSDVersion) + 1;
-    maxlen = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0]) - 1);
-    if(maxlen > ln)
-    {
-      PWCHAR szVer = lpVersionInformation->szCSDVersion + ln;
-      RtlZeroMemory(szVer, (maxlen - ln + 1) * sizeof(WCHAR));
-      wcsncpy(szVer,
-              L"ReactOS " KERNEL_VERSION_STR L" (Build " KERNEL_VERSION_BUILD_STR L")",
-              maxlen - ln);
-    }
-    
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-GetVersionExA(
-    LPOSVERSIONINFOA lpVersionInformation
-    )
-{
-  OSVERSIONINFOEXW viw;
-  
-  RtlZeroMemory(&viw, sizeof(viw));
-  
-  switch(lpVersionInformation->dwOSVersionInfoSize)
-  {
-    case sizeof(OSVERSIONINFOA):
-      viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
-      break;
-
-    case sizeof(OSVERSIONINFOEXA):
-      viw.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
-      break;
-
-    default:
-      /* for some reason win sets ERROR_INSUFFICIENT_BUFFER even if it is large
-         enough but doesn't match the exact sizes supported, ERROR_INVALID_PARAMETER
-         would've been much more appropriate... */
-      SetLastError(ERROR_INSUFFICIENT_BUFFER);
-      return FALSE;
-  }
-  
-  if(GetVersionExW((LPOSVERSIONINFOW)&viw))
-  {
-    ANSI_STRING CSDVersionA;
-    UNICODE_STRING CSDVersionW;
-    
-    /* copy back fields that match both supported structures */
-    lpVersionInformation->dwMajorVersion = viw.dwMajorVersion;
-    lpVersionInformation->dwMinorVersion = viw.dwMinorVersion;
-    lpVersionInformation->dwBuildNumber = viw.dwBuildNumber;
-    lpVersionInformation->dwPlatformId = viw.dwPlatformId;
-    
-    /* convert the win version string */
-    RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion);
-    
-    CSDVersionA.Length = 0;
-    CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion);
-    CSDVersionA.Buffer = lpVersionInformation->szCSDVersion;
-    
-    RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE);
-
-    /* convert the ReactOS version string */
-    CSDVersionW.Buffer = viw.szCSDVersion + CSDVersionW.Length / sizeof(WCHAR) + 1;
-    CSDVersionW.MaximumLength = sizeof(viw.szCSDVersion) - (CSDVersionW.Length + sizeof(WCHAR));
-    CSDVersionW.Length = wcslen(CSDVersionW.Buffer) * sizeof(WCHAR);
-    CSDVersionA.Buffer = lpVersionInformation->szCSDVersion + CSDVersionA.Length + 1;
-    CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion) - (CSDVersionA.Length + 1);
-    CSDVersionA.Length = 0;
-
-    RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE);
-    
-    /* copy back the extended fields */
-    if(viw.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW))
-    {
-      ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMajor = viw.wServicePackMajor;
-      ((LPOSVERSIONINFOEXA)lpVersionInformation)->wServicePackMinor = viw.wServicePackMinor;
-      ((LPOSVERSIONINFOEXA)lpVersionInformation)->wSuiteMask = viw.wSuiteMask;
-      ((LPOSVERSIONINFOEXA)lpVersionInformation)->wProductType = viw.wProductType;
-      ((LPOSVERSIONINFOEXA)lpVersionInformation)->wReserved = viw.wReserved;
-    }
-    
-    return TRUE;
-  }
-  
-  return FALSE;
-}
-
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-VerifyVersionInfoW(
-    LPOSVERSIONINFOEXW lpVersionInformation,
-    DWORD dwTypeMask,
-    DWORDLONG dwlConditionMask
-    )
-{
-  NTSTATUS Status;
-  
-  Status = RtlVerifyVersionInfo((PRTL_OSVERSIONINFOEXW)lpVersionInformation,
-                                dwTypeMask,
-                                dwlConditionMask);
-  switch(Status)
-  {
-    case STATUS_INVALID_PARAMETER:
-      SetLastError(ERROR_BAD_ARGUMENTS);
-      return FALSE;
-
-    case STATUS_REVISION_MISMATCH:
-      SetLastError(ERROR_OLD_WIN_VERSION);
-      return FALSE;
-
-    default:
-      /* RtlVerifyVersionInfo shouldn't report any other failure code! */
-      ASSERT(NT_SUCCESS(Status));
-      return TRUE;
-  }
-}
-
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-VerifyVersionInfoA(
-    LPOSVERSIONINFOEXA lpVersionInformation,
-    DWORD dwTypeMask,
-    DWORDLONG dwlConditionMask
-    )
-{
-  OSVERSIONINFOEXW viex;
-  
-  viex.dwOSVersionInfoSize = sizeof(viex);
-  viex.dwMajorVersion = lpVersionInformation->dwMajorVersion;
-  viex.dwMinorVersion = lpVersionInformation->dwMinorVersion;
-  viex.dwBuildNumber = lpVersionInformation->dwBuildNumber;
-  viex.dwPlatformId = lpVersionInformation->dwPlatformId;
-  /* NOTE: szCSDVersion is ignored, we don't need to convert it to unicode */
-  viex.wServicePackMajor = lpVersionInformation->wServicePackMajor;
-  viex.wServicePackMinor = lpVersionInformation->wServicePackMinor;
-  viex.wSuiteMask = lpVersionInformation->wSuiteMask;
-  viex.wProductType = lpVersionInformation->wProductType;
-  viex.wReserved = lpVersionInformation->wReserved;
-  
-  return VerifyVersionInfoW(&viex, dwTypeMask, dwlConditionMask);
-}
-
-/* EOF */

lib/ntdll/rtl/process.c

@@ -1,99 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/ntdll/rtl/process.c
- * PURPOSE:         Process functions
- * PROGRAMMER:      Ariadne ( ariadne@xs4all.nl)
- * UPDATE HISTORY:
- *                  Created 01/11/98
- */
-
-/* INCLUDES ****************************************************************/
-
-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <napi/i386/segment.h>
-#include <ntdll/ldr.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
-
-#define NDEBUG
-#include <ntdll/ntdll.h>
-
-/* FUNCTIONS ****************************************************************/
-
-
-PPEB
-STDCALL
-RtlpCurrentPeb(VOID)
-{
-    return NtCurrentPeb();
-}
-
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlAcquirePebLock(VOID)
-{
-   PPEB Peb = NtCurrentPeb ();
-   Peb->FastPebLockRoutine (Peb->FastPebLock);
-}
-
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlReleasePebLock(VOID)
-{
-   PPEB Peb = NtCurrentPeb ();
-   Peb->FastPebUnlockRoutine (Peb->FastPebLock);
-}
-
-
-/*
-* @implemented
-*/
-NTSTATUS STDCALL
-RtlGetVersion(RTL_OSVERSIONINFOW *Info)
-{
-   if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||
-       Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
-   {
-      PPEB Peb = NtCurrentPeb();
-      
-      Info->dwMajorVersion = Peb->OSMajorVersion;
-      Info->dwMinorVersion = Peb->OSMinorVersion;
-      Info->dwBuildNumber = Peb->OSBuildNumber;
-      Info->dwPlatformId = Peb->OSPlatformId;
-      if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0)
-      {
-        int i = _snwprintf(Info->szCSDVersion,
-                           (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1,
-                           L"Service Pack %d",
-                           ((Peb->OSCSDVersion >> 8) & 0xFF));
-        Info->szCSDVersion[i] = L'\0';
-      }
-      else
-      {
-        RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion));
-      }
-      if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
-      {
-         RTL_OSVERSIONINFOEXW *InfoEx = (RTL_OSVERSIONINFOEXW *)Info;
-         InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF;
-         InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF;
-         InfoEx->wSuiteMask = SharedUserData->SuiteMask;
-         InfoEx->wProductType = SharedUserData->NtProductType;
-      }
-
-      return STATUS_SUCCESS;
-   }
-
-   return STATUS_INVALID_PARAMETER;
-}
-
-/* EOF */

lib/rtl/access.c

@@ -1,68 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            lib/rtl/access.c
- * PURPOSE:         Access rights handling functions
- *
- * PROGRAMMERS:     Eric Kohl
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* FUNCTIONS ***************************************************************/
-
-/*
- * @implemented
- */
-BOOLEAN STDCALL
-RtlAreAllAccessesGranted(ACCESS_MASK GrantedAccess,
-                         ACCESS_MASK DesiredAccess)
-{
-  PAGED_CODE_RTL();
-  return ((GrantedAccess & DesiredAccess) == DesiredAccess);
-}
-
-
-/*
- * @implemented
- */
-BOOLEAN STDCALL
-RtlAreAnyAccessesGranted(ACCESS_MASK GrantedAccess,
-                         ACCESS_MASK DesiredAccess)
-{
-  PAGED_CODE_RTL();
-  return ((GrantedAccess & DesiredAccess) != 0);
-}
-
-
-/*
- * @implemented
- */
-VOID STDCALL
-RtlMapGenericMask(PACCESS_MASK AccessMask,
-                  PGENERIC_MAPPING GenericMapping)
-{
-  PAGED_CODE_RTL();
-
-  if (*AccessMask & GENERIC_READ)
-    *AccessMask |= GenericMapping->GenericRead;
-
-  if (*AccessMask & GENERIC_WRITE)
-    *AccessMask |= GenericMapping->GenericWrite;
-
-  if (*AccessMask & GENERIC_EXECUTE)
-    *AccessMask |= GenericMapping->GenericExecute;
-
-  if (*AccessMask & GENERIC_ALL)
-    *AccessMask |= GenericMapping->GenericAll;
-
-  *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
-}
-
-/* EOF */

lib/rtl/version.c

@@ -1,302 +0,0 @@
-/*
- *  ReactOS kernel
- *  Copyright (C) 2004 ReactOS Team
- *  Copyright 1997 Marcus Meissner
- *  Copyright 1998 Patrik Stridvall
- *  Copyright 1998, 2003 Andreas Mohr
- *  Copyright 1997, 2003 Alexandre Julliard
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id$
- *
- * PROJECT:           ReactOS kernel
- * PURPOSE:           Runtime code
- * FILE:              lib/rtl/version.c
- * PROGRAMER:         Filip Navara
- */
-
-/* INCLUDES *****************************************************************/
-
-#define __USE_W32API
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-
-#define NDEBUG
-#include <debug.h>
-
-/* GLOBALS ******************************************************************/
-
-NTSTATUS
-STDCALL
-RtlGetVersion(
-    OUT PRTL_OSVERSIONINFOW lpVersionInformation
-    );
-
-/* FUNCTIONS ****************************************************************/
-
-/*
-* @implemented
-*/
-NTSTATUS
-STDCALL
-RtlVerifyVersionInfo(
-	IN PRTL_OSVERSIONINFOEXW VersionInfo,
-	IN ULONG TypeMask,
-	IN ULONGLONG ConditionMask
-	)
-{
-    RTL_OSVERSIONINFOEXW ver;
-    NTSTATUS status;
-
-    /* FIXME:
-        - Check the following special case on Windows (various versions):
-          o lp->wSuiteMask == 0 and ver.wSuiteMask != 0 and VER_AND/VER_OR
-          o lp->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW)
-        - MSDN talks about some tests being impossible. Check what really happens.
-     */
-
-    ver.dwOSVersionInfoSize = sizeof(ver);
-    if ((status = RtlGetVersion( (PRTL_OSVERSIONINFOW)&ver )) != STATUS_SUCCESS) return status;
-
-    if(!(TypeMask && ConditionMask)) return STATUS_INVALID_PARAMETER;
-
-    if(TypeMask & VER_PRODUCT_TYPE)
-        switch(ConditionMask >> 7*3 & 0x07) {
-            case VER_EQUAL:
-                if(ver.wProductType != VersionInfo->wProductType) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.wProductType <= VersionInfo->wProductType) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.wProductType < VersionInfo->wProductType) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.wProductType >= VersionInfo->wProductType) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.wProductType > VersionInfo->wProductType) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_SUITENAME)
-        switch(ConditionMask >> 6*3 & 0x07)
-        {
-            case VER_AND:
-                if((VersionInfo->wSuiteMask & ver.wSuiteMask) != VersionInfo->wSuiteMask)
-                    return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_OR:
-                if(!(VersionInfo->wSuiteMask & ver.wSuiteMask) && VersionInfo->wSuiteMask)
-                    return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_PLATFORMID)
-        switch(ConditionMask >> 3*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.dwPlatformId != VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.dwPlatformId <= VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.dwPlatformId < VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.dwPlatformId >= VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.dwPlatformId > VersionInfo->dwPlatformId) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_BUILDNUMBER)
-        switch(ConditionMask >> 2*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.dwBuildNumber != VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.dwBuildNumber <= VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.dwBuildNumber < VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.dwBuildNumber >= VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.dwBuildNumber > VersionInfo->dwBuildNumber) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_MAJORVERSION)
-        switch(ConditionMask >> 1*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.dwMajorVersion != VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.dwMajorVersion <= VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.dwMajorVersion < VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.dwMajorVersion >= VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.dwMajorVersion > VersionInfo->dwMajorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_MINORVERSION)
-        switch(ConditionMask >> 0*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.dwMinorVersion != VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.dwMinorVersion <= VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.dwMinorVersion < VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.dwMinorVersion >= VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.dwMinorVersion > VersionInfo->dwMinorVersion) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_SERVICEPACKMAJOR)
-        switch(ConditionMask >> 5*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.wServicePackMajor != VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.wServicePackMajor <= VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.wServicePackMajor < VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.wServicePackMajor >= VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.wServicePackMajor > VersionInfo->wServicePackMajor) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-    if(TypeMask & VER_SERVICEPACKMINOR)
-        switch(ConditionMask >> 4*3 & 0x07)
-        {
-            case VER_EQUAL:
-                if(ver.wServicePackMinor != VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER:
-                if(ver.wServicePackMinor <= VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_GREATER_EQUAL:
-                if(ver.wServicePackMinor < VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS:
-                if(ver.wServicePackMinor >= VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH;
-                break;
-            case VER_LESS_EQUAL:
-                if(ver.wServicePackMinor > VersionInfo->wServicePackMinor) return STATUS_REVISION_MISMATCH;
-                break;
-            default:
-                return STATUS_INVALID_PARAMETER;
-        }
-
-    return STATUS_SUCCESS;
-}
-
-
-/*
- Header hell made me do it, don't blame me. Please move these somewhere more
- sensible
-*/
-#define VER_EQUAL         1
-#define VER_GREATER       2
-#define VER_GREATER_EQUAL 3
-#define VER_LESS          4
-#define VER_LESS_EQUAL    5
-#define VER_AND           6
-#define VER_OR            7
-
-#define VER_CONDITION_MASK              7
-#define VER_NUM_BITS_PER_CONDITION_MASK 3
-
-#define VER_MINORVERSION     0x0000001
-#define VER_MAJORVERSION     0x0000002
-#define VER_BUILDNUMBER      0x0000004
-#define VER_PLATFORMID       0x0000008
-#define VER_SERVICEPACKMINOR 0x0000010
-#define VER_SERVICEPACKMAJOR 0x0000020
-#define VER_SUITENAME        0x0000040
-#define VER_PRODUCT_TYPE     0x0000080
-
-/*
- * @implemented
- */
-ULONGLONG NTAPI
-VerSetConditionMask(IN ULONGLONG dwlConditionMask,
-                    IN DWORD dwTypeBitMask,
-                    IN BYTE dwConditionMask)
-{
-  if(dwTypeBitMask == 0)
-    return dwlConditionMask;
-
-  dwConditionMask &= VER_CONDITION_MASK;
-
-  if(dwConditionMask == 0)
-    return dwlConditionMask;
-
-  if(dwTypeBitMask & VER_PRODUCT_TYPE)
-    dwlConditionMask |= dwConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_SUITENAME)
-    dwlConditionMask |= dwConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_SERVICEPACKMAJOR)
-    dwlConditionMask |= dwConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_SERVICEPACKMINOR)
-    dwlConditionMask |= dwConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_PLATFORMID)
-    dwlConditionMask |= dwConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_BUILDNUMBER)
-    dwlConditionMask |= dwConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_MAJORVERSION)
-    dwlConditionMask |= dwConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK;
-  else if(dwTypeBitMask & VER_MINORVERSION)
-    dwlConditionMask |= dwConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK;
-
-  return dwlConditionMask;
-}
-
-/* EOF */

lib/serialui/Makefile

@@ -1,36 +0,0 @@
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = dynlink
-
-TARGET_NAME = serialui
-
-TARGET_BASE = $(TARGET_BASE_LIB_SERIALUI)
-
-TARGET_CFLAGS = \
-	-I./include \
-	-Wall \
-	-Werror \
-	-fno-builtin \
-	-DUNICODE \
-	-DLE \
-	-DDBG \
-	-D__USE_W32API
-
-TARGET_LFLAGS = -nostartfiles -nostdlib
-
-TARGET_SDKLIBS = kernel32.a user32.a shlwapi.a
-
-TARGET_OBJECTS = serialui.o
-
-DEP_OBJECTS := $(TARGET_OBJECTS)
-
-TARGET_CLEAN = $(DEP_FILES)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-include $(TOOLS_PATH)/depend.mk
-
-# EOF

lib/serialui/resource.h

@@ -1,32 +0,0 @@
-#define IDS_EVENPARITY 2001
-#define IDS_MARKPARITY 2002
-#define IDS_NOPARITY 2003
-#define IDS_ODDPARITY 2004
-#define IDS_SPACEPARITY 2005
-
-#define IDS_ONESTOPBIT 2006
-#define IDS_ONE5STOPBITS 2007
-#define IDS_TWOSTOPBITS 2008
-
-#define IDS_FC_NO 2009
-#define IDS_FC_CTSRTS 2010
-#define IDS_FC_XONXOFF 2011
-
-#define IDS_TITLE 2012
-
-#define IDD_COMMDLG 1000
-#define IDC_GRP1 1001
-#define IDC_OKBTN 1002
-#define IDC_CANCELBTN 1003
-#define IDC_BTN 1004
-#define IDC_STC1 1005
-#define IDC_STC2 1006
-#define IDC_STC3 1007
-#define IDC_STC4 1008
-#define IDC_STC5 1009
-#define IDC_BAUDRATE 1010
-#define IDC_BYTESIZE 1011
-#define IDC_PARITY 1012
-#define IDC_STOPBITS 1013
-#define IDC_FLOW 1014
-#define IDC_RESTOREBTN 1015

lib/serialui/serialui.c

@@ -1,418 +0,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS SerialUI DLL
- * FILE:        serialui.c
- * PUROPSE:     A dialog box to cunfigure COM port.
- *              Functions to set(and get too) default configuration.
- * PROGRAMMERS: Saveliy Tretiakov (saveliyt@mail.ru)
- * REVISIONS:
- *              ST   (05/04/2005) Created. Implemented drvCommConfigDialog.
- */
-
-#include <serialui.h>
-
-static HINSTANCE hDllInstance;
-
-/************************************
- *
- *  DATA
- *
- ************************************/
-
-const DWORD Bauds[] = {
-	CBR_110,
-	CBR_300,
-	CBR_600,
-	CBR_1200,
-	CBR_2400,
-	CBR_4800,
-	CBR_9600,
-	CBR_14400,
-	CBR_19200,
-	CBR_38400,
-	CBR_56000,
-	CBR_57600,
-	CBR_115200,
-	CBR_128000,
-	CBR_256000,
-	0
-};
-
-const BYTE ByteSizes[] = {
-	5,
-	6,
-	7,
-	8,
-	0
-};
-
-
-const PARITY_INFO Parities[] = {
-	{ EVENPARITY, IDS_EVENPARITY },
-	{ MARKPARITY, IDS_MARKPARITY },
-	{ NOPARITY, IDS_NOPARITY },
-	{ ODDPARITY, IDS_ODDPARITY },
-	{ SPACEPARITY, IDS_SPACEPARITY },
-	{ 0, 0 }
-};
-
-const STOPBIT_INFO StopBits[] = {
-	{ ONESTOPBIT, IDS_ONESTOPBIT },
-	{ ONE5STOPBITS, IDS_ONE5STOPBITS },
-	{ TWOSTOPBITS, IDS_TWOSTOPBITS },
-	{ 0, 0 }
-};
-
-
-/************************************
- *
- *  DLLMAIN
- *
- ************************************/
-
-BOOL
-STDCALL
-DllMain(HINSTANCE hInstance,
-	DWORD dwReason,
-	LPVOID reserved)
-{
-	if(dwReason==DLL_PROCESS_ATTACH)
-	{
-		hDllInstance = hInstance;
-	}
-	else if(dwReason==DLL_THREAD_ATTACH)
-	{
-		DisableThreadLibraryCalls(hInstance);
-	}
-
-	return TRUE;
-}
-
-
-/************************************
- *
- *  EXPORTS
- *
- ************************************/
-
-/*
- * @implemented
- */
-BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice,
-	HWND hWnd,
-	LPCOMMCONFIG lpCommConfig)
-{
-	DIALOG_INFO DialogInfo;
-
-	if(!lpszDevice || !lpCommConfig)
-	{
-		return FALSE;
-	}
-
-	DialogInfo.lpszDevice = lpszDevice;
-	DialogInfo.lpCC = lpCommConfig;
-
-	return DialogBoxParamW(hDllInstance, MAKEINTRESOURCEW(IDD_COMMDLG),
-					hWnd, (DLGPROC)CommDlgProc, (LPARAM)&DialogInfo);
-}
-
-/*
- * @implemented
- */
-BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice,
-	HWND hWnd,
-	LPCOMMCONFIG lpCommConfig)
-{
-	BOOL result;
-	UINT len;
-	WCHAR *wstr;
-
-	len = MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, NULL, 0);
-	if((wstr = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR))))
-	{
-		MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, wstr, len);
-		result = drvCommConfigDialogW(wstr, hWnd, lpCommConfig);
-		HeapFree(GetProcessHeap(), 0, wstr);
-		return result;
-	}
-	else
-		return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	DWORD dwSize)
-{
-	UNIMPLEMENTED
-}
-
-/*
- * @unimplemented
- */
-BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	DWORD dwSize)
-{
-	UNIMPLEMENTED
-}
-
-/*
- * @unimplemented
- */
-BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	LPDWORD lpdwSize)
-{
-	UNIMPLEMENTED
-}
-
-/*
- * @unimplemented
- */
-BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	LPDWORD lpdwSize)
-{
-	UNIMPLEMENTED
-}
-
-
-/************************************
- *
- *  INTERNALS
- *
- ************************************/
-
-LRESULT CommDlgProc(HWND hDlg,
-	UINT Msg,
-	WPARAM wParam,
-	LPARAM lParam)
-{
-	LPDIALOG_INFO lpDlgInfo = NULL;
-	HWND hBox;
-
-	switch (Msg)
-	{
-
-		case WM_INITDIALOG:
-		{
-			WCHAR wstr[255];
-			RECT rc, rcDlg, rcOwner;
-			HWND hOwner;
-			INT i;
-
-			lpDlgInfo = (LPDIALOG_INFO)lParam;
-			SetWindowLongPtrW(hDlg, DWL_USER, (LONG_PTR)lpDlgInfo);
-
-			/* Set title */
-			if(LoadStringW(hDllInstance, IDS_TITLE, wstr, sizeof(wstr) / sizeof(wstr[0])))
-			{
-    				SetWindowTextW(hDlg, wstr);
-			}
-
-                        /* FIXME - this won't work correctly systems with multiple monitors! */
-                        if(!(hOwner = GetParent(hDlg)))
-				hOwner = GetDesktopWindow();
-
-			/* Position dialog in the center of owner window */
-			GetWindowRect(hOwner, &rcOwner);
-			GetWindowRect(hDlg, &rcDlg);
-			CopyRect(&rc, &rcOwner);
-			OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top);
-			OffsetRect(&rc, -rc.left, -rc.top);
-			OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom);
-			SetWindowPos(hDlg, HWND_TOP,
-				rcOwner.left + (rc.right / 2),
-				rcOwner.top + (rc.bottom / 2),
-				0, 0, SWP_NOSIZE);
-
-			/* Initialize baud rate combo */
-			if(!(hBox = GetDlgItem(hDlg, IDC_BAUDRATE)))
-				EndDialog(hDlg, 0);
-
-			for(i = 0; Bauds[i]; i++)
-			{
-                                wsprintf(wstr, L"%d", Bauds[i]);
-                                SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr);
-				if(Bauds[i] == lpDlgInfo->lpCC->dcb.BaudRate)
-					SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0);
-			}
-
-			if(SendMessageW(hBox, CB_GETCURSEL, 0, 0) == CB_ERR)
-				SendMessageW(hBox, CB_SETCURSEL, DEFAULT_BAUD_INDEX, 0);
-
-			/* Initialize byte size combo */
-			if(!(hBox = GetDlgItem(hDlg, IDC_BYTESIZE)))
-				EndDialog(hDlg, 0);
-
-			for(i = 0; ByteSizes[i]; i++)
-			{
-                                wsprintf(wstr, L"%d", Bauds[i]);
-                                SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr);
-				if(ByteSizes[i] == lpDlgInfo->lpCC->dcb.ByteSize)
-					SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0);
-			}
-
-			if(SendMessageW(hBox, CB_GETCURSEL, 0, 0) == CB_ERR)
-				SendMessageW(hBox, CB_SETCURSEL, DEFAULT_BYTESIZE_INDEX, 0);
-
-			/* Initialize parity combo */
-			if(!(hBox = GetDlgItem(hDlg, IDC_PARITY)))
-				EndDialog(hDlg, 0);
-
-			for(i = 0; Parities[i].StrId; i++)
-			{
-				if(LoadStringW(hDllInstance, Parities[i].StrId, wstr, sizeof(wstr) / sizeof(wstr[0])))
-				{
-					SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr);
-					if(Parities[i].Parity == lpDlgInfo->lpCC->dcb.Parity)
-						SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0);
-				}
-			}
-
-			if(SendMessageW(hBox, CB_GETCURSEL, 0, 0)==CB_ERR)
-				SendMessageW(hBox, CB_SETCURSEL, DEFAULT_PARITY_INDEX, 0);
-
-			/* Initialize stop bits combo */
-			if(!(hBox = GetDlgItem(hDlg, IDC_STOPBITS)))
-				EndDialog(hDlg, 0);
-
-			for(i = 0; StopBits[i].StrId; i++)
-			{
-				if(LoadStringW(hDllInstance, StopBits[i].StrId, wstr, sizeof(wstr) / sizeof(wstr[0])))
-				{
-					SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr);
-					if(StopBits[i].StopBit == lpDlgInfo->lpCC->dcb.StopBits)
-						SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0);
-				}
-			}
-
-			if(SendMessageW(hBox, CB_GETCURSEL, 0, 0)==CB_ERR)
-				SendMessageW(hBox, CB_SETCURSEL, DEFAULT_STOPBITS_INDEX, 0);
-
-			/* Initialize flow control combo */
-			if(!(hBox = GetDlgItem(hDlg, IDC_FLOW)))
-				EndDialog(hDlg, 0);
-
-			if(LoadStringW(hDllInstance, IDS_FC_NO, wstr, sizeof(wstr) / sizeof(wstr[0])))
-			{
-				SendMessageW(hBox, CB_INSERTSTRING, 0, (LPARAM)wstr);
-				SendMessageW(hBox, CB_SETCURSEL, 0, 0);
-				lpDlgInfo->InitialFlowIndex = 0;
-			}
-
-
-			if(LoadStringW(hDllInstance, IDS_FC_CTSRTS, wstr, sizeof(wstr) / sizeof(wstr[0])))
-			{
-				SendMessageW(hBox, CB_INSERTSTRING, 1, (LPARAM)wstr);
-				if(lpDlgInfo->lpCC->dcb.fRtsControl == RTS_CONTROL_HANDSHAKE
-					|| lpDlgInfo->lpCC->dcb.fOutxCtsFlow == TRUE)
-				{
-					SendMessageW(hBox, CB_SETCURSEL, 1, 0);
-					lpDlgInfo->InitialFlowIndex = 1;
-				}
-			}
-
-			if(LoadStringW(hDllInstance, IDS_FC_XONXOFF, wstr, sizeof(wstr) / sizeof(wstr[0])))
-			{
-				SendMessageW(hBox, CB_INSERTSTRING, 2, (LPARAM)wstr);
-				if(lpDlgInfo->lpCC->dcb.fOutX || lpDlgInfo->lpCC->dcb.fInX)
-				{
-					SendMessageW(hBox, CB_SETCURSEL, 2, 0);
-					lpDlgInfo->InitialFlowIndex = 2;
-				}
-			}
-
-			/* Set focus */
-			SetFocus(GetDlgItem(hDlg, IDC_OKBTN));
-
-			return FALSE;
-		} /* WM_INITDIALOG */
-
-		case WM_COMMAND:
-		{
-			switch(wParam)
-			{
-				case IDC_CANCELBTN:
-					EndDialog(hDlg, FALSE);
-					break;
-				case IDC_OKBTN:
-					OkButton(hDlg);
-					EndDialog(hDlg, TRUE);
-					break;
-			}
-			return TRUE;
-		} /* WM_COMMAND */
-
-		case WM_CLOSE:
-		{
-			EndDialog(hDlg, FALSE);
-			return TRUE;
-		} /* WM_CLOSE */
-
-			default:
-			return FALSE;
-	}
-
-}
-
-
-VOID OkButton(HWND hDlg)
-{
-	LPDIALOG_INFO lpDlgInfo;
-	UINT Index;
-
-	lpDlgInfo = (LPDIALOG_INFO) GetWindowLongPtrW(hDlg, DWL_USER);
-
-	/* Baud rate */
-	Index = SendMessageW(GetDlgItem(hDlg, IDC_BAUDRATE), CB_GETCURSEL, 0, 0);
-	lpDlgInfo->lpCC->dcb.BaudRate = Bauds[Index];
-
-	/* Byte size */
-	Index = SendMessageW(GetDlgItem(hDlg, IDC_BYTESIZE), CB_GETCURSEL, 0, 0);
-	lpDlgInfo->lpCC->dcb.ByteSize = ByteSizes[Index];
-
-	/* Parity */
-	Index = SendMessageW(GetDlgItem(hDlg, IDC_PARITY), CB_GETCURSEL, 0, 0);
-	lpDlgInfo->lpCC->dcb.Parity = Parities[Index].Parity;
-
-	/* Stop bits */
-	Index = SendMessageW(GetDlgItem(hDlg, IDC_STOPBITS), CB_GETCURSEL, 0, 0);
-	lpDlgInfo->lpCC->dcb.StopBits = StopBits[Index].StopBit;
-	
-	/* Flow Control */
-	Index = SendMessageW(GetDlgItem(hDlg, IDC_FLOW), CB_GETCURSEL, 0, 0);
-	if(lpDlgInfo->InitialFlowIndex != Index)
-	{
-		switch(Index)
-		{
-			case 0: /* NO */
-				lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE;
-				lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_DISABLE;
-				lpDlgInfo->lpCC->dcb.fOutxCtsFlow = FALSE;
-				lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE;
-				lpDlgInfo->lpCC->dcb.fOutX = FALSE;
-				lpDlgInfo->lpCC->dcb.fInX = FALSE;
-				break;
-			case 1: /* CTS/RTS */
-				lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE;
-				lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
-				lpDlgInfo->lpCC->dcb.fOutxCtsFlow = TRUE;
-				lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE;
-				lpDlgInfo->lpCC->dcb.fOutX = FALSE;
-				lpDlgInfo->lpCC->dcb.fInX = FALSE;
-				break;
-			case 2: /* XON/XOFF */
-				lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE;
-				lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_DISABLE;
-				lpDlgInfo->lpCC->dcb.fOutxCtsFlow = FALSE;
-				lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE;
-				lpDlgInfo->lpCC->dcb.fOutX = TRUE;
-				lpDlgInfo->lpCC->dcb.fInX = TRUE;
-				break;
-		}
-	}
-}

lib/serialui/serialui.def

@@ -1,10 +0,0 @@
-LIBRARY serialui.dll
-
-EXPORTS
-drvCommConfigDialogW@12
-drvCommConfigDialogA@12
-drvSetDefaultCommConfigW@12
-drvSetDefaultCommConfigA@12
-drvGetDefaultCommConfigW@12 
-drvGetDefaultCommConfigA@12
-

lib/serialui/serialui.h

@@ -1,86 +0,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS SerialUI DLL
- * FILE:        serialui.h
- * PURPOSE:     header file
- * PROGRAMMERS: Saveliy Tretiakov (saveliyt@mail.ru)
- */
-
-#include <windows.h>
-#include <shlwapi.h>
-#include "resource.h"
-
-#define UNIMPLEMENTED \
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \
-  return FALSE;
-
-#define DEFAULT_BAUD_INDEX 6
-#define DEFAULT_BYTESIZE_INDEX 3
-#define DEFAULT_PARITY_INDEX 2
-#define DEFAULT_STOPBITS_INDEX 0
-
-typedef struct _DIALOG_INFO
-{
-	LPCWSTR lpszDevice;
-	UINT InitialFlowIndex;
-	LPCOMMCONFIG lpCC;
-} DIALOG_INFO, *LPDIALOG_INFO;
-
-typedef struct _PARITY_INFO
-{
-	BYTE Parity;
-	UINT StrId;
-} PARITY_INFO, *PPARITY_INFO;
-
-typedef struct _STOPBIT_INFO
-{
-	BYTE StopBit;
-	UINT StrId;
-} STOPBIT_INFO, *PSTOPBIT_INFO;
-
-
-/************************************
- *
- *  EXPORTS
- *
- ************************************/
-
-BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice,
-	HWND hWnd,
-	LPCOMMCONFIG lpCommConfig);
-
-BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice,
-	HWND hWnd,
-	LPCOMMCONFIG lpCommConfig);
-
-BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	DWORD dwSize);
-
-BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	DWORD dwSize);
-
-BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	LPDWORD lpdwSize);
-
-BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice,
-	LPCOMMCONFIG lpCommConfig,
-	LPDWORD lpdwSize);
-
-
-/************************************
- *
- *  INTERNALS
- *
- ************************************/
-
-LRESULT CommDlgProc(HWND hDlg,
-	UINT Msg,
-	WPARAM wParam,
-	LPARAM lParam);
-
-VOID OkButton(HWND hDlg);
-
-

lib/serialui/serialui.rc

@@ -1,48 +0,0 @@
-#include "resource.h"
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SerialUI DLL\0"
-#define REACTOS_STR_INTERNAL_NAME	"serialui\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"serialui.dll\0"
-#include <reactos/version.rc>
-
-
-STRINGTABLE LOADONCALL DISCARDABLE
-BEGIN
-	IDS_EVENPARITY, "Even"
-	IDS_MARKPARITY, "Mark"
-	IDS_NOPARITY, "No parity"
-	IDS_ODDPARITY, "Odd"
-	IDS_SPACEPARITY, "Space"
-
-	IDS_ONESTOPBIT, "1 stop bit"
-	IDS_ONE5STOPBITS, "1.5 stop bits"
-	IDS_TWOSTOPBITS, "2 stop bits"
-
-	IDS_FC_NO, "No"
-	IDS_FC_CTSRTS, "CTS/RTS"
-	IDS_FC_XONXOFF, "XON/XOFF"
-
-	IDS_TITLE, "Properties for %s"
-END
-
-IDD_COMMDLG DIALOGEX 6,5,222,175
-FONT 8,"MS Sans Serif"
-STYLE 0x10C80080
-EXSTYLE 0x00000001
-BEGIN
-	CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000
-	CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000
-	CONTROL "Cancel",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000
-	CONTROL "Baud rate:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000
-	CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000
-	CONTROL "Parity:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000
-	CONTROL "Stop bits:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000
-	CONTROL "Flow control:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000
-	CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000
-	CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000
-	CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000
-	CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000
-	CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000
-END
-

lib/shell32/shell32_Sv.rc

@@ -1,221 +0,0 @@
-/*
- * Copyright 2005 David Nordenberg
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-MENU_001 MENU DISCARDABLE
-BEGIN
-	MENUITEM "&Stora ikoner",	FCIDM_SHVIEW_BIGICON
-	MENUITEM "S&m<> ikoner",	FCIDM_SHVIEW_SMALLICON
-	MENUITEM "&Lista",		FCIDM_SHVIEW_LISTVIEW
-	MENUITEM "&Detaljer",		FCIDM_SHVIEW_REPORTVIEW
-END
-
-/*
- shellview background menu
-*/
-MENU_002 MENU DISCARDABLE
-BEGIN
-	POPUP ""
-	BEGIN
-	  POPUP "&Visa"
-	  BEGIN
-	    MENUITEM "&Stora ikoner",	FCIDM_SHVIEW_BIGICON
-	    MENUITEM "S&m<> ikoner",	FCIDM_SHVIEW_SMALLICON
-	    MENUITEM "&Lista",		FCIDM_SHVIEW_LISTVIEW
-	    MENUITEM "&Detaljer",	FCIDM_SHVIEW_REPORTVIEW
-	  END
-	  MENUITEM SEPARATOR
-	  POPUP "Ordna &ikoner efter"
-	  BEGIN
-	    MENUITEM "&Namn",	0x30	/* column 0 */
-	    MENUITEM "&Typ",	0x32	/* column 2 */
-	    MENUITEM "&Storlek",	0x31	/* ... */
-	    MENUITEM "&Datum",	0x33
-	    MENUITEM SEPARATOR
-	    MENUITEM "&Ordna automatiskt",	FCIDM_SHVIEW_AUTOARRANGE
-	  END
-	  MENUITEM "Rada upp ikoner",	FCIDM_SHVIEW_SNAPTOGRID
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Uppdatera",		FCIDM_SHVIEW_REFRESH
-	  MENUITEM SEPARATOR
-	  MENUITEM "K&listra in",		FCIDM_SHVIEW_INSERT
-	  MENUITEM "Klistra in som genv<6E>g",	FCIDM_SHVIEW_INSERTLINK
-	  MENUITEM SEPARATOR
-	  POPUP "&Ny"
-	  BEGIN
-	    MENUITEM "Ny &mapp",	FCIDM_SHVIEW_NEWFOLDER
-	    MENUITEM "Ny &genv<6E>g",	FCIDM_SHVIEW_NEWLINK
-	    MENUITEM SEPARATOR
-	  END
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Egenskaper",	FCIDM_SHVIEW_PROPERTIES
-	END
-END
-
-/*
- shellview item menu
-*/
-MENU_SHV_FILE MENU DISCARDABLE
-BEGIN
-	POPUP ""
-	BEGIN
-	  MENUITEM "&Utforska",		FCIDM_SHVIEW_EXPLORE
-	  MENUITEM "&<26>ppna",		FCIDM_SHVIEW_OPEN
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Klipp ut",		FCIDM_SHVIEW_CUT
-	  MENUITEM "K&opiera",		FCIDM_SHVIEW_COPY
-	  MENUITEM SEPARATOR
-	  MENUITEM "Skapa &genv<6E>g",	FCIDM_SHVIEW_CREATELINK
-	  MENUITEM "&Ta bort",		FCIDM_SHVIEW_DELETE
-	  MENUITEM "&Byt namn",		FCIDM_SHVIEW_RENAME
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Egenskaper",	FCIDM_SHVIEW_PROPERTIES
-	END
-END
-
-SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK
-CAPTION "Bl<42>ddra efter mapp"
-FONT 8, "MS Shell Dlg"
-{
- DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP
- LTEXT "", IDD_TITLE, 4, 4, 180, 12
- LTEXT "", IDD_STATUS, 4, 25, 180, 12
- CONTROL "", IDD_TREEVIEW, "SysTreeView32",
- 	TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
-	WS_BORDER | WS_TABSTOP,
-	4, 40, 180, 120
-}
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om %s"
-FONT 10, "MS Shell Dlg"
-{
- DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 10, 10, 14, 16
- LTEXT "", 100, 30, 10, 137, 10
- LTEXT "", 101, 30, 22, 137, 10
- LTEXT "ReactOS hade inte varit m<>jligt utan dessa personer:", 98, 8, 55, 137, 10
-}
-
-SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION ""
-FONT 8, "MS Shell Dlg"
-{
- ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
-LTEXT "Skriv namnet p<> ett program, en mapp eller ett dokument f<>r att <20>ppna det.", 12289, 36, 11, 182, 18
- LTEXT "&<26>ppna:", 12305, 7, 39, 24, 10
- CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
- DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP
- PUSHBUTTON "&Bl<42>ddra...", 12288, 170, 63, 50, 14, WS_TABSTOP
-}
-
-/*
-	special folders
-*/
-STRINGTABLE DISCARDABLE
-{
-	IDS_DESKTOP		"Skrivbord"
-	IDS_MYCOMPUTER		"Den h<>r datorn"
-}
-
-/*
-	context menus
-*/
-STRINGTABLE DISCARDABLE
-{
-	IDS_VIEW_LARGE		"&Stora ikoner"
-	IDS_VIEW_SMALL		"S&m<> ikoner"
-	IDS_VIEW_LIST		"&Lista"
-	IDS_VIEW_DETAILS	"&Detaljer"
-	IDS_SELECT		"V<>lj"
-	IDS_OPEN		"<22>ppna"
-}
-
-STRINGTABLE DISCARDABLE
-{
-	IDS_CREATEFOLDER_DENIED "Kan inte skapa ny mapp: <20>tkomst nekad."
-	IDS_CREATEFOLDER_CAPTION "Fel vid f<>rs<72>k att skapa ny mapp"
-	IDS_DELETEITEM_CAPTION "Bekr<6B>fta borttagning av fil"
-	IDS_DELETEFOLDER_CAPTION "Bekr<6B>fta borttagning av mapp"
-	IDS_DELETEITEM_TEXT "<22>r du s<>ker p<> att du vill ta bort '%1'?"
-	IDS_DELETEMULTIPLE_TEXT "<22>r du s<>ker p<> att du vill ta bort de h<>r %1 objekten?"
-	IDS_OVERWRITEFILE_TEXT "Skriv <20>ver fil %1?"
-	IDS_OVERWRITEFILE_CAPTION "Bekr<6B>fta fil<69>verskrivning"
-}
-
-/*	columns in the shellview	*/
-STRINGTABLE
-BEGIN
-	IDS_SHV_COLUMN1		"Fil"
-	IDS_SHV_COLUMN2		"Storlek"
-	IDS_SHV_COLUMN3		"Typ"
-	IDS_SHV_COLUMN4		"Modifierad"
-	IDS_SHV_COLUMN5		"Attribut"
-	IDS_SHV_COLUMN6		"Storlek"
-	IDS_SHV_COLUMN7		"Storlek tillg<6C>nglig"
-	IDS_SHV_COLUMN8		"Namn"
-	IDS_SHV_COLUMN9		"Kommentarer"
-END
-
-/* message box strings */
-STRINGTABLE DISCARDABLE
-{
-	IDS_RESTART_TITLE	"Starta om"
-	IDS_RESTART_PROMPT	"Vill du starta om datorn?"
-	IDS_SHUTDOWN_TITLE	"St<53>ng av"
-	IDS_SHUTDOWN_PROMPT	"Vill du st<73>nga av datorn?"
-}
-
-/* shell folder path default values */
-STRINGTABLE DISCARDABLE
-{
-	IDS_PROGRAMS                "Start-meny\\Program"
-	IDS_PERSONAL                "Mina dokument"
-	IDS_FAVORITES               "Favoriter"
-	IDS_STARTUP                 "Start-meny\\Program\\Autostart"
-	IDS_RECENT                  "Tidigare"
-	IDS_SENDTO                  "Skicka till"
-	IDS_STARTMENU               "Start-meny"
-	IDS_MYMUSIC                 "Mina dokument\\Min musik"
-	IDS_MYVIDEO                 "Mina dokument\\Mina videoklipp"
-	IDS_DESKTOPDIRECTORY        "Skrivbord"
-	IDS_NETHOOD                 "N<>tverk"
-	IDS_TEMPLATES               "Mallar"
-	IDS_APPDATA                 "Application Data"
-	IDS_PRINTHOOD               "Skrivare"
-	IDS_LOCAL_APPDATA           "Lokala inst<73>llningar\\Application Data"
-	IDS_INTERNET_CACHE          "Temporary Internet Files"
-	IDS_COOKIES                 "Cookies"
-	IDS_HISTORY                 "Tidigare"
-	IDS_PROGRAM_FILES           "Program"
-	IDS_MYPICTURES              "Mina dokument\\Mina bilder"
-	IDS_PROGRAM_FILES_COMMON    "Program\\Delade filer"
-	IDS_COMMON_DOCUMENTS        "Delade dokument"
-	IDS_ADMINTOOLS              "Start-meny\\Program\\Administrativa verktyg"
-	IDS_COMMON_MUSIC            "Delade dokument\\Min musik"
-	IDS_COMMON_PICTURES         "Delade dokument\\Mina bilder"
-	IDS_COMMON_VIDEO            "Delade dokument\\Mina videoklipp"
-	IDS_CDBURN_AREA             "Lokala inst<73>llningar\\Application Data\\Microsoft\\CD Burning"
-}

lib/smdll/query.c

@@ -1,105 +0,0 @@
-/* $Id$
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            lib/smdll/query.c
- * PURPOSE:         Call SM API SM_API_QUERY_INFORMATION (not in NT)
- */
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <sm/helper.h>
-
-#define NDEBUG
-#include <debug.h>
-
-
-/**********************************************************************
- * NAME							EXPORTED
- *	SmQueryInformation/5
- *
- * DESCRIPTION
- *	Ask the SM to collect some data from its internal data
- *	structures and send it back.
- *
- * ARGUMENTS
- *	hSmApiPort: handle returned by SmConnectApiPort;
- *	SmInformationClass: an SM information class ID:
- *		SM_BASIC_INFORMATION: the number of registered subsystems
- *	Data: pointer to storage for the information to request;
- *	DataLength: length in bytes of the Data buffer; it must be
- *		set and must match the SmInformationClass info size;
- *	ReturnedDataLength: optional pointer to storage to receive
- *		the size of the returnede data.
- *	
- * RETURN VALUE
- * 	STATUS_SUCCESS: OK you get what you asked for;
- * 	STATUS_INFO_LENGTH_MISMATCH: you set DataLength to 0 or to a
- * 		value that does not match whet the SmInformationClass
- * 		requires;
- * 	STATUS_INVALID_PARAMETER_2: bad information class;
- * 	A port error.
- * 	
- */
-NTSTATUS STDCALL
-SmQueryInformation (IN      HANDLE                hSmApiPort,
-		    IN      SM_INFORMATION_CLASS  SmInformationClass,
-		    IN OUT  PVOID                 Data,
-		    IN      ULONG                 DataLength,
-		    IN OUT  PULONG                ReturnedDataLength OPTIONAL)
-{
-	NTSTATUS         Status = STATUS_SUCCESS;
-	SM_PORT_MESSAGE  SmReqMsg;
-
-
-	if(0 == DataLength)
-	{
-		return STATUS_INFO_LENGTH_MISMATCH;
-	}
-	/* Marshal data in the port message */
-	switch (SmInformationClass)
-	{
-		case SmBasicInformation:
-			if(DataLength != sizeof (SM_BASIC_INFORMATION))
-			{
-				return STATUS_INFO_LENGTH_MISMATCH;
-			}
-			SmReqMsg.Request.QryInfo.SmInformationClass = SmBasicInformation;
-			SmReqMsg.Request.QryInfo.DataLength = DataLength;
-			SmReqMsg.Request.QryInfo.BasicInformation.SubSystemCount = 0;
-			break;
-		case SmSubSystemInformation:
-			if(DataLength != sizeof (SM_SUBSYSTEM_INFORMATION))
-			{
-				return STATUS_INFO_LENGTH_MISMATCH;
-			}
-			SmReqMsg.Request.QryInfo.SmInformationClass = SmSubSystemInformation;
-			SmReqMsg.Request.QryInfo.DataLength = DataLength;
-			SmReqMsg.Request.QryInfo.SubSystemInformation.SubSystemId =
-				((PSM_SUBSYSTEM_INFORMATION)Data)->SubSystemId;
-			break;
-		default:
-			return STATUS_INVALID_PARAMETER_2;
-	}
-	/* SM API to invoke */
-	SmReqMsg.SmHeader.ApiIndex = SM_API_QUERY_INFORMATION;
-
-	/* Prepare the port request message */
-	SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE;
-	SmReqMsg.Header.DataSize    = SM_PORT_DATA_SIZE(SmReqMsg.Request);
-	SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE;
-	Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg);
-	if (NT_SUCCESS(Status))
-	{
-		/* Unmarshal data */
-		RtlCopyMemory (Data, & SmReqMsg.Reply.QryInfo.BasicInformation, SmReqMsg.Reply.QryInfo.DataLength);
-		/* Use caller provided storage to store data size */
-		if(NULL != ReturnedDataLength)
-		{
-			*ReturnedDataLength = SmReqMsg.Reply.QryInfo.DataLength;
-		}
-		return SmReqMsg.SmHeader.Status;
-	}
-	DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status);
-	return Status;
-}
-/* EOF */

lib/user32/Sv.rc

@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Swedish (SE) resources
-/*
- * Copyright 2005 David Nordenberg
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialogs
-//
-
-SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
-    WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
-CAPTION "V<>lj f<>nster"
-BEGIN
-  LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
-  PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "&Avbryt", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menus
-//
-
-EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
-{
-  POPUP "DUMMY"
-  BEGIN
-    MENUITEM "&<26>ngra", EM_UNDO
-    MENUITEM SEPARATOR
-    MENUITEM "&Klipp ut", WM_CUT
-    MENUITEM "K&opiera", WM_COPY
-    MENUITEM "K&listra in", WM_PASTE
-    MENUITEM "&Ta bort", WM_CLEAR
-    MENUITEM SEPARATOR
-    MENUITEM "&Markera allt", EM_SETSEL
-  END
-}
-
-
-SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
-{
-  MENUITEM "&<26>terst<73>ll", 61728
-  MENUITEM "&Flytta", 61456
-  MENUITEM "S&torlek", 61440
-  MENUITEM "&Minimera", 61472
-  MENUITEM "Ma&ximera", 61488
-  MENUITEM SEPARATOR
-  MENUITEM "&St<53>ng\tAlt-F4", 61536
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Strings
-//
-
-STRINGTABLE
-{
-  IDS_ERROR,    "Fel"
-  IDS_OK,       "OK"
-  IDS_CANCEL,   "Avbryt"
-  IDS_ABORT,    "&Avbryt"
-  IDS_RETRY,    "&F<>rs<72>k igen"
-  IDS_IGNORE,   "&Ignorera"
-  IDS_YES,      "&Ja"
-  IDS_NO,       "&Nej"
-  IDS_HELP,     "Hj<48>lp"
-  IDS_TRYAGAIN, "&F<>rs<72>k igen"
-  IDS_CONTINUE, "F&orts<74>tt"
-}
-
-STRINGTABLE
-{
-  IDS_MDI_MOREWINDOWS, "&Fler f<>nster..."
-}
-

lib/wininet/Makefile.in

@@ -1,30 +0,0 @@
-EXTRADEFS = -D_WINX32_
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = wininet.dll
-IMPORTS   = mpr shlwapi shell32 user32 advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUNICODE) @SOCKETLIBS@
-
-C_SRCS = \
-	cookie.c \
-	dialogs.c \
-	ftp.c \
-	gopher.c \
-	http.c \
-	internet.c \
-	netconnection.c \
-	urlcache.c \
-	utility.c \
-	wininet_main.c
-
-RC_SRCS = \
-	rsrc.rc \
-	version.rc
-
-SUBDIRS = tests
-
-@MAKE_DLL_RULES@
-
-### Dependencies:

lib/wininet/Makefile.ros-template

@@ -1,21 +0,0 @@
-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = wininet
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a ws2_32.a
-
-TARGET_BASE = $(TARGET_BASE_LIB_WININET)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk

lib/wininet/cookie.c

@@ -1,501 +0,0 @@
-/*
- * Wininet - cookie handling stuff
- *
- * Copyright 2002 TransGaming Technologies Inc.
- *
- * David Hammerton
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-#include "winerror.h"
-
-#include "wine/debug.h"
-#include "internet.h"
-
-#include "wine/list.h"
-
-#define RESPONSE_TIMEOUT        30            /* FROM internet.c */
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-/* FIXME
- *     Cookies are currently memory only.
- *     Cookies are NOT THREAD SAFE
- *     Cookies could use A LOT OF MEMORY. We need some kind of memory management here!
- *     Cookies should care about the expiry time
- */
-
-typedef struct _cookie_domain cookie_domain;
-typedef struct _cookie cookie;
-
-struct _cookie
-{
-    struct list entry;
-
-    struct _cookie_domain *parent;
-
-    LPWSTR lpCookieName;
-    LPWSTR lpCookieData;
-    time_t expiry; /* FIXME: not used */
-};
-
-struct _cookie_domain
-{
-    struct list entry;
-
-    LPWSTR lpCookieDomain;
-    LPWSTR lpCookiePath;
-    struct list cookie_list;
-};
-
-static struct list domain_list = LIST_INIT(domain_list);
-
-static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data);
-static cookie *COOKIE_findCookie(cookie_domain *domain, LPCWSTR lpszCookieName);
-static void COOKIE_deleteCookie(cookie *deadCookie, BOOL deleteDomain);
-static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path);
-static void COOKIE_deleteDomain(cookie_domain *deadDomain);
-
-
-/* adds a cookie to the domain */
-static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data)
-{
-    cookie *newCookie = HeapAlloc(GetProcessHeap(), 0, sizeof(cookie));
-
-    list_init(&newCookie->entry);
-    newCookie->lpCookieName = NULL;
-    newCookie->lpCookieData = NULL;
-
-    if (name)
-    {
-	newCookie->lpCookieName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1)*sizeof(WCHAR));
-        lstrcpyW(newCookie->lpCookieName, name);
-    }
-    if (data)
-    {
-	newCookie->lpCookieData = HeapAlloc(GetProcessHeap(), 0, (strlenW(data) + 1)*sizeof(WCHAR));
-        lstrcpyW(newCookie->lpCookieData, data);
-    }
-
-    TRACE("added cookie %p (data is %s)\n", newCookie, debugstr_w(data) );
-
-    list_add_tail(&domain->cookie_list, &newCookie->entry);
-    newCookie->parent = domain;
-    return newCookie;
-}
-
-
-/* finds a cookie in the domain matching the cookie name */
-static cookie *COOKIE_findCookie(cookie_domain *domain, LPCWSTR lpszCookieName)
-{
-    struct list * cursor;
-    TRACE("(%p, %s)\n", domain, debugstr_w(lpszCookieName));
-
-    LIST_FOR_EACH(cursor, &domain->cookie_list)
-    {
-        cookie *searchCookie = LIST_ENTRY(cursor, cookie, entry);
-	BOOL candidate = TRUE;
-	if (candidate && lpszCookieName)
-	{
-	    if (candidate && !searchCookie->lpCookieName)
-		candidate = FALSE;
-	    if (candidate && strcmpW(lpszCookieName, searchCookie->lpCookieName) != 0)
-                candidate = FALSE;
-	}
-	if (candidate)
-	    return searchCookie;
-    }
-    return NULL;
-}
-
-/* removes a cookie from the list, if its the last cookie we also remove the domain */
-static void COOKIE_deleteCookie(cookie *deadCookie, BOOL deleteDomain)
-{
-    HeapFree(GetProcessHeap(), 0, deadCookie->lpCookieName);
-    HeapFree(GetProcessHeap(), 0, deadCookie->lpCookieData);
-    list_remove(&deadCookie->entry);
-
-    /* special case: last cookie, lets remove the domain to save memory */
-    if (list_empty(&deadCookie->parent->cookie_list) && deleteDomain)
-        COOKIE_deleteDomain(deadCookie->parent);
-    HeapFree(GetProcessHeap(), 0, deadCookie);
-}
-
-/* allocates a domain and adds it to the end */
-static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path)
-{
-    cookie_domain *newDomain = HeapAlloc(GetProcessHeap(), 0, sizeof(cookie_domain));
-
-    list_init(&newDomain->entry);
-    list_init(&newDomain->cookie_list);
-    newDomain->lpCookieDomain = NULL;
-    newDomain->lpCookiePath = NULL;
-
-    if (domain)
-    {
-	newDomain->lpCookieDomain = HeapAlloc(GetProcessHeap(), 0, (strlenW(domain) + 1)*sizeof(WCHAR));
-        strcpyW(newDomain->lpCookieDomain, domain);
-    }
-    if (path)
-    {
-	newDomain->lpCookiePath = HeapAlloc(GetProcessHeap(), 0, (strlenW(path) + 1)*sizeof(WCHAR));
-        lstrcpyW(newDomain->lpCookiePath, path);
-    }
-
-    list_add_tail(&domain_list, &newDomain->entry);
-
-    TRACE("Adding domain: %p\n", newDomain);
-    return newDomain;
-}
-
-static void COOKIE_crackUrlSimple(LPCWSTR lpszUrl, LPWSTR hostName, int hostNameLen, LPWSTR path, int pathLen)
-{
-    URL_COMPONENTSW UrlComponents;
-
-    UrlComponents.lpszExtraInfo = NULL;
-    UrlComponents.lpszPassword = NULL;
-    UrlComponents.lpszScheme = NULL;
-    UrlComponents.lpszUrlPath = path;
-    UrlComponents.lpszUserName = NULL;
-    UrlComponents.lpszHostName = hostName;
-    UrlComponents.dwHostNameLength = hostNameLen;
-    UrlComponents.dwUrlPathLength = pathLen;
-
-    InternetCrackUrlW(lpszUrl, 0, 0, &UrlComponents);
-}
-
-/* match a domain. domain must match if the domain is not NULL. path must match if the path is not NULL */
-static BOOL COOKIE_matchDomain(LPCWSTR lpszCookieDomain, LPCWSTR lpszCookiePath,
-                               cookie_domain *searchDomain, BOOL allow_partial)
-{
-    TRACE("searching on domain %p\n", searchDomain);
-	if (lpszCookieDomain)
-	{
-	    if (!searchDomain->lpCookieDomain)
-            return FALSE;
-
-	    TRACE("comparing domain %s with %s\n", 
-            debugstr_w(lpszCookieDomain), 
-            debugstr_w(searchDomain->lpCookieDomain));
-
-        if (allow_partial && !strstrW(lpszCookieDomain, searchDomain->lpCookieDomain))
-            return FALSE;
-        else if (!allow_partial && lstrcmpW(lpszCookieDomain, searchDomain->lpCookieDomain) != 0)
-            return FALSE;
- 	}
-    if (lpszCookiePath)
-    {
-        TRACE("comparing paths: %s with %s\n", debugstr_w(lpszCookiePath), debugstr_w(searchDomain->lpCookiePath));
-        if (!searchDomain->lpCookiePath)
-            return FALSE;
-        if (strcmpW(lpszCookiePath, searchDomain->lpCookiePath))
-            return FALSE;
-	}
-	return TRUE;
-}
-
-/* remove a domain from the list and delete it */
-static void COOKIE_deleteDomain(cookie_domain *deadDomain)
-{
-    struct list * cursor;
-    while ((cursor = list_tail(&deadDomain->cookie_list)))
-    {
-        COOKIE_deleteCookie(LIST_ENTRY(cursor, cookie, entry), FALSE);
-        list_remove(cursor);
-    }
-
-    HeapFree(GetProcessHeap(), 0, deadDomain->lpCookieDomain);
-    HeapFree(GetProcessHeap(), 0, deadDomain->lpCookiePath);
-
-    list_remove(&deadDomain->entry);
-
-    HeapFree(GetProcessHeap(), 0, deadDomain);
-}
-
-/***********************************************************************
- *           InternetGetCookieW (WININET.@)
- *
- * Retrieve cookie from the specified url
- *
- *  It should be noted that on windows the lpszCookieName parameter is "not implemented".
- *    So it won't be implemented here.
- *
- * RETURNS
- *    TRUE  on success
- *    FALSE on failure
- *
- */
-BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
-    LPWSTR lpCookieData, LPDWORD lpdwSize)
-{
-    struct list * cursor;
-    int cnt = 0, domain_count = 0;
-    int cookie_count = 0;
-    WCHAR hostName[2048], path[2048];
-
-    TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName),
-	  lpCookieData, lpdwSize);
-
-    COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0]));
-
-    LIST_FOR_EACH(cursor, &domain_list)
-    {
-        cookie_domain *cookiesDomain = LIST_ENTRY(cursor, cookie_domain, entry);
-        if (COOKIE_matchDomain(hostName, NULL /* FIXME: path */, cookiesDomain, TRUE))
-        {
-            struct list * cursor;
-            domain_count++;
-            TRACE("found domain %p\n", cookiesDomain);
-    
-            LIST_FOR_EACH(cursor, &cookiesDomain->cookie_list)
-            {
-                cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry);
-                if (lpCookieData == NULL) /* return the size of the buffer required to lpdwSize */
-                {
-                    if (cookie_count != 0)
-                        cnt += 2; /* '; ' */
-                    cnt += strlenW(thisCookie->lpCookieName);
-                    cnt += 1; /* = */
-                    cnt += strlenW(thisCookie->lpCookieData);
-                }
-                else
-                {
-                    static const WCHAR szsc[] = { ';',' ',0 };
-                    static const WCHAR szpseq[] = { '%','s','=','%','s',0 };
-                    if (cookie_count != 0)
-                        cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szsc);
-                    cnt += snprintfW(lpCookieData + cnt, *lpdwSize - cnt, szpseq,
-                                    thisCookie->lpCookieName,
-                                    thisCookie->lpCookieData);
-                    TRACE("Cookie: %s=%s\n", debugstr_w(thisCookie->lpCookieName), debugstr_w(thisCookie->lpCookieData));
-                }
-                cookie_count++;
-            }
-        }
-    }
-    if (lpCookieData == NULL)
-    {
-	cnt += 1; /* NULL */
-	*lpdwSize = cnt*sizeof(WCHAR);
-	TRACE("returning\n");
-	return TRUE;
-    }
-
-    if (!domain_count)
-        return FALSE;
-
-    *lpdwSize = (cnt + 1)*sizeof(WCHAR);
-
-    TRACE("Returning %i (from %i domains): %s\n", cnt, domain_count,
-           debugstr_w(lpCookieData));
-
-    return (cnt ? TRUE : FALSE);
-}
-
-
-/***********************************************************************
- *           InternetGetCookieA (WININET.@)
- *
- * Retrieve cookie from the specified url
- *
- * RETURNS
- *    TRUE  on success
- *    FALSE on failure
- *
- */
-BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
-    LPSTR lpCookieData, LPDWORD lpdwSize)
-{
-    DWORD len;
-    LPWSTR szCookieData = NULL, szUrl = NULL, szCookieName = NULL;
-    BOOL r;
-
-    TRACE("(%s,%s,%p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName),
-        lpCookieData);
-
-    if( lpszUrl )
-    {
-        len = MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, NULL, 0 );
-        szUrl = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, szUrl, len );
-    }
-
-    if( lpszCookieName )
-    {
-        len = MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, NULL, 0 );
-        szCookieName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, szCookieName, len );
-    }
-
-    r = InternetGetCookieW( szUrl, szCookieName, NULL, &len );
-    if( r )
-    {
-        szCookieData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        if( !szCookieData )
-            return FALSE;
-
-        r = InternetGetCookieW( szUrl, szCookieName, szCookieData, &len );
-
-        *lpdwSize = WideCharToMultiByte( CP_ACP, 0, szCookieData, len,
-                                lpCookieData, *lpdwSize, NULL, NULL );
-    }
-
-    HeapFree( GetProcessHeap(), 0, szCookieData );
-    HeapFree( GetProcessHeap(), 0, szCookieName );
-    HeapFree( GetProcessHeap(), 0, szUrl );
-
-    return r;
-}
-
-
-/***********************************************************************
- *           InternetSetCookieW (WININET.@)
- *
- * Sets cookie for the specified url
- *
- * RETURNS
- *    TRUE  on success
- *    FALSE on failure
- *
- */
-BOOL WINAPI InternetSetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName,
-    LPCWSTR lpCookieData)
-{
-    cookie_domain *thisCookieDomain = NULL;
-    cookie *thisCookie;
-    WCHAR hostName[2048], path[2048];
-    struct list * cursor;
-
-    TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl),
-        debugstr_w(lpszCookieName), debugstr_w(lpCookieData));
-
-    if (!lpCookieData || !strlenW(lpCookieData))
-    {
-        TRACE("no cookie data, not adding\n");
-	return FALSE;
-    }
-    if (!lpszCookieName)
-    {
-	/* some apps (or is it us??) try to add a cookie with no cookie name, but
-         * the cookie data in the form of name=data. */
-	/* FIXME, probably a bug here, for now I don't care */
-	WCHAR *ourCookieName, *ourCookieData;
-	int ourCookieNameSize;
-        BOOL ret;
-
-	if (!(ourCookieData = strchrW(lpCookieData, '=')))
-	{
-            TRACE("something terribly wrong with cookie data %s\n", 
-                   debugstr_w(ourCookieData));
-	    return FALSE;
-	}
-	ourCookieNameSize = ourCookieData - lpCookieData;
-	ourCookieData += 1;
-	ourCookieName = HeapAlloc(GetProcessHeap(), 0, 
-                              (ourCookieNameSize + 1)*sizeof(WCHAR));
-	memcpy(ourCookieName, ourCookieData, ourCookieNameSize * sizeof(WCHAR));
-	ourCookieName[ourCookieNameSize] = '\0';
-	TRACE("setting (hacked) cookie of %s, %s\n",
-               debugstr_w(ourCookieName), debugstr_w(ourCookieData));
-        ret = InternetSetCookieW(lpszUrl, ourCookieName, ourCookieData);
-	HeapFree(GetProcessHeap(), 0, ourCookieName);
-        return ret;
-    }
-
-    COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0]));
-
-    LIST_FOR_EACH(cursor, &domain_list)
-    {
-        thisCookieDomain = LIST_ENTRY(cursor, cookie_domain, entry);
-        if (COOKIE_matchDomain(hostName, NULL /* FIXME: path */, thisCookieDomain, FALSE))
-            break;
-        thisCookieDomain = NULL;
-    }
-    if (!thisCookieDomain)
-        thisCookieDomain = COOKIE_addDomain(hostName, path);
-
-    if ((thisCookie = COOKIE_findCookie(thisCookieDomain, lpszCookieName)))
-	COOKIE_deleteCookie(thisCookie, FALSE);
-
-    thisCookie = COOKIE_addCookie(thisCookieDomain, lpszCookieName, lpCookieData);
-    return TRUE;
-}
-
-
-/***********************************************************************
- *           InternetSetCookieA (WININET.@)
- *
- * Sets cookie for the specified url
- *
- * RETURNS
- *    TRUE  on success
- *    FALSE on failure
- *
- */
-BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
-    LPCSTR lpCookieData)
-{
-    DWORD len;
-    LPWSTR szCookieData = NULL, szUrl = NULL, szCookieName = NULL;
-    BOOL r;
-
-    TRACE("(%s,%s,%s)\n", debugstr_a(lpszUrl),
-        debugstr_a(lpszCookieName), debugstr_a(lpCookieData));
-
-    if( lpszUrl )
-    {
-        len = MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, NULL, 0 );
-        szUrl = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        MultiByteToWideChar( CP_ACP, 0, lpszUrl, -1, szUrl, len );
-    }
-
-    if( lpszCookieName )
-    {
-        len = MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, NULL, 0 );
-        szCookieName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        MultiByteToWideChar( CP_ACP, 0, lpszCookieName, -1, szCookieName, len );
-    }
-
-    if( lpCookieData )
-    {
-        len = MultiByteToWideChar( CP_ACP, 0, lpCookieData, -1, NULL, 0 );
-        szCookieData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-        MultiByteToWideChar( CP_ACP, 0, lpCookieData, -1, szCookieData, len );
-    }
-
-    r = InternetSetCookieW( szUrl, szCookieName, szCookieData );
-
-    HeapFree( GetProcessHeap(), 0, szCookieData );
-    HeapFree( GetProcessHeap(), 0, szCookieName );
-    HeapFree( GetProcessHeap(), 0, szUrl );
-
-    return r;
-}

lib/wininet/dialogs.c

@@ -1,388 +0,0 @@
-/*
- * Wininet
- *
- * Copyright 2003 Mike McCormack for CodeWeavers Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "wininet.h"
-#include "winnetwk.h"
-#include "winnls.h"
-#include "wine/debug.h"
-#include "winerror.h"
-#define NO_SHLWAPI_STREAM
-#include "shlwapi.h"
-
-#include "internet.h"
-
-#include "wine/unicode.h"
-
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-struct WININET_ErrorDlgParams
-{
-    HWND       hWnd;
-    HINTERNET  hRequest;
-    DWORD      dwError;
-    DWORD      dwFlags;
-    LPVOID*    lppvData;
-};
-
-/***********************************************************************
- *         WININET_GetProxyServer
- *
- *  Determine the name of the proxy server the request is using
- */
-static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz )
-{
-    LPWININETHTTPREQW lpwhr;
-    LPWININETHTTPSESSIONW lpwhs = NULL;
-    LPWININETAPPINFOW hIC = NULL;
-    LPWSTR p;
-
-    lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest );
-    if (NULL == lpwhr)
-	return FALSE;
-
-    lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
-    if (NULL == lpwhs)
-	return FALSE;
-
-    hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
-    if (NULL == hIC)
-	return FALSE;
-
-    lstrcpynW(szBuf, hIC->lpszProxy, sz);
-
-    /* FIXME: perhaps it would be better to use InternetCrackUrl here */
-    p = strchrW(szBuf, ':');
-    if(*p)
-        *p = 0;
-
-    return TRUE;
-}
-
-/***********************************************************************
- *         WININET_GetAuthRealm
- *
- *  Determine the name of the (basic) Authentication realm
- */
-static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz )
-{
-    LPWSTR p, q;
-    DWORD index;
-    static const WCHAR szRealm[] = { 'r','e','a','l','m','=',0 };
-
-    /* extract the Realm from the proxy response and show it */
-    index = 0;
-    if( !HttpQueryInfoW( hRequest, HTTP_QUERY_PROXY_AUTHENTICATE,
-                         szBuf, &sz, &index) )
-        return FALSE;
-
-    /*
-     * FIXME: maybe we should check that we're
-     * dealing with 'Basic' Authentication
-     */
-    p = strchrW( szBuf, ' ' );
-    if( p && !strncmpW( p+1, szRealm, strlenW(szRealm) ) )
-    {
-        /* remove quotes */
-        p += 7;
-        if( *p == '"' )
-        {
-            p++;
-            q = strrchrW( p, '"' );
-            if( q )
-                *q = 0;
-        }
-    }
-
-    strcpyW( szBuf, p );
-
-    return TRUE;
-}
-
-/***********************************************************************
- *         WININET_GetSetPassword
- */
-static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, 
-                                    LPCWSTR szRealm, BOOL bSet )
-{
-    WCHAR szResource[0x80], szUserPass[0x40];
-    LPWSTR p;
-    HWND hUserItem, hPassItem;
-    DWORD r, dwMagic = 19;
-    UINT r_len, u_len;
-    WORD sz;
-    static const WCHAR szColon[] = { ':',0 };
-    static const WCHAR szbs[] = { '/', 0 };
-
-    hUserItem = GetDlgItem( hdlg, IDC_USERNAME );
-    hPassItem = GetDlgItem( hdlg, IDC_PASSWORD );
-
-    /* now try fetch the username and password */
-    lstrcpyW( szResource, szServer);
-    lstrcatW( szResource, szbs);
-    lstrcatW( szResource, szRealm);
-
-    /*
-     * WNetCachePassword is only concerned with the length
-     * of the data stored (which we tell it) and it does
-     * not use strlen() internally so we can add WCHAR data
-     * instead of ASCII data and get it back the same way.
-     */
-    if( bSet )
-    {
-#ifndef __REACTOS__
-        szUserPass[0] = 0;
-        GetWindowTextW( hUserItem, szUserPass, 
-                        (sizeof szUserPass-1)/sizeof(WCHAR) );
-        lstrcatW(szUserPass, szColon);
-        u_len = strlenW( szUserPass );
-        GetWindowTextW( hPassItem, szUserPass+u_len, 
-                        (sizeof szUserPass)/sizeof(WCHAR)-u_len );
-
-        r_len = (strlenW( szResource ) + 1)*sizeof(WCHAR);
-        u_len = (strlenW( szUserPass ) + 1)*sizeof(WCHAR);
-        r = WNetCachePassword( (CHAR*)szResource, r_len,
-                               (CHAR*)szUserPass, u_len, dwMagic, 0 );
-
-        return ( r == WN_SUCCESS );
-#else
-	return FALSE;
-#endif
-    }
-
-    sz = sizeof szUserPass;
-    r_len = (strlenW( szResource ) + 1)*sizeof(WCHAR);
-//    r = WNetGetCachedPassword( (CHAR*)szResource, r_len,
-//                               (CHAR*)szUserPass, &sz, dwMagic );
-//    if( r != WN_SUCCESS )
-//        return FALSE;
-
-    p = strchrW( szUserPass, ':' );
-    if( p )
-    {
-        *p = 0;
-        SetWindowTextW( hUserItem, szUserPass );
-        SetWindowTextW( hPassItem, p+1 );
-    }
-
-    return TRUE;
-}
-
-/***********************************************************************
- *         WININET_SetProxyAuthorization
- */
-static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest,
-                                         LPWSTR username, LPWSTR password )
-{
-    LPWININETHTTPREQW lpwhr;
-    LPWININETHTTPSESSIONW lpwhs;
-    LPWININETAPPINFOW hIC;
-    LPWSTR p;
-
-    lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest );
-    if( !lpwhr )
-	return FALSE;
-        
-    lpwhs = (LPWININETHTTPSESSIONW) lpwhr->hdr.lpwhparent;
-    if (NULL == lpwhs ||  lpwhs->hdr.htype != WH_HHTTPSESSION)
-    {
-        INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
-	return FALSE;
-    }
-
-    hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent;
-
-    p = HeapAlloc( GetProcessHeap(), 0, (strlenW( username ) + 1)*sizeof(WCHAR) );
-    if( !p )
-        return FALSE;
-    
-    lstrcpyW( p, username );
-    hIC->lpszProxyUsername = p;
-
-    p = HeapAlloc( GetProcessHeap(), 0, (strlenW( password ) + 1)*sizeof(WCHAR) );
-    if( !p )
-        return FALSE;
-    
-    lstrcpyW( p, password );
-    hIC->lpszProxyPassword = p;
-
-    return TRUE;
-}
-
-/***********************************************************************
- *         WININET_ProxyPasswordDialog
- */
-static INT_PTR WINAPI WININET_ProxyPasswordDialog(
-    HWND hdlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
-{
-    HWND hitem;
-    struct WININET_ErrorDlgParams *params;
-    WCHAR szRealm[0x80], szServer[0x80];
-
-    if( uMsg == WM_INITDIALOG )
-    {
-        TRACE("WM_INITDIALOG (%08lx)\n", lParam);
-
-        /* save the parameter list */
-        params = (struct WININET_ErrorDlgParams*) lParam;
-        SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam );
-
-        /* extract the Realm from the proxy response and show it */
-        if( WININET_GetAuthRealm( params->hRequest,
-                                  szRealm, sizeof szRealm/sizeof(WCHAR)) )
-        {
-            hitem = GetDlgItem( hdlg, IDC_REALM );
-            SetWindowTextW( hitem, szRealm );
-        }
-
-        /* extract the name of the proxy server */
-        if( WININET_GetProxyServer( params->hRequest, 
-                                    szServer, sizeof szServer/sizeof(WCHAR)) )
-        {
-            hitem = GetDlgItem( hdlg, IDC_PROXY );
-            SetWindowTextW( hitem, szServer );
-        }
-
-        WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE );
-
-        return TRUE;
-    }
-
-    params = (struct WININET_ErrorDlgParams*)
-                 GetWindowLongPtrW( hdlg, GWLP_USERDATA );
-
-    switch( uMsg )
-    {
-    case WM_COMMAND:
-        if( wParam == IDOK )
-        {
-            WCHAR username[0x20], password[0x20];
-
-            username[0] = 0;
-            hitem = GetDlgItem( hdlg, IDC_USERNAME );
-            if( hitem )
-                GetWindowTextW( hitem, username, sizeof username/sizeof(WCHAR) );
-            
-            password[0] = 0;
-            hitem = GetDlgItem( hdlg, IDC_PASSWORD );
-            if( hitem )
-                GetWindowTextW( hitem, password, sizeof password/sizeof(WCHAR) );
-
-            hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD );
-            if( hitem &&
-                SendMessageW( hitem, BM_GETSTATE, 0, 0 ) &&
-                WININET_GetAuthRealm( params->hRequest,
-                                  szRealm, sizeof szRealm/sizeof(WCHAR)) &&
-                WININET_GetProxyServer( params->hRequest, 
-                                    szServer, sizeof szServer/sizeof(WCHAR)) )
-            {
-                WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE );
-            }
-            WININET_SetProxyAuthorization( params->hRequest, username, password );
-
-            EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY );
-            return TRUE;
-        }
-        if( wParam == IDCANCEL )
-        {
-            EndDialog( hdlg, 0 );
-            return TRUE;
-        }
-        break;
-    }
-    return FALSE;
-}
-
-/***********************************************************************
- *         WININET_GetConnectionStatus
- */
-static INT WININET_GetConnectionStatus( HINTERNET hRequest )
-{
-    WCHAR szStatus[0x20];
-    DWORD sz, index, dwStatus;
-
-    TRACE("%p\n", hRequest );
-
-    sz = sizeof szStatus;
-    index = 0;
-    if( !HttpQueryInfoW( hRequest, HTTP_QUERY_STATUS_CODE,
-                    szStatus, &sz, &index))
-        return -1;
-    dwStatus = atoiW( szStatus );
-
-    TRACE("request %p status = %ld\n", hRequest, dwStatus );
-
-    return dwStatus;
-}
-
-
-/***********************************************************************
- *         InternetErrorDlg
- */
-DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
-                 DWORD dwError, DWORD dwFlags, LPVOID* lppvData)
-{
-    struct WININET_ErrorDlgParams params;
-    HMODULE hwininet = GetModuleHandleA( "wininet.dll" );
-    INT dwStatus;
-
-    TRACE("%p %p %ld %08lx %p\n", hWnd, hRequest, dwError, dwFlags, lppvData);
-
-    params.hWnd = hWnd;
-    params.hRequest = hRequest;
-    params.dwError = dwError;
-    params.dwFlags = dwFlags;
-    params.lppvData = lppvData;
-
-    switch( dwError )
-    {
-    case ERROR_SUCCESS:
-        if( !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) )
-            return 0;
-        dwStatus = WININET_GetConnectionStatus( hRequest );
-        if( HTTP_STATUS_PROXY_AUTH_REQ != dwStatus )
-            return ERROR_SUCCESS;
-        return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ),
-                    hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params );
-
-    case ERROR_INTERNET_INCORRECT_PASSWORD:
-        return DialogBoxParamW( hwininet, MAKEINTRESOURCEW( IDD_PROXYDLG ),
-                    hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params );
-
-    case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR:
-    case ERROR_INTERNET_INVALID_CA:
-    case ERROR_INTERNET_POST_IS_NON_SECURE:
-    case ERROR_INTERNET_SEC_CERT_CN_INVALID:
-    case ERROR_INTERNET_SEC_CERT_DATE_INVALID:
-        FIXME("Need to display dialog for error %ld\n", dwError);
-        return ERROR_SUCCESS;
-    }
-    return ERROR_INVALID_PARAMETER;
-}

lib/wininet/gopher.c

@@ -1,256 +0,0 @@
-/*
- * WININET - Gopher implementation
- *
- * Copyright 2003 Kirill Smelkov
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-/***********************************************************************
- *           GopherCreateLocatorA (WININET.@)
- *
- * Create a Gopher locator string from its component parts
- *
- * PARAMS
- *  lpszHost            [I] host name
- *  nServerPort         [I] port in host byteorder or INTERNET_INVALID_PORT_NUMBER for default
- *  lpszDisplayString   [I] document/directory to display (NULL - default directory)
- *  lpszSelectorString  [I] selector string for server (NULL - none)
- *  dwGopherType        [I] selector type (see GOPHER_TYPE_xxx)
- *  lpszLocator         [O] buffer for locator string
- *  lpdwBufferLength    [I] locator buffer length
- *
- * RETURNS
- *  TRUE  on success
- *  FALSE on failure
- *
- */
-BOOL WINAPI GopherCreateLocatorA(
- LPCSTR        lpszHost,
- INTERNET_PORT nServerPort,
- LPCSTR        lpszDisplayString,
- LPCSTR        lpszSelectorString,
- DWORD         dwGopherType,
- LPSTR         lpszLocator,
- LPDWORD       lpdwBufferLength
-)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherCreateLocatorW (WININET.@)
- * 
- * Unicode version of GopherCreateLocatorA
- */
-BOOL WINAPI GopherCreateLocatorW(
- LPCWSTR       lpszHost,
- INTERNET_PORT nServerPort,
- LPCWSTR       lpszDisplayString,
- LPCWSTR       lpszSelectorString,
- DWORD         dwHopherType,
- LPWSTR        lpszLocator,
- LPDWORD       lpdwBufferLength
-)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherFindFirstFileA (WININET.@)
- *
- * Create a session and locate the requested documents
- *
- * PARAMS
- *  hConnect        [I] Handle to a Gopher session returned by InternetConnect
- *  lpszLocator     [I] - address of a string containing the name of the item to locate.
- *                      - Locator created by the GopherCreateLocator function.
- * lpszSearchString [I] what to search for if this request is to an index server.
- *                      Otherwise, this parameter should be NULL.
- * lpFindData       [O] retrived information
- * dwFlags          [I] INTERNET_FLAG_{HYPERLINK, NEED_FILE, NO_CACHE_WRITE, RELOAD, RESYNCHRONIZE}
- * dwContext        [I] application private value
- *
- * RETURNS
- *  HINTERNET handle on success
- *  NULL on error
- */
-HINTERNET WINAPI GopherFindFirstFileA(
- HINTERNET hConnect,
- LPCSTR    lpszLocator,
- LPCSTR    lpszSearchString,
- LPGOPHER_FIND_DATAA
-           lpFindData,
- DWORD     dwFlags,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return NULL;
-}
-
-/***********************************************************************
- *           GopherFindFirstFileW (WININET.@)
- *
- * Unicode version of GopherFindFirstFileA
- */
-HINTERNET WINAPI GopherFindFirstFileW(
- HINTERNET hConnect,
- LPCWSTR   lpszLocator,
- LPCWSTR   lpszSearchString,
- LPGOPHER_FIND_DATAW
-           lpFindData,
- DWORD     dwFlags,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return NULL;
-}
-
-/***********************************************************************
- *           GopherGetAttributeA (WININET.@)
- *
- * Retrieves the specific attribute information from the server.
- * 
- * RETURNS
- *  TRUE on success
- *  FALSE on failure
- */
-BOOL WINAPI GopherGetAttributeA(
- HINTERNET hConnect,
- LPCSTR    lpszLocator,
- LPCSTR    lpszAttributeName,
- LPBYTE    lpBuffer,
- DWORD     dwBufferLength,
- LPDWORD   lpdwCharactersReturned,
- GOPHER_ATTRIBUTE_ENUMERATORA
-           lpfnEnumerator,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherGetAttributeW (WININET.@)
- *
- * Unicode version of GopherGetAttributeA
- */
-BOOL WINAPI GopherGetAttributeW(
- HINTERNET hConnect,
- LPCWSTR   lpszLocator,
- LPCWSTR   lpszAttributeName,
- LPBYTE    lpBuffer,
- DWORD     dwBufferLength,
- LPDWORD   lpdwCharactersReturned,
- GOPHER_ATTRIBUTE_ENUMERATORW
-           lpfnEnumerator,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherGetLocatorTypeA (WININET.@)
- *
- * Parses a Gopher locator and determines its attributes.
- *
- * PARAMS
- *  lpszLocator     [I] Address of the Gopher locator string to parse
- *  lpdwGopherType  [O] destination for bitmasked type of locator
- *
- * RETURNS
- *  TRUE  on success
- *  FALSE on failure
- */
-BOOL WINAPI GopherGetLocatorTypeA(LPCSTR lpszLocator, LPDWORD lpdwGopherType)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherGetLocatorTypeW (WININET.@)
- *
- * Unicode version of GopherGetLocatorTypeA
- */
-BOOL WINAPI GopherGetLocatorTypeW(LPCWSTR lpszLocator, LPDWORD lpdwGopherType)
-{
-    FIXME("stub\n");
-    return FALSE;
-}
-
-/***********************************************************************
- *           GopherOpenFileA (WININET.@)
- *
- * Begins reading a Gopher data file from a Gopher server.
- *
- * PARAMS
- *  hConnect    [I] handle to a Gopher session
- *  lpszLocator [I] file locator
- *  lpszView    [I] file view (or default if NULL)
- *  dwFlags     [I] INTERNET_FLAG_{HYPERLINK, NEED_FILE, NO_CACHE_WRITE, RELOAD, RESYNCHRONIZE}
- *  dwContext   [I] application private value
- *
- * RETURNS
- *  handle  on success
- *  NULL    on error
- */
-HINTERNET WINAPI GopherOpenFileA(
- HINTERNET hConnect,
- LPCSTR    lpszLocator,
- LPCSTR    lpszView,
- DWORD     dwFlags,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return NULL;
-}
-
-/***********************************************************************
- *           GopherOpenFileW (WININET.@)
- *
- * Unicode version of GopherOpenFileA
- */
-HINTERNET WINAPI GopherOpenFileW(
- HINTERNET hConnect,
- LPCWSTR   lpszLocator,
- LPCWSTR   lpszView,
- DWORD     dwFlags,
- DWORD     dwContext
-)
-{
-    FIXME("stub\n");
-    return NULL;
-}

lib/wininet/internet.h

@@ -1,483 +0,0 @@
-/*
- * Wininet
- *
- * Copyright 1999 Corel Corporation
- *
- * Ulrich Czekalla
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _WINE_INTERNET_H_
-#define _WINE_INTERNET_H_
-
-#include "wine/unicode.h"
-
-#include <time.h>
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <sys/types.h>
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_OPENSSL_SSL_H
-#define DSA __ssl_DSA  /* avoid conflict with commctrl.h */
-#undef FAR
-# include <openssl/ssl.h>
-#undef FAR
-#define FAR do_not_use_this_in_wine
-#undef DSA
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include "winsock2.h"
-#ifndef MSG_WAITALL
-#define MSG_WAITALL 0
-#endif
-#else
-#define closesocket close
-#endif /* __MINGW32__ */
-
-/* used for netconnection.c stuff */
-typedef struct
-{
-    BOOL useSSL;
-    int socketFD;
-#ifdef HAVE_OPENSSL_SSL_H
-    SSL *ssl_s;
-    int ssl_sock;
-#endif
-} WININET_NETCONNECTION;
-
-inline static LPSTR WININET_strdup( LPCSTR str )
-{
-    LPSTR ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 );
-    if (ret) strcpy( ret, str );
-    return ret;
-}
-
-inline static LPWSTR WININET_strdupW( LPCWSTR str )
-{
-    LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1)*sizeof(WCHAR) );
-    if (ret) strcpyW( ret, str );
-    return ret;
-}
-
-inline static LPWSTR WININET_strdup_AtoW( LPCSTR str )
-{
-    int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0);
-    LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-    if (ret)
-        MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len);
-    return ret;
-}
-
-inline static LPSTR WININET_strdup_WtoA( LPCWSTR str )
-{
-    int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL);
-    LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len );
-    if (ret)
-        WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL);
-    return ret;
-}
-
-inline static void WININET_find_data_WtoA(LPWIN32_FIND_DATAW dataW, LPWIN32_FIND_DATAA dataA)
-{
-    dataA->dwFileAttributes = dataW->dwFileAttributes;
-    dataA->ftCreationTime   = dataW->ftCreationTime;
-    dataA->ftLastAccessTime = dataW->ftLastAccessTime;
-    dataA->ftLastWriteTime  = dataW->ftLastWriteTime;
-    dataA->nFileSizeHigh    = dataW->nFileSizeHigh;
-    dataA->nFileSizeLow     = dataW->nFileSizeLow;
-    dataA->dwReserved0      = dataW->dwReserved0;
-    dataA->dwReserved1      = dataW->dwReserved1;
-    WideCharToMultiByte(CP_ACP, 0, dataW->cFileName, -1, 
-        dataA->cFileName, sizeof(dataA->cFileName),
-        NULL, NULL);
-    WideCharToMultiByte(CP_ACP, 0, dataW->cAlternateFileName, -1, 
-        dataA->cAlternateFileName, sizeof(dataA->cAlternateFileName),
-        NULL, NULL);
-}
-
-typedef enum
-{
-    WH_HINIT = INTERNET_HANDLE_TYPE_INTERNET,
-    WH_HFTPSESSION = INTERNET_HANDLE_TYPE_CONNECT_FTP,
-    WH_HGOPHERSESSION = INTERNET_HANDLE_TYPE_CONNECT_GOPHER,
-    WH_HHTTPSESSION = INTERNET_HANDLE_TYPE_CONNECT_HTTP,
-    WH_HFILE = INTERNET_HANDLE_TYPE_FTP_FILE,
-    WH_HFINDNEXT = INTERNET_HANDLE_TYPE_FTP_FIND,
-    WH_HHTTPREQ = INTERNET_HANDLE_TYPE_HTTP_REQUEST,
-} WH_TYPE;
-
-#define INET_OPENURL 0x0001
-#define INET_CALLBACKW 0x0002
-
-struct _WININETHANDLEHEADER;
-typedef struct _WININETHANDLEHEADER WININETHANDLEHEADER, *LPWININETHANDLEHEADER;
-
-typedef void (*WININET_object_destructor)( LPWININETHANDLEHEADER );
-
-struct _WININETHANDLEHEADER
-{
-    WH_TYPE htype;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-    DWORD  dwError;
-    DWORD  dwInternalFlags;
-    DWORD  dwRefCount;
-    WININET_object_destructor destroy;
-    INTERNET_STATUS_CALLBACK lpfnStatusCB;
-    struct _WININETHANDLEHEADER *lpwhparent;
-};
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    LPWSTR  lpszAgent;
-    LPWSTR  lpszProxy;
-    LPWSTR  lpszProxyBypass;
-    LPWSTR  lpszProxyUsername;
-    LPWSTR  lpszProxyPassword;
-    DWORD   dwAccessType;
-} WININETAPPINFOW, *LPWININETAPPINFOW;
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    LPWSTR  lpszServerName;
-    LPWSTR  lpszUserName;
-    INTERNET_PORT nServerPort;
-    struct sockaddr_in socketAddress;
-    struct hostent *phostent;
-} WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW;
-
-#define HDR_ISREQUEST		0x0001
-#define HDR_COMMADELIMITED	0x0002
-#define HDR_SEMIDELIMITED	0x0004
-
-typedef struct
-{
-    LPWSTR lpszField;
-    LPWSTR lpszValue;
-    WORD wFlags;
-    WORD wCount;
-} HTTPHEADERW, *LPHTTPHEADERW;
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    LPWSTR lpszPath;
-    LPWSTR lpszVerb;
-    LPWSTR lpszRawHeaders;
-    WININET_NETCONNECTION netConnection;
-    HTTPHEADERW StdHeaders[HTTP_QUERY_MAX+1];
-    HTTPHEADERW *pCustHeaders;
-    DWORD nCustHeaders;
-} WININETHTTPREQW, *LPWININETHTTPREQW;
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    BOOL session_deleted;
-    int nDataSocket;
-} WININETFILE, *LPWININETFILE;
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    int sndSocket;
-    int lstnSocket;
-    int pasvSocket; /* data socket connected by us in case of passive FTP */
-    LPWININETFILE download_in_progress;
-    struct sockaddr_in socketAddress;
-    struct sockaddr_in lstnSocketAddress;
-    struct hostent *phostent;
-    LPWSTR  lpszPassword;
-    LPWSTR  lpszUserName;
-} WININETFTPSESSIONW, *LPWININETFTPSESSIONW;
-
-
-typedef struct
-{
-    BOOL bIsDirectory;
-    LPWSTR lpszName;
-    DWORD nSize;
-    struct tm tmLastModified;
-    unsigned short permissions;
-} FILEPROPERTIESW, *LPFILEPROPERTIESW;
-
-
-typedef struct
-{
-    WININETHANDLEHEADER hdr;
-    DWORD index;
-    DWORD size;
-    LPFILEPROPERTIESW lpafp;
-} WININETFINDNEXTW, *LPWININETFINDNEXTW;
-
-typedef enum
-{
-    FTPPUTFILEW,
-    FTPSETCURRENTDIRECTORYW,
-    FTPCREATEDIRECTORYW,
-    FTPFINDFIRSTFILEW,
-    FTPGETCURRENTDIRECTORYW,
-    FTPOPENFILEW,
-    FTPGETFILEW,
-    FTPDELETEFILEW,
-    FTPREMOVEDIRECTORYW,
-    FTPRENAMEFILEW,
-    INTERNETFINDNEXTW,
-    HTTPSENDREQUESTW,
-    HTTPOPENREQUESTW,
-    SENDCALLBACK,
-    INTERNETOPENURLW,
-} ASYNC_FUNC;
-
-struct WORKREQ_FTPPUTFILEW
-{
-    LPWSTR lpszLocalFile;
-    LPWSTR lpszNewRemoteFile;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-};
-
-struct WORKREQ_FTPSETCURRENTDIRECTORYW
-{
-    LPWSTR lpszDirectory;
-};
-
-struct WORKREQ_FTPCREATEDIRECTORYW
-{
-    LPWSTR lpszDirectory;
-};
-
-struct WORKREQ_FTPFINDFIRSTFILEW
-{
-    LPWSTR lpszSearchFile;
-    LPWIN32_FIND_DATAW lpFindFileData;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-};
-
-struct WORKREQ_FTPGETCURRENTDIRECTORYW
-{
-    LPWSTR lpszDirectory;
-    DWORD *lpdwDirectory;
-};
-
-struct WORKREQ_FTPOPENFILEW
-{
-    LPWSTR lpszFilename;
-    DWORD  dwAccess;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-};
-
-struct WORKREQ_FTPGETFILEW
-{
-    LPWSTR lpszRemoteFile;
-    LPWSTR lpszNewFile;
-    BOOL   fFailIfExists;
-    DWORD  dwLocalFlagsAttribute;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-};
-
-struct WORKREQ_FTPDELETEFILEW
-{
-    LPWSTR lpszFilename;
-};
-
-struct WORKREQ_FTPREMOVEDIRECTORYW
-{
-    LPWSTR lpszDirectory;
-};
-
-struct WORKREQ_FTPRENAMEFILEW
-{
-    LPWSTR lpszSrcFile;
-    LPWSTR lpszDestFile;
-};
-
-struct WORKREQ_INTERNETFINDNEXTW
-{
-    LPWIN32_FIND_DATAW lpFindFileData;
-};
-
-struct WORKREQ_HTTPOPENREQUESTW
-{
-    LPWSTR lpszVerb;
-    LPWSTR lpszObjectName;
-    LPWSTR lpszVersion;
-    LPWSTR lpszReferrer;
-    LPCWSTR *lpszAcceptTypes;
-    DWORD  dwFlags;
-    DWORD  dwContext;
-};
-
-struct WORKREQ_HTTPSENDREQUESTW
-{
-    LPWSTR lpszHeader;
-    DWORD  dwHeaderLength;
-    LPVOID lpOptional;
-    DWORD  dwOptionalLength;
-};
-
-struct WORKREQ_SENDCALLBACK
-{
-    DWORD     dwContext;
-    DWORD     dwInternetStatus;
-    LPVOID    lpvStatusInfo;
-    DWORD     dwStatusInfoLength;
-};
-
-struct WORKREQ_INTERNETOPENURLW
-{
-    HINTERNET hInternet;
-    LPWSTR     lpszUrl;
-    LPWSTR     lpszHeaders;
-    DWORD     dwHeadersLength;
-    DWORD     dwFlags;
-    DWORD     dwContext;
-};
-
-typedef struct WORKREQ
-{
-    ASYNC_FUNC asyncall;
-    WININETHANDLEHEADER *hdr;
-
-    union {
-        struct WORKREQ_FTPPUTFILEW              FtpPutFileW;
-        struct WORKREQ_FTPSETCURRENTDIRECTORYW  FtpSetCurrentDirectoryW;
-        struct WORKREQ_FTPCREATEDIRECTORYW      FtpCreateDirectoryW;
-        struct WORKREQ_FTPFINDFIRSTFILEW        FtpFindFirstFileW;
-        struct WORKREQ_FTPGETCURRENTDIRECTORYW  FtpGetCurrentDirectoryW;
-        struct WORKREQ_FTPOPENFILEW             FtpOpenFileW;
-        struct WORKREQ_FTPGETFILEW              FtpGetFileW;
-        struct WORKREQ_FTPDELETEFILEW           FtpDeleteFileW;
-        struct WORKREQ_FTPREMOVEDIRECTORYW      FtpRemoveDirectoryW;
-        struct WORKREQ_FTPRENAMEFILEW           FtpRenameFileW;
-        struct WORKREQ_INTERNETFINDNEXTW        InternetFindNextW;
-        struct WORKREQ_HTTPOPENREQUESTW         HttpOpenRequestW;
-        struct WORKREQ_HTTPSENDREQUESTW         HttpSendRequestW;
-        struct WORKREQ_SENDCALLBACK             SendCallback;
-	struct WORKREQ_INTERNETOPENURLW         InternetOpenUrlW;
-    } u;
-
-    struct WORKREQ *next;
-    struct WORKREQ *prev;
-
-} WORKREQUEST, *LPWORKREQUEST;
-
-HINTERNET WININET_AllocHandle( LPWININETHANDLEHEADER info );
-LPWININETHANDLEHEADER WININET_GetObject( HINTERNET hinternet );
-LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info );
-BOOL WININET_Release( LPWININETHANDLEHEADER info );
-BOOL WININET_FreeHandle( HINTERNET hinternet );
-HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info );
-
-time_t ConvertTimeString(LPCWSTR asctime);
-
-HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
-	INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
-	LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext,
-	DWORD dwInternalFlags);
-
-HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName,
-	INTERNET_PORT nServerPort, LPCWSTR lpszUserName,
-	LPCWSTR lpszPassword, DWORD dwFlags, DWORD dwContext,
-	DWORD dwInternalFlags);
-
-BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
-	struct hostent **phe, struct sockaddr_in *psa);
-
-void INTERNET_SetLastError(DWORD dwError);
-DWORD INTERNET_GetLastError(void);
-BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest);
-LPSTR INTERNET_GetResponseBuffer(void);
-LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen);
-
-BOOLAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile,
-    LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext);
-BOOLAPI FTP_FtpSetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory);
-BOOLAPI FTP_FtpCreateDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory);
-INTERNETAPI HINTERNET WINAPI FTP_FtpFindFirstFileW(LPWININETFTPSESSIONW lpwfs,
-    LPCWSTR lpszSearchFile, LPWIN32_FIND_DATAW lpFindFileData, DWORD dwFlags, DWORD dwContext);
-BOOLAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszCurrentDirectory,
-	LPDWORD lpdwCurrentDirectory);
-BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFindFileData);
-BOOL FTP_FtpRenameFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszSrc, LPCWSTR lpszDest);
-BOOL FTP_FtpRemoveDirectoryW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszDirectory);
-BOOL FTP_FtpDeleteFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName);
-HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszFileName,
-	DWORD fdwAccess, DWORD dwFlags, DWORD dwContext);
-BOOLAPI FTP_FtpGetFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile,
-	BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags,
-	DWORD dwContext);
-
-BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
-	DWORD dwHeaderLength, LPVOID lpOptional ,DWORD dwOptionalLength);
-INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs,
-	LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion,
-	LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes,
-	DWORD dwFlags, DWORD dwContext);
-
-VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
-                       DWORD dwInternetStatus, LPVOID lpvStatusInfo,
-                       DWORD dwStatusInfoLength);
-
-VOID SendSyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
-                      DWORD dwInternetStatus, LPVOID lpvStatusInfo,
-                      DWORD dwStatusInfoLength);
-
-BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr,
-                       LPCWSTR username, LPCWSTR password );
-
-BOOL NETCON_connected(WININET_NETCONNECTION *connection);
-void NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL);
-BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,
-	      int type, int protocol);
-BOOL NETCON_close(WININET_NETCONNECTION *connection);
-BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
-		    unsigned int addrlen);
-BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags,
-		int *sent /* out */);
-BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags,
-		int *recvd /* out */);
-BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer);
-
-#define MAX_REPLY_LEN	 	0x5B4
-
-/* Used for debugging - maybe need to be shared in the Wine debugging code ? */
-typedef struct
-{
-    DWORD val;
-    const char* name;
-} wininet_flag_info;
-
-extern void dump_INTERNET_FLAGS(DWORD dwFlags) ;
-
-#endif /* _WINE_INTERNET_H_ */

lib/wininet/makefile

@@ -1,9 +0,0 @@
-# $Id: makefile 7409 2004-01-02 19:49:47Z gvg $
-
-PATH_TO_TOP = ../..
-
-TARGET_TYPE = winedll
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

lib/wininet/netconnection.c

@@ -1,502 +0,0 @@
-/*
- * Wininet - networking layer. Uses unix sockets or OpenSSL.
- *
- * Copyright 2002 TransGaming Technologies Inc.
- *
- * David Hammerton
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-//#include "wine/library.h"
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-#include "winerror.h"
-
-#include "wine/debug.h"
-#include "internet.h"
-
-#define RESPONSE_TIMEOUT        30            /* FROM internet.c */
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-/* FIXME!!!!!!
- *    This should use winsock - To use winsock the functions will have to change a bit
- *        as they are designed for unix sockets.
- *    SSL stuff should use crypt32.dll
- */
-
-#ifdef HAVE_OPENSSL_SSL_H
-
-#ifndef SONAME_LIBSSL
-#define SONAME_LIBSSL "libssl.so"
-#endif
-#ifndef SONAME_LIBCRYPTO
-#define SONAME_LIBCRYPTO "libcrypto.so"
-#endif
-
-static void *OpenSSL_ssl_handle;
-static void *OpenSSL_crypto_handle;
-
-static SSL_METHOD *meth;
-static SSL_CTX *ctx;
-
-#define MAKE_FUNCPTR(f) static typeof(f) * p##f
-
-/* OpenSSL functions that we use */
-MAKE_FUNCPTR(SSL_library_init);
-MAKE_FUNCPTR(SSL_load_error_strings);
-MAKE_FUNCPTR(SSLv23_method);
-MAKE_FUNCPTR(SSL_CTX_new);
-MAKE_FUNCPTR(SSL_new);
-MAKE_FUNCPTR(SSL_set_bio);
-MAKE_FUNCPTR(SSL_connect);
-MAKE_FUNCPTR(SSL_write);
-MAKE_FUNCPTR(SSL_read);
-MAKE_FUNCPTR(SSL_CTX_get_timeout);
-MAKE_FUNCPTR(SSL_CTX_set_timeout);
-
-/* OpenSSL's libcrypto functions that we use */
-MAKE_FUNCPTR(BIO_new_socket);
-MAKE_FUNCPTR(BIO_new_fp);
-#undef MAKE_FUNCPTR
-
-#endif
-
-void NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL)
-{
-    connection->useSSL = useSSL;
-    connection->socketFD = -1;
-    if (connection->useSSL)
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-        TRACE("using SSL connection\n");
-	connection->ssl_sock = -1;
-	if (OpenSSL_ssl_handle) /* already initilzed everything */
-            return;
-	OpenSSL_ssl_handle = wine_dlopen(SONAME_LIBSSL, RTLD_NOW, NULL, 0);
-	if (!OpenSSL_ssl_handle)
-	{
-	    ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n",
-		SONAME_LIBSSL);
-            connection->useSSL = FALSE;
-            return;
-	}
-	OpenSSL_crypto_handle = wine_dlopen(SONAME_LIBCRYPTO, RTLD_NOW, NULL, 0);
-	if (!OpenSSL_crypto_handle)
-	{
-	    ERR("trying to use a SSL connection, but couldn't load %s. Expect trouble.\n",
-		SONAME_LIBCRYPTO);
-            connection->useSSL = FALSE;
-            return;
-	}
-
-        /* mmm nice ugly macroness */
-#define DYNSSL(x) \
-    p##x = wine_dlsym(OpenSSL_ssl_handle, #x, NULL, 0); \
-    if (!p##x) \
-    { \
-        ERR("failed to load symbol %s\n", #x); \
-        connection->useSSL = FALSE; \
-        return; \
-    }
-
-	DYNSSL(SSL_library_init);
-	DYNSSL(SSL_load_error_strings);
-	DYNSSL(SSLv23_method);
-	DYNSSL(SSL_CTX_new);
-	DYNSSL(SSL_new);
-	DYNSSL(SSL_set_bio);
-	DYNSSL(SSL_connect);
-	DYNSSL(SSL_write);
-	DYNSSL(SSL_read);
-	DYNSSL(SSL_CTX_get_timeout);
-        DYNSSL(SSL_CTX_set_timeout);
-#undef DYNSSL
-
-#define DYNCRYPTO(x) \
-    p##x = wine_dlsym(OpenSSL_crypto_handle, #x, NULL, 0); \
-    if (!p##x) \
-    { \
-        ERR("failed to load symbol %s\n", #x); \
-        connection->useSSL = FALSE; \
-        return; \
-    }
-	DYNCRYPTO(BIO_new_fp);
-	DYNCRYPTO(BIO_new_socket);
-#undef DYNCRYPTO
-
-	pSSL_library_init();
-	pSSL_load_error_strings();
-	pBIO_new_fp(stderr, BIO_NOCLOSE); /* FIXME: should use winedebug stuff */
-
-	meth = pSSLv23_method();
-	/* FIXME: SECURITY PROBLEM! WE ARN'T VERIFYING THE HOSTS CERTIFICATES OR ANYTHING */
-#else
-	FIXME("can't use SSL, not compiled in.\n");
-        connection->useSSL = FALSE;
-#endif
-    }
-}
-
-BOOL NETCON_connected(WININET_NETCONNECTION *connection)
-{
-    if (!connection->useSSL)
-    {
-	if (connection->socketFD == -1)
-	    return FALSE;
-	return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-	if (connection->ssl_sock == -1)
-	    return FALSE;
-        return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_create
- * Basically calls 'socket()' unless useSSL is supplised,
- *  in which case we do other things.
- */
-BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,
-	      int type, int protocol)
-{
-    if (!connection->useSSL)
-    {
-	connection->socketFD = socket(domain, type, protocol);
-	if (connection->socketFD == -1)
-	    return FALSE;
-	return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-        connection->ssl_sock = socket(domain, type, protocol);
-        return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_close
- * Basically calls 'close()' unless we should use SSL
- */
-BOOL NETCON_close(WININET_NETCONNECTION *connection)
-{
-    if (!NETCON_connected(connection)) return FALSE;
-    if (!connection->useSSL)
-    {
-        int result;
-	result = closesocket(connection->socketFD);
-        connection->socketFD = -1;
-	if (result == -1)
-	    return FALSE;
-        return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-	closesocket(connection->ssl_sock);
-	connection->ssl_sock = -1;
-	/* FIXME should we call SSL_shutdown here?? Probably on whatever is the
-	 * opposite of NETCON_init.... */
-        return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_connect
- * Basically calls 'connect()' unless we should use SSL
- */
-BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
-		    unsigned int addrlen)
-{
-    if (!NETCON_connected(connection)) return FALSE;
-    if (!connection->useSSL)
-    {
-	int result;
-	result = connect(connection->socketFD, serv_addr, addrlen);
-	if (result == -1)
-        {
-            closesocket(connection->socketFD);
-            connection->socketFD = -1;
-	    return FALSE;
-        }
-        return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-        BIO *sbio;
-
-        ctx = pSSL_CTX_new(meth);
-	connection->ssl_s = pSSL_new(ctx);
-
-	if (connect(connection->ssl_sock, serv_addr, addrlen) == -1)
-	    return FALSE;
-
-	sbio = pBIO_new_socket(connection->ssl_sock, BIO_NOCLOSE);
-        pSSL_set_bio(connection->ssl_s, sbio, sbio);
-	if (pSSL_connect(connection->ssl_s) <= 0)
-	{
-            ERR("ssl couldn't connect\n");
-	    return FALSE;
-	}
-	return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_send
- * Basically calls 'send()' unless we should use SSL
- * number of chars send is put in *sent
- */
-BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags,
-		int *sent /* out */)
-{
-    if (!NETCON_connected(connection)) return FALSE;
-    if (!connection->useSSL)
-    {
-	*sent = send(connection->socketFD, msg, len, flags);
-	if (*sent == -1)
-	    return FALSE;
-        return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-	if (flags)
-            FIXME("SSL_write doesn't support any flags (%08x)\n", flags);
-	*sent = pSSL_write(connection->ssl_s, msg, len);
-	if (*sent < 1 && len)
-	    return FALSE;
-        return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_recv
- * Basically calls 'recv()' unless we should use SSL
- * number of chars received is put in *recvd
- */
-BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags,
-		int *recvd /* out */)
-{
-    if (!NETCON_connected(connection)) return FALSE;
-    if (!connection->useSSL)
-    {
-	*recvd = recv(connection->socketFD, buf, len, flags);
-	if (*recvd == -1)
-	    return FALSE;
-        return TRUE;
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-	static char *peek_msg = NULL;
-	static char *peek_msg_mem = NULL;
-
-	if (flags & (~MSG_PEEK))
-	    FIXME("SSL_read does not support the following flag: %08x\n", flags);
-
-        /* this ugly hack is all for MSG_PEEK. eww gross */
-	if (flags & MSG_PEEK && !peek_msg)
-	{
-	    peek_msg = peek_msg_mem = HeapAlloc(GetProcessHeap(), 0, (sizeof(char) * len) + 1);
-	}
-	else if (flags & MSG_PEEK && peek_msg)
-	{
-	    size_t peek_msg_len = strlen(peek_msg);
-	    if (len < peek_msg_len)
-		FIXME("buffer isn't big enough. Do the expect us to wrap?\n");
-	    memcpy(buf, peek_msg, min(len,peek_msg_len+1));
-	    *recvd = min(len, peek_msg_len);
-            return TRUE;
-	}
-	else if (peek_msg)
-	{
-	    size_t peek_msg_len = strlen(peek_msg);
-	    memcpy(buf, peek_msg, min(len,peek_msg_len+1));
-	    peek_msg += *recvd = min(len, peek_msg_len);
-	    if (*peek_msg == '\0' || *(peek_msg - 1) == '\0')
-	    {
-		HeapFree(GetProcessHeap(), 0, peek_msg_mem);
-		peek_msg_mem = NULL;
-                peek_msg = NULL;
-	    }
-            return TRUE;
-	}
-	*recvd = pSSL_read(connection->ssl_s, buf, len);
-	if (flags & MSG_PEEK) /* must copy stuff into buffer */
-	{
-	    if (!*recvd)
-	    {
-		HeapFree(GetProcessHeap(), 0, peek_msg_mem);
-		peek_msg_mem = NULL;
-                peek_msg = NULL;
-	    }
-	    else
-	    {
-		memcpy(peek_msg, buf, *recvd);
-		peek_msg[*recvd] = '\0';
-	    }
-	}
-	if (*recvd < 1 && len)
-            return FALSE;
-        return TRUE;
-#else
-	return FALSE;
-#endif
-    }
-}
-
-/******************************************************************************
- * NETCON_getNextLine
- */
-BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer)
-{
-
-    TRACE("\n");
-
-    if (!NETCON_connected(connection)) return FALSE;
-
-    if (!connection->useSSL)
-    {
-	struct timeval tv;
-	fd_set infd;
-	BOOL bSuccess = FALSE;
-	DWORD nRecv = 0;
-
-	FD_ZERO(&infd);
-	FD_SET(connection->socketFD, &infd);
-	tv.tv_sec=RESPONSE_TIMEOUT;
-	tv.tv_usec=0;
-
-	while (nRecv < *dwBuffer)
-	{
-	    if (select(connection->socketFD+1,&infd,NULL,NULL,&tv) > 0)
-	    {
-		if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0)
-		{
-		    INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); /* fixme: right error? */
-		    goto lend;
-		}
-
-		if (lpszBuffer[nRecv] == '\n')
-		{
-		    bSuccess = TRUE;
-		    break;
-		}
-		if (lpszBuffer[nRecv] != '\r')
-		    nRecv++;
-	    }
-	    else
-	    {
-		INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT);
-		goto lend;
-	    }
-	}
-
-    lend:             /* FIXME: don't use labels */
-	if (bSuccess)
-	{
-	    lpszBuffer[nRecv++] = '\0';
-	    *dwBuffer = nRecv;
-	    TRACE(":%lu %s\n", nRecv, lpszBuffer);
-            return TRUE;
-	}
-	else
-	{
-	    return FALSE;
-	}
-    }
-    else
-    {
-#ifdef HAVE_OPENSSL_SSL_H
-	long prev_timeout;
-	DWORD nRecv = 0;
-        BOOL success = TRUE;
-
-        prev_timeout = pSSL_CTX_get_timeout(ctx);
-	pSSL_CTX_set_timeout(ctx, RESPONSE_TIMEOUT);
-
-	while (nRecv < *dwBuffer)
-	{
-	    int recv = 1;
-	    if (!NETCON_recv(connection, &lpszBuffer[nRecv], 1, 0, &recv))
-	    {
-                INTERNET_SetLastError(ERROR_CONNECTION_ABORTED);
-		success = FALSE;
-	    }
-
-	    if (lpszBuffer[nRecv] == '\n')
-	    {
-		success = TRUE;
-                break;
-	    }
-	    if (lpszBuffer[nRecv] != '\r')
-		nRecv++;
-	}
-
-        pSSL_CTX_set_timeout(ctx, prev_timeout);
-	if (success)
-	{
-	    lpszBuffer[nRecv++] = '\0';
-	    *dwBuffer = nRecv;
-	    TRACE("_SSL:%lu %s\n", nRecv, lpszBuffer);
-            return TRUE;
-	}
-        return FALSE;
-#else
-	return FALSE;
-#endif
-    }
-}

lib/wininet/rsrc.rc

@@ -1,53 +0,0 @@
-/*
- * Top level resource file for Wininet
- *
- * Copyright 2003 Mike McCormack for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-
-#include "resource.h"
-
-/*
- * Everything that does not depend on language,
- * like textless bitmaps etc, go into the
- * neutral language. This will prevent them from
- * being duplicated for each language.
- */
-/* #include "wininet_xx.rc" */
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- * Note that you can and may override resources
- * which also have a neutral version. This is to
- * get localized bitmaps for example.
- */
-#include "wininet_Cs.rc"
-#include "wininet_De.rc"
-#include "wininet_En.rc"
-#include "wininet_Es.rc"
-#include "wininet_Fr.rc"
-#include "wininet_It.rc"
-#include "wininet_Ja.rc"
-#include "wininet_Nl.rc"
-#include "wininet_Pt.rc"
-#include "wininet_Ru.rc"
-#include "wininet_Si.rc"

lib/wininet/tests/Makefile.in

@@ -1,14 +0,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-TESTDLL   = wininet.dll
-IMPORTS   = wininet
-
-CTESTS = \
-	generated.c \
-	http.c
-
-@MAKE_TEST_RULES@
-
-### Dependencies:

lib/wininet/tests/http.c

@@ -1,501 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-
-#include "wine/test.h"
-
-#define TEST_URL "http://www.winehq.org/site/about"
-#define TEST_URL_PATH "/site/about"
-#define TEST_URL2 "http://www.myserver.com/myscript.php?arg=1"
-#define TEST_URL2_SERVER "www.myserver.com"
-#define TEST_URL2_PATH "/myscript.php"
-#define TEST_URL2_PATHEXTRA "/myscript.php?arg=1"
-#define TEST_URL2_EXTRA "?arg=1"
-
-int goon = 0;
-
-VOID WINAPI callback(
-     HINTERNET hInternet,
-     DWORD dwContext,
-     DWORD dwInternetStatus,
-     LPVOID lpvStatusInformation,
-     DWORD dwStatusInformationLength
-)
-{
-    char name[124];
-
-    switch (dwInternetStatus)
-    {
-        case INTERNET_STATUS_RESOLVING_NAME:
-            strcpy(name,"INTERNET_STATUS_RESOLVING_NAME");
-            break;
-        case INTERNET_STATUS_NAME_RESOLVED:
-            strcpy(name,"INTERNET_STATUS_NAME_RESOLVED");
-            break;
-        case INTERNET_STATUS_CONNECTING_TO_SERVER:
-            strcpy(name,"INTERNET_STATUS_CONNECTING_TO_SERVER");
-            break;
-        case INTERNET_STATUS_CONNECTED_TO_SERVER:
-            strcpy(name,"INTERNET_STATUS_CONNECTED_TO_SERVER");
-            break;
-        case INTERNET_STATUS_SENDING_REQUEST:
-            strcpy(name,"INTERNET_STATUS_SENDING_REQUEST");
-            break;
-        case INTERNET_STATUS_REQUEST_SENT:
-            strcpy(name,"INTERNET_STATUS_REQUEST_SENT");
-            break;
-        case INTERNET_STATUS_RECEIVING_RESPONSE:
-            strcpy(name,"INTERNET_STATUS_RECEIVING_RESPONSE");
-            break;
-        case INTERNET_STATUS_RESPONSE_RECEIVED:
-            strcpy(name,"INTERNET_STATUS_RESPONSE_RECEIVED");
-            break;
-        case INTERNET_STATUS_CTL_RESPONSE_RECEIVED:
-            strcpy(name,"INTERNET_STATUS_CTL_RESPONSE_RECEIVED");
-            break;
-        case INTERNET_STATUS_PREFETCH:
-            strcpy(name,"INTERNET_STATUS_PREFETCH");
-            break;
-        case INTERNET_STATUS_CLOSING_CONNECTION:
-            strcpy(name,"INTERNET_STATUS_CLOSING_CONNECTION");
-            break;
-        case INTERNET_STATUS_CONNECTION_CLOSED:
-            strcpy(name,"INTERNET_STATUS_CONNECTION_CLOSED");
-            break;
-        case INTERNET_STATUS_HANDLE_CREATED:
-            strcpy(name,"INTERNET_STATUS_HANDLE_CREATED");
-            break;
-        case INTERNET_STATUS_HANDLE_CLOSING:
-            strcpy(name,"INTERNET_STATUS_HANDLE_CLOSING");
-            break;
-        case INTERNET_STATUS_REQUEST_COMPLETE:
-            strcpy(name,"INTERNET_STATUS_REQUEST_COMPLETE");
-            goon = 1;
-            break;
-        case INTERNET_STATUS_REDIRECT:
-            strcpy(name,"INTERNET_STATUS_REDIRECT");
-            break;
-        case INTERNET_STATUS_INTERMEDIATE_RESPONSE:
-            strcpy(name,"INTERNET_STATUS_INTERMEDIATE_RESPONSE");
-            break;
-    }
-
-    trace("Callback %p 0x%lx %s(%li) %p %ld\n",hInternet,dwContext,name,dwInternetStatus,lpvStatusInformation,dwStatusInformationLength);
-}
-
-void winapi_test(int flags)
-{
-    DWORD rc;
-    CHAR buffer[4000];
-    DWORD length;
-    DWORD out;
-    const char *types[2] = { "*", NULL };
-    HINTERNET hi, hic = 0, hor = 0;
-
-    trace("Starting with flags 0x%x\n",flags);
-
-    trace("InternetOpenA <--\n");
-    hi = InternetOpenA("",0x0,0x0,0x0,flags);
-    ok((hi != 0x0),"InternetOpen Failed\n");
-    trace("InternetOpenA -->\n");
-
-    if (hi == 0x0) goto abort;
-
-    InternetSetStatusCallback(hi,&callback);
-
-    trace("InternetConnectA <--\n");
-    hic=InternetConnectA(hi,"www.winehq.org",0x0,0x0,0x0,0x3,0x0,0xdeadbeef);
-    ok((hic != 0x0),"InternetConnect Failed\n");
-    trace("InternetConnectA -->\n");
-
-    if (hic == 0x0) goto abort;
-
-    trace("HttpOpenRequestA <--\n");
-    hor = HttpOpenRequestA(hic, "GET",
-                          "/about/",
-                          0x0,0x0,types,0x00400800,0xdeadbead);
-    if (hor == 0x0 && GetLastError() == 12007 /* ERROR_INTERNET_NAME_NOT_RESOLVED */) {
-        /*
-         * If the internet name can't be resolved we are probably behind
-         * a firewall or in some other way not directly connected to the
-         * Internet. Not enough reason to fail the test. Just ignore and
-         * abort.
-         */
-    } else  {
-        ok((hor != 0x0),"HttpOpenRequest Failed\n");
-    }
-    trace("HttpOpenRequestA -->\n");
-
-    if (hor == 0x0) goto abort;
-
-    trace("HttpSendRequestA -->\n");
-    SetLastError(0);
-    rc = HttpSendRequestA(hor, "", 0xffffffff,0x0,0x0);
-    if (flags)
-        ok(((rc == 0)&&(GetLastError()==997)),
-            "Asynchronous HttpSendRequest NOT returning 0 with error 997\n");
-    else
-        ok((rc != 0) || GetLastError() == 12007, /* 12007 == XP */
-           "Synchronous HttpSendRequest returning 0, error %ld\n", GetLastError());
-    trace("HttpSendRequestA <--\n");
-
-    while ((flags)&&(!goon))
-        Sleep(100);
-
-    length = 4;
-    rc = InternetQueryOptionA(hor,0x17,&out,&length);
-    trace("Option 0x17 -> %li  %li\n",rc,out);
-
-    length = 100;
-    rc = InternetQueryOptionA(hor,0x22,buffer,&length);
-    trace("Option 0x22 -> %li  %s\n",rc,buffer);
-
-    length = 4000;
-    rc = HttpQueryInfoA(hor,0x16,buffer,&length,0x0);
-    buffer[length]=0;
-    trace("Option 0x16 -> %li  %s\n",rc,buffer);
-
-    length = 4000;
-    rc = InternetQueryOptionA(hor,0x22,buffer,&length);
-    buffer[length]=0;
-    trace("Option 0x22 -> %li  %s\n",rc,buffer);
-
-    length = 16;
-    rc = HttpQueryInfoA(hor,0x5,&buffer,&length,0x0);
-    trace("Option 0x5 -> %li  %s  (%li)\n",rc,buffer,GetLastError());
-
-    length = 100;
-    rc = HttpQueryInfoA(hor,0x1,buffer,&length,0x0);
-    buffer[length]=0;
-    trace("Option 0x1 -> %li  %s\n",rc,buffer);
-
-    length = 100;
-    trace("Entering Query loop\n");
-
-    while (length)
-    {
-
-        rc = InternetQueryDataAvailable(hor,&length,0x0,0x0);
-        ok(!(rc == 0 && length != 0),"InternetQueryDataAvailable failed\n");
-
-        if (length)
-        {
-            char *buffer;
-            buffer = HeapAlloc(GetProcessHeap(),0,length+1);
-
-            rc = InternetReadFile(hor,buffer,length,&length);
-
-            buffer[length]=0;
-
-            trace("ReadFile -> %li %li\n",rc,length);
-
-            HeapFree(GetProcessHeap(),0,buffer);
-        }
-    }
-abort:
-    if (hor != 0x0) {
-        rc = InternetCloseHandle(hor);
-        ok ((rc != 0), "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n");
-        rc = InternetCloseHandle(hor);
-        ok ((rc == 0), "Double close of handle opened by HttpOpenRequestA succeeded\n");
-    }
-    if (hic != 0x0) {
-        rc = InternetCloseHandle(hic);
-        ok ((rc != 0), "InternetCloseHandle of handle opened by InternetConnectA failed\n");
-    }
-    if (hi != 0x0) {
-      rc = InternetCloseHandle(hi);
-      ok ((rc != 0), "InternetCloseHandle of handle opened by InternetOpenA failed\n");
-      if (flags)
-          Sleep(100);
-    }
-}
-
-void InternetOpenUrlA_test(void)
-{
-  HINTERNET myhinternet, myhttp;
-  char buffer[0x400];
-  URL_COMPONENTSA urlComponents;
-  char protocol[32], hostName[1024], userName[1024];
-  char password[1024], extra[1024], path[1024];
-  DWORD size, readbytes, totalbytes=0;
-  BOOL ret;
-  
-  myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE);
-  ok((myhinternet != 0), "InternetOpen failed, error %lx\n",GetLastError());
-  size = 0x400;
-  ret = InternetCanonicalizeUrl(TEST_URL, buffer, &size,ICU_BROWSER_MODE);
-  ok( ret, "InternetCanonicalizeUrl failed, error %lx\n",GetLastError());
-  
-  urlComponents.dwStructSize = sizeof(URL_COMPONENTSA);
-  urlComponents.lpszScheme = protocol;
-  urlComponents.dwSchemeLength = 32;
-  urlComponents.lpszHostName = hostName;
-  urlComponents.dwHostNameLength = 1024;
-  urlComponents.lpszUserName = userName;
-  urlComponents.dwUserNameLength = 1024;
-  urlComponents.lpszPassword = password;
-  urlComponents.dwPasswordLength = 1024;
-  urlComponents.lpszUrlPath = path;
-  urlComponents.dwUrlPathLength = 2048;
-  urlComponents.lpszExtraInfo = extra;
-  urlComponents.dwExtraInfoLength = 1024;
-  ret = InternetCrackUrl(TEST_URL, 0,0,&urlComponents);
-  ok( ret, "InternetCrackUrl failed, error %lx\n",GetLastError());
-  SetLastError(0);
-  myhttp = InternetOpenUrl(myhinternet, TEST_URL, 0, 0,
-			   INTERNET_FLAG_RELOAD|INTERNET_FLAG_NO_CACHE_WRITE|INTERNET_FLAG_TRANSFER_BINARY,0);
-  if (GetLastError() == 12007)
-    return; /* WinXP returns this when not connected to the net */
-  ok((myhttp != 0),"InternetOpenUrl failed, error %lx\n",GetLastError());
-  ret = InternetReadFile(myhttp, buffer,0x400,&readbytes);
-  ok( ret, "InternetReadFile failed, error %lx\n",GetLastError());
-  totalbytes += readbytes;
-  while (readbytes && InternetReadFile(myhttp, buffer,0x400,&readbytes))
-    totalbytes += readbytes;
-  trace("read 0x%08lx bytes\n",totalbytes);
-}
-  
-void InternetCrackUrl_test(void)
-{
-  URL_COMPONENTSA urlComponents;
-  char protocol[32], hostName[1024], userName[1024];
-  char password[1024], extra[1024], path[1024];
-  BOOL ret;
-
-  urlComponents.dwStructSize = sizeof(URL_COMPONENTSA);
-  urlComponents.lpszScheme = protocol;
-  urlComponents.dwSchemeLength = 32;
-  urlComponents.lpszHostName = hostName;
-  urlComponents.dwHostNameLength = 1024;
-  urlComponents.lpszUserName = userName;
-  urlComponents.dwUserNameLength = 1024;
-  urlComponents.lpszPassword = password;
-  urlComponents.dwPasswordLength = 1024;
-  urlComponents.lpszUrlPath = path;
-  urlComponents.dwUrlPathLength = 2048;
-  urlComponents.lpszExtraInfo = extra;
-  urlComponents.dwExtraInfoLength = 1024;
-  ret = InternetCrackUrl(TEST_URL, 0,0,&urlComponents);
-  ok( ret, "InternetCrackUrl failed, error %lx\n",GetLastError());
-  ok((strcmp(TEST_URL_PATH,path) == 0),"path cracked wrong\n");
-
-  /* Bug 1805: Confirm the returned lengths are correct:                     */
-  /* 1. When extra info split out explicitly */
-  ZeroMemory(&urlComponents, sizeof(urlComponents));
-  urlComponents.dwStructSize = sizeof(urlComponents);
-  urlComponents.dwHostNameLength = 1;
-  urlComponents.dwUrlPathLength  = 1;
-  urlComponents.dwExtraInfoLength = 1;
-  ok(InternetCrackUrlA(TEST_URL2, 0, 0, &urlComponents),"InternetCrackUrl failed, error 0x%lx\n", GetLastError());
-  ok(urlComponents.dwUrlPathLength == strlen(TEST_URL2_PATH),".dwUrlPathLength should be %d, but is %ld\n", strlen(TEST_URL2_PATH), urlComponents.dwUrlPathLength);
-  ok(!strncmp(urlComponents.lpszUrlPath,TEST_URL2_PATH,strlen(TEST_URL2_PATH)),"lpszUrlPath should be %s but is %s\n", TEST_URL2_PATH, urlComponents.lpszUrlPath);
-  ok(urlComponents.dwHostNameLength == strlen(TEST_URL2_SERVER),".dwHostNameLength should be %d, but is %ld\n", strlen(TEST_URL2_SERVER), urlComponents.dwHostNameLength);
-  ok(!strncmp(urlComponents.lpszHostName,TEST_URL2_SERVER,strlen(TEST_URL2_SERVER)),"lpszHostName should be %s but is %s\n", TEST_URL2_SERVER, urlComponents.lpszHostName);
-  ok(urlComponents.dwExtraInfoLength == strlen(TEST_URL2_EXTRA),".dwExtraInfoLength should be %d, but is %ld\n", strlen(TEST_URL2_EXTRA), urlComponents.dwExtraInfoLength);
-  ok(!strncmp(urlComponents.lpszExtraInfo,TEST_URL2_EXTRA,strlen(TEST_URL2_EXTRA)),"lpszExtraInfo should be %s but is %s\n", TEST_URL2_EXTRA, urlComponents.lpszHostName);
-
-  /* 2. When extra info is not split out explicitly and is in url path */
-  ZeroMemory(&urlComponents, sizeof(urlComponents));
-  urlComponents.dwStructSize = sizeof(urlComponents);
-  urlComponents.dwHostNameLength = 1;
-  urlComponents.dwUrlPathLength  = 1;
-  ok(InternetCrackUrlA(TEST_URL2, 0, 0, &urlComponents),"InternetCrackUrl failed with GLE 0x%lx\n",GetLastError());
-  ok(urlComponents.dwUrlPathLength == strlen(TEST_URL2_PATHEXTRA),".dwUrlPathLength should be %d, but is %ld\n", strlen(TEST_URL2_PATHEXTRA), urlComponents.dwUrlPathLength);
-  ok(!strncmp(urlComponents.lpszUrlPath,TEST_URL2_PATHEXTRA,strlen(TEST_URL2_PATHEXTRA)),"lpszUrlPath should be %s but is %s\n", TEST_URL2_PATHEXTRA, urlComponents.lpszUrlPath);
-  ok(urlComponents.dwHostNameLength == strlen(TEST_URL2_SERVER),".dwHostNameLength should be %d, but is %ld\n", strlen(TEST_URL2_SERVER), urlComponents.dwHostNameLength);
-  ok(!strncmp(urlComponents.lpszHostName,TEST_URL2_SERVER,strlen(TEST_URL2_SERVER)),"lpszHostName should be %s but is %s\n", TEST_URL2_SERVER, urlComponents.lpszHostName);
-
-
-
-}
-
-void InternetCrackUrlW_test(void)
-{
-    WCHAR url[] = {
-        'h','t','t','p',':','/','/','1','9','2','.','1','6','8','.','0','.','2','2','/',
-        'C','F','I','D','E','/','m','a','i','n','.','c','f','m','?','C','F','S','V','R',
-        '=','I','D','E','&','A','C','T','I','O','N','=','I','D','E','_','D','E','F','A',
-        'U','L','T', 0 };
-    URL_COMPONENTSW comp;
-    WCHAR scheme[20], host[20], user[20], pwd[20], urlpart[50], extra[50];
-    BOOL r;
-
-    urlpart[0]=0;
-    scheme[0]=0;
-    extra[0]=0;
-    host[0]=0;
-    user[0]=0;
-    pwd[0]=0;
-    memset(&comp, 0, sizeof comp);
-    comp.dwStructSize = sizeof comp;
-    comp.lpszScheme = scheme;
-    comp.dwSchemeLength = sizeof scheme;
-    comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
-    comp.lpszUserName = user;
-    comp.dwUserNameLength = sizeof user;
-    comp.lpszPassword = pwd;
-    comp.dwPasswordLength = sizeof pwd;
-    comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
-    comp.lpszExtraInfo = extra;
-    comp.dwExtraInfoLength = sizeof extra;
-
-    r = InternetCrackUrlW(url, 0, 0, &comp );
-    ok( r, "failed to crack url\n");
-    ok( comp.dwSchemeLength == 4, "scheme length wrong\n");
-    ok( comp.dwHostNameLength == 12, "host length wrong\n");
-    ok( comp.dwUserNameLength == 0, "user length wrong\n");
-    ok( comp.dwPasswordLength == 0, "password length wrong\n");
-    ok( comp.dwUrlPathLength == 15, "url length wrong\n");
-    ok( comp.dwExtraInfoLength == 29, "extra length wrong\n");
- 
-    urlpart[0]=0;
-    scheme[0]=0;
-    extra[0]=0;
-    host[0]=0;
-    user[0]=0;
-    pwd[0]=0;
-    memset(&comp, 0, sizeof comp);
-    comp.dwStructSize = sizeof comp;
-    comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
-    comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
-
-    r = InternetCrackUrlW(url, 0, 0, &comp );
-    ok( r, "failed to crack url\n");
-    ok( comp.dwSchemeLength == 0, "scheme length wrong\n");
-    ok( comp.dwHostNameLength == 12, "host length wrong\n");
-    ok( comp.dwUserNameLength == 0, "user length wrong\n");
-    ok( comp.dwPasswordLength == 0, "password length wrong\n");
-    ok( comp.dwUrlPathLength == 44, "url length wrong\n");
-    ok( comp.dwExtraInfoLength == 0, "extra length wrong\n");
-
-    urlpart[0]=0;
-    scheme[0]=0;
-    extra[0]=0;
-    host[0]=0;
-    user[0]=0;
-    pwd[0]=0;
-    memset(&comp, 0, sizeof comp);
-    comp.dwStructSize = sizeof comp;
-    comp.lpszHostName = host;
-    comp.dwHostNameLength = sizeof host;
-    comp.lpszUrlPath = urlpart;
-    comp.dwUrlPathLength = sizeof urlpart;
-    comp.lpszExtraInfo = NULL;
-    comp.dwExtraInfoLength = sizeof extra;
-
-    r = InternetCrackUrlW(url, 0, 0, &comp );
-    ok( r, "failed to crack url\n");
-    ok( comp.dwSchemeLength == 0, "scheme length wrong\n");
-    ok( comp.dwHostNameLength == 12, "host length wrong\n");
-    ok( comp.dwUserNameLength == 0, "user length wrong\n");
-    ok( comp.dwPasswordLength == 0, "password length wrong\n");
-    ok( comp.dwUrlPathLength == 15, "url length wrong\n");
-    ok( comp.dwExtraInfoLength == 29, "extra length wrong\n");
-}
-
-static void InternetTimeFromSystemTimeA_test()
-{
-    BOOL ret;
-    static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
-    char string[INTERNET_RFC1123_BUFSIZE];
-    static const char expect[] = "Fri, 07 Jan 2005 12:06:35 GMT";
-
-    ret = InternetTimeFromSystemTimeA( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) );
-    ok( ret, "InternetTimeFromSystemTimeA failed (%ld)\n", GetLastError() );
-
-    ok( !memcmp( string, expect, sizeof(expect) ),
-        "InternetTimeFromSystemTimeA failed (%ld)\n", GetLastError() );
-}
-
-static void InternetTimeFromSystemTimeW_test()
-{
-    BOOL ret;
-    static const SYSTEMTIME time = { 2005, 1, 5, 7, 12, 6, 35, 0 };
-    WCHAR string[INTERNET_RFC1123_BUFSIZE + 1];
-    static const WCHAR expect[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ',
-                                    '1','2',':','0','6',':','3','5',' ','G','M','T',0 };
-
-    ret = InternetTimeFromSystemTimeW( &time, INTERNET_RFC1123_FORMAT, string, sizeof(string) );
-    ok( ret, "InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() );
-
-    ok( !memcmp( string, expect, sizeof(expect) ),
-        "InternetTimeFromSystemTimeW failed (%ld)\n", GetLastError() );
-}
-
-static void InternetTimeToSystemTimeA_test()
-{
-    BOOL ret;
-    SYSTEMTIME time;
-    static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 };
-    static const char string[] = "Fri, 07 Jan 2005 12:06:35 GMT";
-    static const char string2[] = " fri 7 jan 2005 12 06 35";
-
-    ret = InternetTimeToSystemTimeA( string, &time, 0 );
-    ok( ret, "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
-    ok( !memcmp( &time, &expect, sizeof(expect) ),
-        "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeA( string2, &time, 0 );
-    ok( ret, "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
-    ok( !memcmp( &time, &expect, sizeof(expect) ),
-        "InternetTimeToSystemTimeA failed (%ld)\n", GetLastError() );
-}
-
-static void InternetTimeToSystemTimeW_test()
-{
-    BOOL ret;
-    SYSTEMTIME time;
-    static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 };
-    static const WCHAR string[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ',
-                                    '1','2',':','0','6',':','3','5',' ','G','M','T',0 };
-    static const WCHAR string2[] = { ' ','f','r','i',' ','7',' ','j','a','n',' ','2','0','0','5',' ',
-                                     '1','2',' ','0','6',' ','3','5',0 };
-    static const WCHAR string3[] = { 'F','r',0 };
-
-    ret = InternetTimeToSystemTimeW( NULL, NULL, 0 );
-    ok( !ret, "InternetTimeToSystemTimeW succeeded (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( NULL, &time, 0 );
-    ok( !ret, "InternetTimeToSystemTimeW succeeded (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( string, NULL, 0 );
-    ok( !ret, "InternetTimeToSystemTimeW succeeded (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( string, &time, 1 );
-    ok( ret, "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( string, &time, 0 );
-    ok( ret, "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-    ok( !memcmp( &time, &expect, sizeof(expect) ),
-        "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( string2, &time, 0 );
-    ok( ret, "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-    ok( !memcmp( &time, &expect, sizeof(expect) ),
-        "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-
-    ret = InternetTimeToSystemTimeW( string3, &time, 0 );
-    ok( ret, "InternetTimeToSystemTimeW failed (%ld)\n", GetLastError() );
-}
-
-START_TEST(http)
-{
-    winapi_test(0x10000000);
-    winapi_test(0x00000000);
-    InternetCrackUrl_test();
-    InternetOpenUrlA_test();
-    InternetCrackUrlW_test();
-    InternetTimeFromSystemTimeA_test();
-    InternetTimeFromSystemTimeW_test();
-    InternetTimeToSystemTimeA_test();
-    InternetTimeToSystemTimeW_test();
-}

lib/wininet/tests/wininet_test.h

@@ -1,84 +0,0 @@
-/*
- * Unit test suite for wininet functions
- *
- * Copyright 2004 Francois Gouget
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* The Windows headers don't define A/W types for any of the following
- * structures and pointers :-(
- * Because for these structures there's not alignment or packing difference
- * between the A and W versions, we just define a set of macros so the
- * generated tests work anyway.
- */
-#ifndef GOPHER_ABSTRACT_ATTRIBUTE_TYPE
-#define GOPHER_ABSTRACT_ATTRIBUTE_TYPEA GOPHER_ABSTRACT_ATTRIBUTE_TYPE
-#define GOPHER_ABSTRACT_ATTRIBUTE_TYPEW GOPHER_ABSTRACT_ATTRIBUTE_TYPE
-
-#define GOPHER_ADMIN_ATTRIBUTE_TYPEA GOPHER_ADMIN_ATTRIBUTE_TYPE
-#define GOPHER_ADMIN_ATTRIBUTE_TYPEW GOPHER_ADMIN_ATTRIBUTE_TYPE
-#define GOPHER_ASK_ATTRIBUTE_TYPEA GOPHER_ASK_ATTRIBUTE_TYPE
-#define GOPHER_ASK_ATTRIBUTE_TYPEW GOPHER_ASK_ATTRIBUTE_TYPE
-#define GOPHER_ATTRIBUTE_ENUMERATORA GOPHER_ATTRIBUTE_ENUMERATOR
-#define GOPHER_ATTRIBUTE_ENUMERATORW GOPHER_ATTRIBUTE_ENUMERATOR
-#define GOPHER_ATTRIBUTE_TYPEA GOPHER_ATTRIBUTE_TYPE
-#define GOPHER_ATTRIBUTE_TYPEW GOPHER_ATTRIBUTE_TYPE
-#define GOPHER_LOCATION_ATTRIBUTE_TYPEA GOPHER_LOCATION_ATTRIBUTE_TYPE
-#define GOPHER_LOCATION_ATTRIBUTE_TYPEW GOPHER_LOCATION_ATTRIBUTE_TYPE
-#define GOPHER_ORGANIZATION_ATTRIBUTE_TYPEA GOPHER_ORGANIZATION_ATTRIBUTE_TYPE
-#define GOPHER_ORGANIZATION_ATTRIBUTE_TYPEW GOPHER_ORGANIZATION_ATTRIBUTE_TYPE
-#define GOPHER_PROVIDER_ATTRIBUTE_TYPEA GOPHER_PROVIDER_ATTRIBUTE_TYPE
-#define GOPHER_PROVIDER_ATTRIBUTE_TYPEW GOPHER_PROVIDER_ATTRIBUTE_TYPE
-#define GOPHER_SITE_ATTRIBUTE_TYPEA GOPHER_SITE_ATTRIBUTE_TYPE
-#define GOPHER_SITE_ATTRIBUTE_TYPEW GOPHER_SITE_ATTRIBUTE_TYPE
-#define GOPHER_UNKNOWN_ATTRIBUTE_TYPEA GOPHER_UNKNOWN_ATTRIBUTE_TYPE
-#define GOPHER_UNKNOWN_ATTRIBUTE_TYPEW GOPHER_UNKNOWN_ATTRIBUTE_TYPE
-#define GOPHER_VERSION_ATTRIBUTE_TYPEA GOPHER_VERSION_ATTRIBUTE_TYPE
-#define GOPHER_VERSION_ATTRIBUTE_TYPEW GOPHER_VERSION_ATTRIBUTE_TYPE
-#define GOPHER_VIEW_ATTRIBUTE_TYPEA GOPHER_VIEW_ATTRIBUTE_TYPE
-#define GOPHER_VIEW_ATTRIBUTE_TYPEW GOPHER_VIEW_ATTRIBUTE_TYPE
-#define INTERNET_CERTIFICATE_INFOA INTERNET_CERTIFICATE_INFO
-#define INTERNET_CERTIFICATE_INFOW INTERNET_CERTIFICATE_INFO
-#define INTERNET_PROXY_INFOA INTERNET_PROXY_INFO
-#define INTERNET_PROXY_INFOW INTERNET_PROXY_INFO
-
-#define LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEA LPGOPHER_ABSTRACT_ATTRIBUTE_TYPE
-#define LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEW LPGOPHER_ABSTRACT_ATTRIBUTE_TYPE
-#define LPGOPHER_ADMIN_ATTRIBUTE_TYPEA LPGOPHER_ADMIN_ATTRIBUTE_TYPE
-#define LPGOPHER_ADMIN_ATTRIBUTE_TYPEW LPGOPHER_ADMIN_ATTRIBUTE_TYPE
-#define LPGOPHER_ASK_ATTRIBUTE_TYPEA LPGOPHER_ASK_ATTRIBUTE_TYPE
-#define LPGOPHER_ASK_ATTRIBUTE_TYPEW LPGOPHER_ASK_ATTRIBUTE_TYPE
-#define LPGOPHER_ATTRIBUTE_TYPEA LPGOPHER_ATTRIBUTE_TYPE
-#define LPGOPHER_ATTRIBUTE_TYPEW LPGOPHER_ATTRIBUTE_TYPE
-#define LPGOPHER_LOCATION_ATTRIBUTE_TYPEA LPGOPHER_LOCATION_ATTRIBUTE_TYPE
-#define LPGOPHER_LOCATION_ATTRIBUTE_TYPEW LPGOPHER_LOCATION_ATTRIBUTE_TYPE
-#define LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEA LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPE
-#define LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEW LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPE
-#define LPGOPHER_PROVIDER_ATTRIBUTE_TYPEA LPGOPHER_PROVIDER_ATTRIBUTE_TYPE
-#define LPGOPHER_PROVIDER_ATTRIBUTE_TYPEW LPGOPHER_PROVIDER_ATTRIBUTE_TYPE
-#define LPGOPHER_SITE_ATTRIBUTE_TYPEA LPGOPHER_SITE_ATTRIBUTE_TYPE
-#define LPGOPHER_SITE_ATTRIBUTE_TYPEW LPGOPHER_SITE_ATTRIBUTE_TYPE
-#define LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEA LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE
-#define LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEW LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE
-#define LPGOPHER_VERSION_ATTRIBUTE_TYPEA LPGOPHER_VERSION_ATTRIBUTE_TYPE
-#define LPGOPHER_VERSION_ATTRIBUTE_TYPEW LPGOPHER_VERSION_ATTRIBUTE_TYPE
-#define LPGOPHER_VIEW_ATTRIBUTE_TYPEA LPGOPHER_VIEW_ATTRIBUTE_TYPE
-#define LPGOPHER_VIEW_ATTRIBUTE_TYPEW LPGOPHER_VIEW_ATTRIBUTE_TYPE
-#define LPINTERNET_CERTIFICATE_INFOA LPINTERNET_CERTIFICATE_INFO
-#define LPINTERNET_CERTIFICATE_INFOW LPINTERNET_CERTIFICATE_INFO
-#define LPINTERNET_PROXY_INFOA LPINTERNET_PROXY_INFO
-#define LPINTERNET_PROXY_INFOW LPINTERNET_PROXY_INFO
-#endif

lib/wininet/utility.c

@@ -1,303 +0,0 @@
-/*
- * Wininet - Utility functions
- *
- * Copyright 1999 Corel Corporation
- * Copyright 2002 CodeWeavers Inc.
- *
- * Ulrich Czekalla
- * Aric Stewart
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wininet.h"
-#include "winerror.h"
-#include "winnls.h"
-
-#include "wine/debug.h"
-#include "internet.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
-#define TIME_STRING_LEN  30
-#define CP_UNIXCP     65010 /* Wine extension */
-
-
-time_t ConvertTimeString(LPCWSTR asctime)
-{
-    WCHAR tmpChar[TIME_STRING_LEN];
-    WCHAR *tmpChar2;
-    struct tm t;
-    int timelen = strlenW(asctime);
-
-    if(!asctime || !timelen)
-        return 0;
-
-    /* The atoiWs below relie on that tmpChar is \0 padded? */
-    strncpyW(tmpChar, asctime, TIME_STRING_LEN);
-
-    /* Assert that the string is the expected length */
-    if (tmpChar[TIME_STRING_LEN - 1] != '\0')
-    {
-        tmpChar[TIME_STRING_LEN - 1] = '\0';
-        FIXME("\n");
-    }
-
-    /* Convert a time such as 'Mon, 15 Nov 1999 16:09:35 GMT' into a SYSTEMTIME structure
-     * We assume the time is in this format
-     * and divide it into easy to swallow chunks
-     */
-    tmpChar[3]='\0';
-    tmpChar[7]='\0';
-    tmpChar[11]='\0';
-    tmpChar[16]='\0';
-    tmpChar[19]='\0';
-    tmpChar[22]='\0';
-    tmpChar[25]='\0';
-
-    t.tm_year = atoiW(tmpChar+12) - 1900;
-    t.tm_mday = atoiW(tmpChar+5);
-    t.tm_hour = atoiW(tmpChar+17);
-    t.tm_min = atoiW(tmpChar+20);
-    t.tm_sec = atoiW(tmpChar+23);
-
-    /* and month */
-    tmpChar2 = tmpChar + 8;
-    switch(tmpChar2[2])
-    {
-        case 'n':
-            if(tmpChar2[1]=='a')
-                t.tm_mon = 0;
-            else
-                t.tm_mon = 5;
-            break;
-        case 'b':
-            t.tm_mon = 1;
-            break;
-        case 'r':
-            if(tmpChar2[1]=='a')
-                t.tm_mon = 2;
-            else
-                t.tm_mon = 3;
-            break;
-        case 'y':
-            t.tm_mon = 4;
-            break;
-        case 'l':
-            t.tm_mon = 6;
-            break;
-        case 'g':
-            t.tm_mon = 7;
-            break;
-        case 'p':
-            t.tm_mon = 8;
-            break;
-        case 't':
-            t.tm_mon = 9;
-            break;
-        case 'v':
-            t.tm_mon = 10;
-            break;
-        case 'c':
-            t.tm_mon = 11;
-            break;
-        default:
-            FIXME("\n");
-    }
-
-    return mktime(&t);
-}
-
-
-BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
-	struct hostent **phe, struct sockaddr_in *psa)
-{
-    WCHAR *found;
-    char *name;
-    int len, sz;
-
-    TRACE("%s\n", debugstr_w(lpszServerName));
-
-    /* Validate server name first
-     * Check if there is sth. like
-     * pinger.macromedia.com:80
-     * if yes, eliminate the :80....
-     */
-    found = strchrW(lpszServerName, ':');
-    if (found)
-        len = found - lpszServerName;
-    else
-        len = strlenW(lpszServerName);
-
-    sz = WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, NULL, 0, NULL, NULL );
-    name = HeapAlloc(GetProcessHeap(), 0, sz+1);
-    WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL );
-    name[sz] = 0;
-    *phe = gethostbyname(name);
-    HeapFree( GetProcessHeap(), 0, name );
-
-    if (NULL == *phe)
-    {
-        TRACE("Failed to get hostname: (%s)\n", debugstr_w(lpszServerName) );
-        return FALSE;
-    }
-
-    memset(psa,0,sizeof(struct sockaddr_in));
-    memcpy((char *)&psa->sin_addr, (*phe)->h_addr, (*phe)->h_length);
-    psa->sin_family = (*phe)->h_addrtype;
-    psa->sin_port = htons((u_short)nServerPort);
-
-    return TRUE;
-}
-
-/*
- * Helper function for sending async Callbacks
- */
-
-static const char *get_callback_name(DWORD dwInternetStatus) {
-    static const wininet_flag_info internet_status[] = {
-#define FE(x) { x, #x }
-	FE(INTERNET_STATUS_RESOLVING_NAME),
-	FE(INTERNET_STATUS_NAME_RESOLVED),
-	FE(INTERNET_STATUS_CONNECTING_TO_SERVER),
-	FE(INTERNET_STATUS_CONNECTED_TO_SERVER),
-	FE(INTERNET_STATUS_SENDING_REQUEST),
-	FE(INTERNET_STATUS_REQUEST_SENT),
-	FE(INTERNET_STATUS_RECEIVING_RESPONSE),
-	FE(INTERNET_STATUS_RESPONSE_RECEIVED),
-	FE(INTERNET_STATUS_CTL_RESPONSE_RECEIVED),
-	FE(INTERNET_STATUS_PREFETCH),
-	FE(INTERNET_STATUS_CLOSING_CONNECTION),
-	FE(INTERNET_STATUS_CONNECTION_CLOSED),
-	FE(INTERNET_STATUS_HANDLE_CREATED),
-	FE(INTERNET_STATUS_HANDLE_CLOSING),
-	FE(INTERNET_STATUS_REQUEST_COMPLETE),
-	FE(INTERNET_STATUS_REDIRECT),
-	FE(INTERNET_STATUS_INTERMEDIATE_RESPONSE),
-	FE(INTERNET_STATUS_USER_INPUT_REQUIRED),
-	FE(INTERNET_STATUS_STATE_CHANGE),
-	FE(INTERNET_STATUS_COOKIE_SENT),
-	FE(INTERNET_STATUS_COOKIE_RECEIVED),
-	FE(INTERNET_STATUS_PRIVACY_IMPACTED),
-	FE(INTERNET_STATUS_P3P_HEADER),
-	FE(INTERNET_STATUS_P3P_POLICYREF),
-	FE(INTERNET_STATUS_COOKIE_HISTORY)
-#undef FE
-    };
-    DWORD i;
-
-    for (i = 0; i < (sizeof(internet_status) / sizeof(internet_status[0])); i++) {
-	if (internet_status[i].val == dwInternetStatus) return internet_status[i].name;
-    }
-    return "Unknown";
-}
-
-VOID SendSyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
-                      DWORD dwInternetStatus, LPVOID lpvStatusInfo,
-                      DWORD dwStatusInfoLength)
-{
-    HINTERNET hHttpSession;
-    LPVOID lpvNewInfo = NULL;
-
-    if( !hdr->lpfnStatusCB )
-        return;
-
-    /* the IE5 version of wininet does not
-       send callbacks if dwContext is zero */
-    if( !dwContext )
-        return;
-
-    hHttpSession = WININET_FindHandle( hdr );
-    if( !hHttpSession ) {
-	TRACE(" Could not convert header '%p' into a handle !\n", hdr);
-        return;
-    }
-
-    lpvNewInfo = lpvStatusInfo;
-    if(!(hdr->dwInternalFlags & INET_CALLBACKW)) {
-        switch(dwInternetStatus)
-        {
-        case INTERNET_STATUS_RESOLVING_NAME:
-        case INTERNET_STATUS_REDIRECT:
-            lpvNewInfo = WININET_strdup_WtoA(lpvStatusInfo);
-        }
-    }
-    
-    TRACE(" callback(%p) (%08lx (%p), %08lx, %ld (%s), %p, %ld)\n",
-	  hdr->lpfnStatusCB, (DWORD) hHttpSession, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus),
-	  lpvNewInfo, dwStatusInfoLength);
-    
-    hdr->lpfnStatusCB(hHttpSession, dwContext, dwInternetStatus,
-                      lpvNewInfo, dwStatusInfoLength);
-
-    TRACE(" end callback().\n");
-
-    if(lpvNewInfo != lpvStatusInfo)
-        HeapFree(GetProcessHeap(), 0, lpvNewInfo);
-
-    WININET_Release( hdr );
-}
-
-
-
-VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext,
-                       DWORD dwInternetStatus, LPVOID lpvStatusInfo,
-                       DWORD dwStatusInfoLength)
-{
-    TRACE("(%p, %08lx, %ld (%s), %p, %ld): %sasync call with callback %p\n",
-	  hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus),
-	  lpvStatusInfo, dwStatusInfoLength,
-	  hdr->dwFlags & INTERNET_FLAG_ASYNC ? "" : "non ",
-	  hdr->lpfnStatusCB);
-    
-    if (!(hdr->lpfnStatusCB))
-	return;
-    
-    if (hdr->dwFlags & INTERNET_FLAG_ASYNC)
-    {
-	WORKREQUEST workRequest;
-	struct WORKREQ_SENDCALLBACK *req;
-	void *lpvStatusInfo_copy = lpvStatusInfo;
-
-	if (lpvStatusInfo)
-	{
-	    lpvStatusInfo_copy = HeapAlloc(GetProcessHeap(), 0, dwStatusInfoLength);
-	    memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength);
-	}
-
-	workRequest.asyncall = SENDCALLBACK;
-	workRequest.hdr = WININET_AddRef( hdr );
-	req = &workRequest.u.SendCallback;
-	req->dwContext = dwContext;
-	req->dwInternetStatus = dwInternetStatus;
-	req->lpvStatusInfo = lpvStatusInfo_copy;
-	req->dwStatusInfoLength = dwStatusInfoLength;
-	
-	INTERNET_AsyncCall(&workRequest);
-    }
-    else
-	SendSyncCallback(hdr, dwContext, dwInternetStatus,
-			 lpvStatusInfo, dwStatusInfoLength);
-}

lib/wininet/wininet.spec

@@ -1,245 +0,0 @@
-101 stub -noname DoConnectoidsExist
-102 stub -noname GetDiskInfoA
-103 stub -noname PerformOperationOverUrlCacheA
-104 stub -noname HttpCheckDavComplianceA
-105 stub -noname HttpCheckDavComplianceW
-108 stub -noname ImportCookieFileA
-109 stub -noname ExportCookieFileA
-110 stub -noname ImportCookieFileW
-111 stub -noname ExportCookieFileW
-112 stub -noname IsProfilesEnabled
-116 stub -noname IsDomainlegalCookieDomainA
-117 stub -noname IsDomainLegalCookieDomainW
-118 stub -noname FindP3PPolicySymbol
-120 stub -noname MapResourceToPolicy
-121 stub -noname GetP3PPolicy
-122 stub -noname FreeP3PObject
-123 stub -noname GetP3PRequestStatus
-
-@ stdcall InternetInitializeAutoProxyDll(long)
-@ stub ShowCertificate
-@ stdcall CommitUrlCacheEntryA(str str long long long long long str long str str)
-@ stdcall CommitUrlCacheEntryW(wstr wstr long long long long long wstr long wstr wstr)
-@ stdcall CreateMD5SSOHash(wstr wstr wstr ptr)
-@ stdcall CreateUrlCacheContainerA(long long long long long long long long)
-@ stdcall CreateUrlCacheContainerW(long long long long long long long long)
-@ stdcall CreateUrlCacheEntryA(str long str ptr long)
-@ stdcall CreateUrlCacheEntryW(wstr long wstr ptr long)
-@ stdcall CreateUrlCacheGroup(long ptr)
-@ stdcall DeleteIE3Cache(ptr ptr str long)
-@ stdcall DeleteUrlCacheContainerA(long long)
-@ stdcall DeleteUrlCacheContainerW(long long)
-@ stdcall DeleteUrlCacheEntry(str) DeleteUrlCacheEntryA
-@ stdcall DeleteUrlCacheEntryA(str)
-@ stdcall DeleteUrlCacheEntryW(wstr)
-@ stdcall DeleteUrlCacheGroup(double long ptr)
-@ stdcall DetectAutoProxyUrl(str long long)
-@ stdcall DllInstall(long ptr) WININET_DllInstall
-@ stdcall FindCloseUrlCache(long)
-@ stdcall FindFirstUrlCacheContainerA(ptr ptr ptr long)
-@ stdcall FindFirstUrlCacheContainerW(ptr ptr ptr long)
-@ stdcall FindFirstUrlCacheEntryA(str ptr ptr)
-@ stdcall FindFirstUrlCacheEntryExA(str long long double ptr ptr ptr ptr ptr)
-@ stdcall FindFirstUrlCacheEntryExW(wstr long long double ptr ptr ptr ptr ptr)
-@ stdcall FindFirstUrlCacheEntryW(wstr ptr ptr)
-@ stdcall FindFirstUrlCacheGroup(long long ptr long ptr ptr)
-@ stdcall FindNextUrlCacheContainerA(long ptr ptr)
-@ stdcall FindNextUrlCacheContainerW(long ptr ptr)
-@ stdcall FindNextUrlCacheEntryA(long ptr ptr)
-@ stdcall FindNextUrlCacheEntryExA(long ptr ptr ptr ptr ptr)
-@ stdcall FindNextUrlCacheEntryExW(long ptr ptr ptr ptr ptr)
-@ stdcall FindNextUrlCacheEntryW(long ptr ptr)
-@ stdcall FindNextUrlCacheGroup(long ptr ptr)
-@ stub ForceNexusLookup
-@ stub ForceNexusLookupExW
-@ stub FreeUrlCacheSpaceA
-@ stub FreeUrlCacheSpaceW
-@ stdcall FtpCommandA(long long long str ptr ptr)
-@ stdcall FtpCommandW(long long long wstr ptr ptr)
-@ stdcall FtpCreateDirectoryA(ptr str)
-@ stdcall FtpCreateDirectoryW(ptr wstr)
-@ stdcall FtpDeleteFileA(ptr str)
-@ stdcall FtpDeleteFileW(ptr wstr)
-@ stdcall FtpFindFirstFileA(ptr str ptr long long)
-@ stdcall FtpFindFirstFileW(ptr wstr ptr long long)
-@ stdcall FtpGetCurrentDirectoryA(ptr str ptr)
-@ stdcall FtpGetCurrentDirectoryW(ptr wstr ptr)
-@ stdcall FtpGetFileA(ptr str str long long long long)
-@ stub FtpGetFileEx
-@ stdcall FtpGetFileSize(long ptr)
-@ stdcall FtpGetFileW(ptr wstr wstr long long long long)
-@ stdcall FtpOpenFileA(ptr str long long long)
-@ stdcall FtpOpenFileW(ptr wstr long long long)
-@ stdcall FtpPutFileA(ptr str str long long)
-@ stub FtpPutFileEx
-@ stdcall FtpPutFileW(ptr wstr wstr long long)
-@ stdcall FtpRemoveDirectoryA(ptr str)
-@ stdcall FtpRemoveDirectoryW(ptr wstr)
-@ stdcall FtpRenameFileA(ptr str str)
-@ stdcall FtpRenameFileW(ptr wstr wstr)
-@ stdcall FtpSetCurrentDirectoryA(ptr str)
-@ stdcall FtpSetCurrentDirectoryW(ptr wstr)
-@ stdcall GetUrlCacheConfigInfoA(ptr ptr long)
-@ stdcall GetUrlCacheConfigInfoW(ptr ptr long)
-@ stdcall GetUrlCacheEntryInfoA(str ptr long)
-@ stdcall GetUrlCacheEntryInfoExA(str ptr ptr str ptr ptr long)
-@ stdcall GetUrlCacheEntryInfoExW(wstr ptr ptr wstr ptr ptr long)
-@ stdcall GetUrlCacheEntryInfoW(wstr ptr long)
-@ stdcall GetUrlCacheGroupAttributeA(double long long ptr ptr ptr)
-@ stdcall GetUrlCacheGroupAttributeW(double long long ptr ptr ptr)
-@ stub GetUrlCacheHeaderData
-@ stdcall GopherCreateLocatorA(str long str str long str ptr)
-@ stdcall GopherCreateLocatorW(wstr long wstr wstr long wstr ptr)
-@ stdcall GopherFindFirstFileA(ptr str str ptr long long)
-@ stdcall GopherFindFirstFileW(ptr wstr wstr ptr long long)
-@ stdcall GopherGetAttributeA(ptr str str ptr long ptr ptr long)
-@ stdcall GopherGetAttributeW(ptr wstr wstr ptr long ptr ptr long)
-@ stdcall GopherGetLocatorTypeA(str ptr)
-@ stdcall GopherGetLocatorTypeW(wstr ptr)
-@ stdcall GopherOpenFileA(ptr str str long long)
-@ stdcall GopherOpenFileW(ptr wstr wstr long long)
-@ stdcall HttpAddRequestHeadersA(ptr str long long)
-@ stdcall HttpAddRequestHeadersW(ptr wstr long long)
-@ stub HttpCheckDavCompliance
-@ stdcall HttpEndRequestA(ptr ptr long long)
-@ stdcall HttpEndRequestW(ptr ptr long long)
-@ stdcall HttpOpenRequestA(ptr str str str str ptr long long)
-@ stdcall HttpOpenRequestW(ptr wstr wstr wstr wstr ptr long long)
-@ stdcall HttpQueryInfoA(ptr long ptr ptr ptr)
-@ stdcall HttpQueryInfoW(ptr long ptr ptr ptr)
-@ stdcall HttpSendRequestA(ptr str long ptr long)
-@ stdcall HttpSendRequestExA(long ptr ptr long long)
-@ stdcall HttpSendRequestExW(long ptr ptr long long)
-@ stdcall HttpSendRequestW(ptr wstr long ptr long)
-@ stub IncrementUrlCacheHeaderData
-@ stub InternetAlgIdToStringA
-@ stub InternetAlgIdToStringW
-@ stdcall InternetAttemptConnect(long)
-@ stdcall InternetAutodial(long ptr)
-@ stub InternetAutodialCallback
-@ stdcall InternetAutodialHangup(long)
-@ stdcall InternetCanonicalizeUrlA(str str ptr long)
-@ stdcall InternetCanonicalizeUrlW(wstr wstr ptr long)
-@ stdcall InternetCheckConnectionA(ptr long long)
-@ stdcall InternetCheckConnectionW(ptr long long)
-@ stdcall InternetClearAllPerSiteCookieDecisions()
-@ stdcall InternetCloseHandle(long)
-@ stdcall InternetCombineUrlA(str str str ptr long)
-@ stdcall InternetCombineUrlW(wstr wstr wstr ptr long)
-@ stdcall InternetConfirmZoneCrossing(long str str long) InternetConfirmZoneCrossingA
-@ stdcall InternetConfirmZoneCrossingA(long str str long)
-@ stdcall InternetConfirmZoneCrossingW(long wstr wstr long)
-@ stdcall InternetConnectA(ptr str long str str long long long)
-@ stdcall InternetConnectW(ptr wstr long wstr wstr long long long)
-@ stdcall InternetCrackUrlA(str long long ptr)
-@ stdcall InternetCrackUrlW(wstr long long ptr)
-@ stdcall InternetCreateUrlA(ptr long ptr ptr)
-@ stdcall InternetCreateUrlW(ptr long ptr ptr)
-@ stub InternetDebugGetLocalTime
-@ stdcall InternetDial(long str long ptr long) InternetDialA
-@ stdcall InternetDialA(long str long ptr long)
-@ stdcall InternetDialW(long wstr long ptr long)
-@ stdcall InternetEnumPerSiteCookieDecisionA(ptr ptr ptr long)
-@ stdcall InternetEnumPerSiteCookieDecisionW(ptr ptr ptr long)
-@ stdcall InternetErrorDlg(long long long long ptr)
-@ stdcall InternetFindNextFileA(ptr ptr)
-@ stdcall InternetFindNextFileW(ptr ptr)
-@ stub InternetFortezzaCommand
-@ stub InternetGetCertByURL
-@ stub InternetGetCertByURLA
-@ stdcall InternetGetConnectedState(ptr long)
-@ stdcall InternetGetConnectedStateEx(ptr ptr long long) InternetGetConnectedStateExA
-@ stdcall InternetGetConnectedStateExA(ptr ptr long long)
-@ stdcall InternetGetConnectedStateExW(ptr ptr long long)
-@ stdcall InternetGetCookieA(str str ptr long)
-@ stdcall InternetGetCookieExA(str str ptr ptr long ptr)
-@ stdcall InternetGetCookieExW(wstr wstr ptr ptr long ptr)
-@ stdcall InternetGetCookieW(wstr wstr ptr long)
-@ stdcall InternetGetLastResponseInfoA(ptr ptr ptr)
-@ stdcall InternetGetLastResponseInfoW(ptr ptr ptr)
-@ stdcall InternetGetPerSiteCookieDecisionA(str ptr)
-@ stdcall InternetGetPerSiteCookieDecisionW(wstr ptr)
-@ stdcall InternetGoOnline(str long long) InternetGoOnlineA
-@ stdcall InternetGoOnlineA(str long long)
-@ stdcall InternetGoOnlineW(wstr long long)
-@ stdcall InternetHangUp(long long)
-@ stdcall InternetLockRequestFile(ptr ptr)
-@ stdcall InternetOpenA(str long str str long)
-@ stub InternetOpenServerPushParse
-@ stdcall InternetOpenW(wstr long wstr wstr long)
-@ stdcall InternetOpenUrlA(ptr str str long long long)
-@ stdcall InternetOpenUrlW(ptr wstr wstr long long long)
-@ stdcall InternetQueryDataAvailable(ptr ptr long long)
-@ stub InternetQueryFortezzaStatus
-@ stdcall InternetQueryOptionA(ptr long ptr ptr)
-@ stdcall InternetQueryOptionW(ptr long ptr ptr)
-@ stdcall InternetReadFile(ptr ptr long ptr)
-@ stdcall InternetReadFileExA(ptr ptr long long)
-@ stdcall InternetReadFileExW(ptr ptr long long)
-@ stub InternetSecurityProtocolToStringA
-@ stub InternetSecurityProtocolToStringW
-@ stub InternetServerPushParse
-@ stdcall InternetSetCookieA(str str str)
-@ stdcall InternetSetCookieExA(str str str long ptr)
-@ stdcall InternetSetCookieExW(wstr wstr wstr long ptr)
-@ stdcall InternetSetCookieW(wstr wstr wstr)
-@ stub InternetSetDialState
-@ stub InternetSetDialStateA
-@ stub InternetSetDialStateW
-@ stdcall InternetSetFilePointer(ptr long ptr long long)
-@ stdcall InternetSetOptionA(ptr long ptr long)
-@ stdcall InternetSetOptionExA(ptr long ptr long long)
-@ stdcall InternetSetOptionExW(ptr long ptr long long)
-@ stdcall InternetSetOptionW(ptr long ptr long)
-@ stdcall InternetSetPerSiteCookieDecisionA(str long)
-@ stdcall InternetSetPerSiteCookieDecisionW(wstr long)
-@ stdcall InternetSetStatusCallback(ptr ptr) InternetSetStatusCallbackA
-@ stdcall InternetSetStatusCallbackA(ptr ptr)
-@ stdcall InternetSetStatusCallbackW(ptr ptr)
-@ stub InternetShowSecurityInfoByURL
-@ stub InternetShowSecurityInfoByURLA
-@ stub InternetShowSecurityInfoByURLW
-@ stdcall InternetTimeFromSystemTime(ptr long ptr long) InternetTimeFromSystemTimeA
-@ stdcall InternetTimeFromSystemTimeA(ptr long ptr long)
-@ stdcall InternetTimeFromSystemTimeW(ptr long ptr long)
-@ stdcall InternetTimeToSystemTime(str ptr long) InternetTimeToSystemTimeA
-@ stdcall InternetTimeToSystemTimeA(str ptr long)
-@ stdcall InternetTimeToSystemTimeW(wstr ptr long)
-@ stdcall InternetUnlockRequestFile(ptr)
-@ stdcall InternetWriteFile(ptr ptr long ptr)
-@ stub InternetWriteFileExA
-@ stub InternetWriteFileExW
-@ stdcall IsHostInProxyBypassList(long str long)
-@ stub IsUrlCacheEntryExpiredA
-@ stub IsUrlCacheEntryExpiredW
-@ stub LoadUrlCacheContent
-@ stub ParseX509EncodedCertificateForListBoxEntry
-@ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr)
-@ stub PrivacySetZonePreferenceW # (long long long wstr)
-@ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long)
-@ stub RegisterUrlCacheNotification
-@ stdcall ResumeSuspendedDownload(long long)
-@ stdcall RetrieveUrlCacheEntryFileA(str ptr ptr long)
-@ stdcall RetrieveUrlCacheEntryFileW(wstr ptr ptr long)
-@ stdcall RetrieveUrlCacheEntryStreamA(str ptr ptr long long)
-@ stdcall RetrieveUrlCacheEntryStreamW(wstr ptr ptr long long)
-@ stub RunOnceUrlCache
-@ stdcall SetUrlCacheConfigInfoA(ptr long)
-@ stdcall SetUrlCacheConfigInfoW(ptr long)
-@ stdcall SetUrlCacheEntryGroup(str long double ptr long ptr) SetUrlCacheEntryGroupA
-@ stdcall SetUrlCacheEntryGroupA(str long double ptr long ptr)
-@ stdcall SetUrlCacheEntryGroupW(wstr long double ptr long ptr)
-@ stdcall SetUrlCacheEntryInfoA(str ptr long)
-@ stdcall SetUrlCacheEntryInfoW(wstr ptr long)
-@ stdcall SetUrlCacheGroupAttributeA(double long long ptr ptr)
-@ stdcall SetUrlCacheGroupAttributeW(double long long ptr ptr)
-@ stub SetUrlCacheHeaderData
-@ stub ShowClientAuthCerts
-@ stub ShowSecurityInfo
-@ stub ShowX509EncodedCertificate
-@ stdcall UnlockUrlCacheEntryFile(str long) UnlockUrlCacheEntryFileA
-@ stdcall UnlockUrlCacheEntryFileA(str long)
-@ stdcall UnlockUrlCacheEntryFileW(wstr long)
-@ stdcall UnlockUrlCacheEntryStream(ptr long)
-@ stub UpdateUrlCacheContentPath
-@ stub UrlZonesDetach

lib/wininet/wininet_Cs.rc

@@ -1,41 +0,0 @@
-/*
- * Czech resources for wininet
- * Copyright 2003 Mike McCormack for CodeWeavers
- * Copyright 2004 David Kredba
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zad<61>n<EFBFBD> s<><73>ov<6F>ho hesla"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Pros<6F>m zadejte sv<73> u<>iv. jm<6A>no a heslo:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Pln<6C> jm<6A>no", -1, 40, 46, 50, 10
- LTEXT "U<>ivatel", -1, 40, 66, 50, 10
- LTEXT "Heslo", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Ulo<6C>it toto heslo (nebezpe<70>n<EFBFBD>) ?", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Storno", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}

lib/wininet/wininet_De.rc

@@ -1,44 +0,0 @@
-/*
- * Copyright 2004 Henning Gerhardt
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Netzwerkkennung eingeben"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Geben Sie Benutzernamen und Kennwort ein:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Realm", -1, 40, 46, 50, 10
- LTEXT "Ben&utzername", -1, 40, 66, 50, 10
- LTEXT "Kenn&wort", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "Dieses &Kennwort speichern (unsicher)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_LANCONNECTION "LAN Verbindung"
-}

lib/wininet/wininet_En.rc

@@ -1,44 +0,0 @@
-/*
- * Copyright 2003 Mike McCormack for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter Network Password"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Please enter your username and password:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Realm", -1, 40, 46, 50, 10
- LTEXT "User", -1, 40, 66, 50, 10
- LTEXT "Password", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_LANCONNECTION "LAN Connection"
-}

lib/wininet/wininet_Es.rc

@@ -1,44 +0,0 @@
-/*
- * Copyright 2003, 2005 Jos<6F> Manuel Ferrer Ortiz
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Introduzca contrase<73>a de red"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Por favor introduzca su nombre de usuario y contrase<73>a:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Dominio", -1, 40, 46, 50, 10
- LTEXT "Usuario", -1, 40, 66, 50, 10
- LTEXT "Contrase<73>a", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Guardar esta contrase<73>a (inseguro)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_LANCONNECTION "Conexi<78>n LAN"
-}

lib/wininet/wininet_Fr.rc

@@ -1,49 +0,0 @@
-/*
- * Wininet
- * French language support
- *
- * Copyright 2003 Mike McCormack for CodeWeavers
- * Copyright 2003 Vincent B<>ron
- * Copyright 2005 Jonathan Ernst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Entrez le mot de passe r<>seau"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Entrez votre nom d'utilisateur et votre mot de passe :", -1, 40, 6, 150, 15
- LTEXT "Mandataire", -1, 40, 26, 50, 10
- LTEXT "Domaine", -1, 40, 46, 50, 10
- LTEXT "Utilisateur", -1, 40, 66, 50, 10
- LTEXT "Mot de passe", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Enregistrer ce mot de passe (risqu<71>)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_LANCONNECTION "Connexion LAN"
-}

lib/wininet/wininet_It.rc

@@ -1,40 +0,0 @@
-/*
- * Copyright 2003 Mike McCormack for CodeWeavers
- * Copyright 2003 Ivan Leo Puoti
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Inserire la password di rete"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Inserire il nome utente e la password:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Realm", -1, 40, 46, 50, 10
- LTEXT "Utente", -1, 40, 66, 50, 10
- LTEXT "Password", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Salva questa password (insicuro)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}

lib/wininet/wininet_Ja.rc

@@ -1,39 +0,0 @@
-/*
- * Copyright 2003 Mike McCormack for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22>l<EFBFBD>b<EFBFBD>g<EFBFBD><67><EFBFBD>[<5B>N<EFBFBD>p<EFBFBD>X<EFBFBD><58><EFBFBD>[<5B>h<EFBFBD>̓<EFBFBD><CC93><EFBFBD>"
-FONT 9, "MS UI Gothic"
-{
- LTEXT "<22><><EFBFBD>[<5B>U<EFBFBD><55><EFBFBD>ƃp<C683>X<EFBFBD><58><EFBFBD>[<5B>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82>ĉ<EFBFBD><C489><EFBFBD><EFBFBD><EFBFBD>:", -1, 40, 6, 150, 15
- LTEXT "<22>v<EFBFBD><76><EFBFBD>L<EFBFBD>V", -1, 40, 26, 50, 10
- LTEXT "<22>n<EFBFBD><6E>", -1, 40, 46, 50, 10
- LTEXT "<22><><EFBFBD>[<5B>U<EFBFBD><55>", -1, 40, 66, 50, 10
- LTEXT "<22>p<EFBFBD>X<EFBFBD><58><EFBFBD>[<5B>h", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "<22>p<EFBFBD>X<EFBFBD><58><EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>ۑ<EFBFBD><DB91><EFBFBD><EFBFBD><EFBFBD>(&S)(<28>Z<EFBFBD>L<EFBFBD><4C><EFBFBD>A<EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "<22>L<EFBFBD><4C><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD><5A>", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}

lib/wininet/wininet_Nl.rc

@@ -1,41 +0,0 @@
-/*
- * wininet (Dutch resources)
- *
- * Copyright 2003 Hans Leidekker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
-
-IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Netwerkwachtwoord invoeren"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "Voer uw gebruikersnaam en wachtwoord in:", -1, 40, 6, 150, 15
- LTEXT "Proxy", -1, 40, 26, 50, 10
- LTEXT "Realm", -1, 40, 46, 50, 10
- LTEXT "Gebruikersnaam", -1, 40, 66, 50, 10
- LTEXT "Wachtwoord", -1, 40, 86, 50, 10
- LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
- LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
- EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP
- EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD
- CHECKBOX "&Wachtwoord opslaan (onveilig)", IDC_SAVEPASSWORD,
-           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP
-}