From 8cb3ec617fc5e173e8bbf26b0f47002fc20d44f7 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 10 Mar 2013 11:44:04 +0000
Subject: [PATCH 01/61] [NTOSKRNL] Implement Ke386SetGdtEntryBase and
 KiSetTebBase and use it in the appropriate places.

svn path=/trunk/; revision=58460
---
 reactos/ntoskrnl/include/internal/i386/ke.h |  17 ++
 reactos/ntoskrnl/ke/i386/thrdini.c          |  11 +-
 reactos/ntoskrnl/ke/i386/v86vdm.c           | 180 +++++++++-----------
 3 files changed, 103 insertions(+), 105 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index 3ae219ac5b8..2830d6aa21e 100644
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -279,6 +279,23 @@ KiRundownThread(IN PKTHREAD Thread)
 #endif
 }
 
+FORCEINLINE
+VOID
+Ke386SetGdtEntryBase(PKGDTENTRY GdtEntry, PVOID BaseAddress)
+{
+    GdtEntry->BaseLow = (USHORT)((ULONG_PTR)BaseAddress & 0xFFFF);
+    GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)BaseAddress >> 16);
+    GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)BaseAddress >> 24);
+}
+
+FORCEINLINE
+VOID
+KiSetTebBase(PKPCR Pcr, PVOID TebAddress)
+{
+    Pcr->NtTib.Self = TebAddress;
+    Ke386SetGdtEntryBase(&Pcr->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)], TebAddress);
+}
+
 VOID
 FASTCALL
 Ki386InitializeTss(
diff --git a/reactos/ntoskrnl/ke/i386/thrdini.c b/reactos/ntoskrnl/ke/i386/thrdini.c
index 8ee631428d1..b254caf8557 100644
--- a/reactos/ntoskrnl/ke/i386/thrdini.c
+++ b/reactos/ntoskrnl/ke/i386/thrdini.c
@@ -332,7 +332,6 @@ KiSwapContextExit(IN PKTHREAD OldThread,
 {
     PKIPCR Pcr = (PKIPCR)KeGetPcr();
     PKPROCESS OldProcess, NewProcess;
-    PKGDTENTRY GdtEntry;
     PKTHREAD NewThread;
 
     /* We are on the new thread stack now */
@@ -347,7 +346,7 @@ KiSwapContextExit(IN PKTHREAD OldThread,
         if (*(PULONGLONG)&OldProcess->LdtDescriptor != *(PULONGLONG)&NewProcess->LdtDescriptor)
         {
             DPRINT1("LDT switch not implemented\n");
-            ASSERT(FALSE);            
+            ASSERT(FALSE);
         }
 
         /* Switch address space and flush TLB */
@@ -358,11 +357,7 @@ KiSwapContextExit(IN PKTHREAD OldThread,
     Ke386SetGs(0);
 
     /* Set the TEB */
-    Pcr->NtTib.Self = (PVOID)NewThread->Teb;
-    GdtEntry = &Pcr->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)];
-    GdtEntry->BaseLow = (USHORT)((ULONG_PTR)NewThread->Teb & 0xFFFF);
-    GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)NewThread->Teb >> 16);
-    GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24);
+    KiSetTebBase((PKPCR)Pcr, NewThread->Teb);
 
     /* Set new TSS fields */
     Pcr->TSS->Esp0 = (ULONG_PTR)NewThread->InitialStack;
@@ -491,7 +486,7 @@ KiDispatchInterrupt(VOID)
         KiQuantumEnd();
     }
     else if (Prcb->NextThread)
-    {       
+    {
         /* Capture current thread data */
         OldThread = Prcb->CurrentThread;
         NewThread = Prcb->NextThread;
diff --git a/reactos/ntoskrnl/ke/i386/v86vdm.c b/reactos/ntoskrnl/ke/i386/v86vdm.c
index ec9c08d29db..cb73f07d6c6 100644
--- a/reactos/ntoskrnl/ke/i386/v86vdm.c
+++ b/reactos/ntoskrnl/ke/i386/v86vdm.c
@@ -45,14 +45,14 @@ KiVdmUnhandledOpcode(INTO);
 KiVdmUnhandledOpcode(INV);
 
 /* OPCODE HANDLERS ************************************************************/
-    
+
 BOOLEAN
 FASTCALL
 KiVdmOpcodePUSHF(IN PKTRAP_FRAME TrapFrame,
                  IN ULONG Flags)
 {
     ULONG Esp, V86EFlags, TrapEFlags;
-    
+
     /* Check for VME support */
     ASSERT(KeI386VirtualIntExtensions == FALSE);
 
@@ -67,10 +67,10 @@ KiVdmOpcodePUSHF(IN PKTRAP_FRAME TrapFrame,
     /* Add in those flags if they exist, and add in the IOPL flag */
     V86EFlags |= TrapEFlags;
     V86EFlags |= EFLAGS_IOPL;
-    
+
     /* Build flat ESP */
     Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp;
-    
+
     /* Check for OPER32 */
     if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32)
     {
@@ -84,11 +84,11 @@ KiVdmOpcodePUSHF(IN PKTRAP_FRAME TrapFrame,
         Esp -= 2;
         *(PUSHORT)Esp = (USHORT)V86EFlags;
     }
-    
+
     /* Set new ESP and EIP */
     TrapFrame->HardwareEsp = Esp - (TrapFrame->HardwareSegSs << 4);
     TrapFrame->Eip += KiVdmGetInstructionSize(Flags);
-    
+
     /* We're done */
     return TRUE;
 }
@@ -99,10 +99,10 @@ KiVdmOpcodePOPF(IN PKTRAP_FRAME TrapFrame,
                 IN ULONG Flags)
 {
     ULONG Esp, V86EFlags, EFlags, TrapEFlags;
-    
+
     /* Build flat ESP */
     Esp = (TrapFrame->HardwareSegSs << 4) + (USHORT)TrapFrame->HardwareEsp;
-    
+
     /* Check for OPER32 */
     if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32)
     {
@@ -116,22 +116,22 @@ KiVdmOpcodePOPF(IN PKTRAP_FRAME TrapFrame,
         EFlags = *(PUSHORT)Esp;
         Esp += 2;
     }
-    
+
     /* Set new ESP */
     TrapFrame->HardwareEsp = Esp - (TrapFrame->HardwareSegSs << 4);
-    
+
     /* Mask out IOPL from the flags */
     EFlags &= ~EFLAGS_IOPL;
-    
+
     /* Save the V86 flags, but mask out the nested task flag */
     V86EFlags = EFlags & ~EFLAGS_NESTED_TASK;
-    
+
     /* Now leave only alignment, nested task and interrupt flag */
     EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK);
-    
+
     /* Get trap EFlags */
     TrapEFlags = TrapFrame->EFlags;
-                
+
     /* Check for VME support */
     ASSERT(KeI386VirtualIntExtensions == FALSE);
 
@@ -143,16 +143,16 @@ KiVdmOpcodePOPF(IN PKTRAP_FRAME TrapFrame,
 
     /* Check if ESP0 needs to be fixed up */
     if (TrapEFlags & EFLAGS_V86_MASK) Ki386AdjustEsp0(TrapFrame);
-    
+
     /* Update the V8086 EFlags state */
     KiVdmClearVdmEFlags(EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK);
     KiVdmSetVdmEFlags(EFlags);
-   
+
     /* FIXME: Check for VDM interrupts */
-    
+
     /* Update EIP */
     TrapFrame->Eip += KiVdmGetInstructionSize(Flags);
-    
+
     /* We're done */
     return TRUE;
 }
@@ -163,63 +163,63 @@ KiVdmOpcodeINTnn(IN PKTRAP_FRAME TrapFrame,
                  IN ULONG Flags)
 {
     ULONG Esp, V86EFlags, TrapEFlags, Eip, Interrupt;
-    
+
     /* Read trap frame EFlags */
     TrapEFlags = TrapFrame->EFlags;
-    
+
     /* Remove interrupt flag from V8086 EFlags */
     V86EFlags = *KiNtVdmState;
     KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK);
-    
+
     /* Keep only alignment and interrupt flag from the V8086 state */
     V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_INTERRUPT_MASK);
-    
+
     /* Check for VME support */
     ASSERT(KeI386VirtualIntExtensions == FALSE);
-    
+
     /* Mask in the relevant V86 EFlags into the trap flags */
     V86EFlags |= (TrapEFlags & ~EFLAGS_INTERRUPT_MASK);
-    
+
     /* And mask out the VIF, nested task and TF flag from the trap flags */
     TrapFrame->EFlags = TrapEFlags &~ (EFLAGS_VIF | EFLAGS_NESTED_TASK | EFLAGS_TF);
-    
+
     /* Add the IOPL flag to the local trap flags */
     V86EFlags |= EFLAGS_IOPL;
-    
+
     /* Build flat ESP */
     Esp = (TrapFrame->HardwareSegSs << 4) + TrapFrame->HardwareEsp;
-    
+
     /* Push EFlags */
     Esp -= 2;
     *(PUSHORT)(Esp) = (USHORT)V86EFlags;
-    
+
     /* Push CS */
     Esp -= 2;
     *(PUSHORT)(Esp) = (USHORT)TrapFrame->SegCs;
-    
+
     /* Push IP */
     Esp -= 2;
     *(PUSHORT)(Esp) = (USHORT)TrapFrame->Eip + KiVdmGetInstructionSize(Flags) + 1;
-    
+
     /* Update ESP */
     TrapFrame->HardwareEsp = (USHORT)Esp;
-    
+
     /* Get flat EIP */
     Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip;
-    
+
     /* Now get the *next* EIP address (current is original + the count - 1) */
     Eip += KiVdmGetInstructionSize(Flags);
-    
+
     /* Now read the interrupt number */
     Interrupt = *(PUCHAR)Eip;
-        
+
     /* Read the EIP from its IVT entry */
     Interrupt = *(PULONG)(Interrupt * 4);
     TrapFrame->Eip = (USHORT)Interrupt;
-    
+
     /* Now get the CS segment */
     Interrupt = (USHORT)(Interrupt >> 16);
-    
+
     /* Check if the trap was not V8086 trap */
     if (!(TrapFrame->EFlags & EFLAGS_V86_MASK))
     {
@@ -241,7 +241,7 @@ KiVdmOpcodeINTnn(IN PKTRAP_FRAME TrapFrame,
         /* Set IVT CS */
         TrapFrame->SegCs = Interrupt;
     }
-    
+
     /* We're done */
     return TRUE;
 }
@@ -255,17 +255,17 @@ KiVdmOpcodeIRET(IN PKTRAP_FRAME TrapFrame,
 
     /* Build flat ESP */
     Esp = (TrapFrame->HardwareSegSs << 4) + TrapFrame->HardwareEsp;
-    
+
     /* Check for OPER32 */
     if (KiVdmGetPrefixFlags(Flags) & PFX_FLAG_OPER32)
     {
         /* Build segmented EIP */
         TrapFrame->Eip = *(PULONG)Esp;
         TrapFrame->SegCs = *(PUSHORT)(Esp + 4);
-        
+
         /* Set new ESP */
         TrapFrame->HardwareEsp += 12;
-        
+
         /* Get EFLAGS */
         EFlags = *(PULONG)(Esp + 8);
     }
@@ -281,28 +281,28 @@ KiVdmOpcodeIRET(IN PKTRAP_FRAME TrapFrame,
         /* Get EFLAGS */
         EFlags = *(PUSHORT)(Esp + 4);
     }
-    
+
     /* Mask out EFlags */
     EFlags &= ~(EFLAGS_IOPL + EFLAGS_VIF + EFLAGS_NESTED_TASK + EFLAGS_VIP);
     V86EFlags = EFlags;
-    
+
     /* Check for VME support */
     ASSERT(KeI386VirtualIntExtensions == FALSE);
-    
+
     /* Add V86 and Interrupt flag */
     EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK;
-    
+
     /* Update EFlags in trap frame */
     TrapEFlags = TrapFrame->EFlags;
     TrapFrame->EFlags = (TrapFrame->EFlags & EFLAGS_VIP) | EFlags;
-    
+
     /* Check if ESP0 needs to be fixed up */
     if (!(TrapEFlags & EFLAGS_V86_MASK)) Ki386AdjustEsp0(TrapFrame);
-    
+
     /* Update the V8086 EFlags state */
     KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK);
     KiVdmSetVdmEFlags(V86EFlags);
-    
+
     /* Build flat EIP and check if this is the BOP instruction */
     Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip;
     if (*(PUSHORT)Eip == 0xC4C4)
@@ -315,7 +315,7 @@ KiVdmOpcodeIRET(IN PKTRAP_FRAME TrapFrame,
         /* FIXME: Check for VDM interrupts */
        DPRINT("FIXME: Check for VDM interrupts\n");
     }
-    
+
     /* We're done */
     return TRUE;
 }
@@ -324,16 +324,16 @@ BOOLEAN
 FASTCALL
 KiVdmOpcodeCLI(IN PKTRAP_FRAME TrapFrame,
                IN ULONG Flags)
-{       
+{
     /* Check for VME support */
     ASSERT(KeI386VirtualIntExtensions == FALSE);
 
     /* Disable interrupts */
     KiVdmClearVdmEFlags(EFLAGS_INTERRUPT_MASK);
-    
+
     /* Skip instruction */
     TrapFrame->Eip += KiVdmGetInstructionSize(Flags);
-    
+
     /* Done */
     return TRUE;
 }
@@ -348,10 +348,10 @@ KiVdmOpcodeSTI(IN PKTRAP_FRAME TrapFrame,
 
     /* Enable interrupts */
     KiVdmSetVdmEFlags(EFLAGS_INTERRUPT_MASK);
-    
+
     /* Skip instruction */
     TrapFrame->Eip += KiVdmGetInstructionSize(Flags);
-    
+
     /* Done */
     return TRUE;
 }
@@ -364,11 +364,11 @@ KiVdmHandleOpcode(IN PKTRAP_FRAME TrapFrame,
                   IN ULONG Flags)
 {
     ULONG Eip;
-    
+
     /* Get flat EIP of the *current* instruction (not the original EIP) */
     Eip = (TrapFrame->SegCs << 4) + TrapFrame->Eip;
     Eip += KiVdmGetInstructionSize(Flags) - 1;
-    
+
     /* Read the opcode entry */
     switch (*(PUCHAR)Eip)
     {
@@ -401,11 +401,11 @@ KiVdmHandleOpcode(IN PKTRAP_FRAME TrapFrame,
         case 0x9D:              return KiCallVdmHandler(POPF);
         case 0xCD:              return KiCallVdmHandler(INTnn);
         case 0xCE:              return KiCallVdmHandler(INTO);
-        case 0xCF:              return KiCallVdmHandler(IRET);   
-        case 0xE4:              return KiCallVdmHandler(INBimm);   
+        case 0xCF:              return KiCallVdmHandler(IRET);
+        case 0xE4:              return KiCallVdmHandler(INBimm);
         case 0xE5:              return KiCallVdmHandler(INWimm);
         case 0xE6:              return KiCallVdmHandler(OUTBimm);
-        case 0xE7:              return KiCallVdmHandler(OUTWimm);        
+        case 0xE7:              return KiCallVdmHandler(OUTWimm);
         case 0xEC:              return KiCallVdmHandler(INB);
         case 0xED:              return KiCallVdmHandler(INW);
         case 0xEE:              return KiCallVdmHandler(OUTB);
@@ -414,7 +414,7 @@ KiVdmHandleOpcode(IN PKTRAP_FRAME TrapFrame,
         case 0xFA:              return KiCallVdmHandler(CLI);
         case 0xFB:              return KiCallVdmHandler(STI);
         default:                return KiCallVdmHandler(INV);
-    }    
+    }
 }
 
 /* PREFIX HANDLER *************************************************************/
@@ -426,7 +426,7 @@ KiVdmOpcodePrefix(IN PKTRAP_FRAME TrapFrame,
 {
     /* Increase instruction size */
     Flags++;
-    
+
     /* Handle the next opcode */
     return KiVdmHandleOpcode(TrapFrame, Flags);
 }
@@ -450,37 +450,30 @@ FASTCALL
 KiExitV86Mode(IN PKTRAP_FRAME TrapFrame)
 {
     PKV8086_STACK_FRAME StackFrame;
-    PKGDTENTRY GdtEntry;
     PKTHREAD Thread;
     PKTRAP_FRAME PmTrapFrame;
     PKV86_FRAME V86Frame;
     PFX_SAVE_AREA NpxFrame;
-    
+
     /* Get the stack frame back */
     StackFrame = CONTAINING_RECORD(TrapFrame->Esi, KV8086_STACK_FRAME, V86Frame);
     PmTrapFrame = &StackFrame->TrapFrame;
     V86Frame = &StackFrame->V86Frame;
     NpxFrame = &StackFrame->NpxArea;
-    
+
     /* Copy the FPU frame back */
     Thread = KeGetCurrentThread();
     RtlCopyMemory(KiGetThreadNpxArea(Thread), NpxFrame, sizeof(FX_SAVE_AREA));
 
     /* Set initial stack back */
     Thread->InitialStack = (PVOID)((ULONG_PTR)V86Frame->ThreadStack + sizeof(FX_SAVE_AREA));
-    
+
     /* Set ESP0 back in the KTSS */
     KeGetPcr()->TSS->Esp0 = (ULONG_PTR)&PmTrapFrame->V86Es;
 
     /* Restore TEB addresses */
     Thread->Teb = V86Frame->ThreadTeb;
-    KeGetPcr()->NtTib.Self = V86Frame->PcrTeb;
-    
-    /* Setup real TEB descriptor */
-    GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)];
-    GdtEntry->BaseLow = (USHORT)((ULONG_PTR)Thread->Teb & 0xFFFF);
-    GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Thread->Teb >> 16);
-    GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Thread->Teb >> 24);
+    KiSetTebBase(KeGetPcr(), V86Frame->ThreadTeb);
 
     /* Enable interrupts and return a pointer to the trap frame */
     _enable();
@@ -492,7 +485,6 @@ FASTCALL
 KiEnterV86Mode(IN PKV8086_STACK_FRAME StackFrame)
 {
     PKTHREAD Thread;
-    PKGDTENTRY GdtEntry;
     PKTRAP_FRAME TrapFrame = &StackFrame->TrapFrame;
     PKV86_FRAME V86Frame = &StackFrame->V86Frame;
     PFX_SAVE_AREA NpxFrame = &StackFrame->NpxArea;
@@ -501,26 +493,26 @@ KiEnterV86Mode(IN PKV8086_STACK_FRAME StackFrame)
     TrapFrame->SegCs = KGDT_R0_CODE | RPL_MASK;
     TrapFrame->SegEs = TrapFrame->SegDs = TrapFrame->SegFs = TrapFrame->SegGs = 0;
     TrapFrame->ErrCode = 0;
-    
+
     /* Get the current thread's initial stack */
     Thread = KeGetCurrentThread();
     V86Frame->ThreadStack = KiGetThreadNpxArea(Thread);
-    
+
     /* Save TEB addresses */
     V86Frame->ThreadTeb = Thread->Teb;
     V86Frame->PcrTeb = KeGetPcr()->NtTib.Self;
-    
+
     /* Save return EIP */
     TrapFrame->Eip = (ULONG_PTR)Ki386BiosCallReturnAddress;
-    
+
     /* Save our stack (after the frames) */
     TrapFrame->Esi = (ULONG_PTR)V86Frame;
     TrapFrame->Edi = (ULONG_PTR)_AddressOfReturnAddress() + 4;
-    
+
     /* Sanitize EFlags and enable interrupts */
     TrapFrame->EFlags = __readeflags() & 0x60DD7;
     TrapFrame->EFlags |= EFLAGS_INTERRUPT_MASK;
-    
+
     /* Fill out the rest of the frame */
     TrapFrame->HardwareSegSs = KGDT_R3_DATA | RPL_MASK;
     TrapFrame->HardwareEsp = 0x11FFE;
@@ -529,38 +521,32 @@ KiEnterV86Mode(IN PKV8086_STACK_FRAME StackFrame)
 
     /* Set some debug fields if trap debugging is enabled */
     KiFillTrapFrameDebug(TrapFrame);
-    
+
     /* Disable interrupts */
     _disable();
-    
+
     /* Copy the thread's NPX frame */
     RtlCopyMemory(NpxFrame, V86Frame->ThreadStack, sizeof(FX_SAVE_AREA));
-    
+
     /* Clear exception list */
     KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END;
-    
+
     /* Set new ESP0 */
     KeGetPcr()->TSS->Esp0 = (ULONG_PTR)&TrapFrame->V86Es;
-                             
+
     /* Set new initial stack */
     Thread->InitialStack = V86Frame;
-        
+
     /* Set VDM TEB */
     Thread->Teb = (PTEB)TRAMPOLINE_TEB;
-    KeGetPcr()->NtTib.Self = (PVOID)TRAMPOLINE_TEB;
-    
-    /* Setup VDM TEB descriptor */
-    GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)];
-    GdtEntry->BaseLow = (USHORT)((ULONG_PTR)TRAMPOLINE_TEB & 0xFFFF);
-    GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)TRAMPOLINE_TEB >> 16);
-    GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)TRAMPOLINE_TEB >> 24);
-    
+    KiSetTebBase(KeGetPcr(), (PVOID)TRAMPOLINE_TEB);
+
     /* Enable interrupts */
     _enable();
- 
+
     /* Start VDM execution */
     NtVdmControl(VdmStartExecution, NULL);
-    
+
     /* Exit to V86 mode */
     KiEoiHelper(TrapFrame);
 }
@@ -585,14 +571,14 @@ Ke386SetIOPL(VOID)
     /* Convert to a context */
     Context.ContextFlags = CONTEXT_CONTROL;
     KeTrapFrameToContext(TrapFrame, NULL, &Context);
-    
+
     /* Set the IOPL flag */
     Context.EFlags |= EFLAGS_IOPL;
-    
+
     /* Convert back to a trap frame */
     KeContextToTrapFrame(&Context, NULL, TrapFrame, CONTEXT_CONTROL, UserMode);
 }
- 
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 /*

From 4c85cfac11736e6e7fa80a9372dbbb34707a4340 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 10 Mar 2013 13:43:13 +0000
Subject: [PATCH 02/61] [LSASRV] In LsapCreateDatabaseObjects pass the pointer
 AuditEventsInfo to LsapSetObjectAttribute instead a pointer to the pointer.
 Fixes 1 advapi32::lsa winetest when compiled with the new BE.

svn path=/trunk/; revision=58461
---
 reactos/dll/win32/lsasrv/database.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/reactos/dll/win32/lsasrv/database.c b/reactos/dll/win32/lsasrv/database.c
index c74604d69dc..0b9b17bf0ad 100644
--- a/reactos/dll/win32/lsasrv/database.c
+++ b/reactos/dll/win32/lsasrv/database.c
@@ -293,8 +293,7 @@ LsapCreateDatabaseObjects(VOID)
     if (!NT_SUCCESS(Status))
         goto done;
 
-    Status = LsapCreatePolicySd(&PolicySd,
-                                &PolicySdSize);
+    Status = LsapCreatePolicySd(&PolicySd, &PolicySdSize);
     if (!NT_SUCCESS(Status))
         goto done;
 
@@ -356,7 +355,7 @@ LsapCreateDatabaseObjects(VOID)
     /* Set the audit events attribute */
     LsapSetObjectAttribute(PolicyObject,
                            L"PolAdtEv",
-                           &AuditEventsInfo,
+                           AuditEventsInfo,
                            AuditEventsSize);
 
     /* Set the DNS Domain Name attribute */
@@ -990,7 +989,8 @@ LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject,
                          NULL);
     if (!NT_SUCCESS(Status))
     {
-
+        ERR("NtCreateKey failed for '%S' with status 0x%lx\n", 
+            AttributeName, Status);
         return Status;
     }
 
@@ -1001,6 +1001,12 @@ LsapSetObjectAttribute(PLSA_DB_OBJECT DbObject,
 
     NtClose(AttributeKey);
 
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("RtlpNtSetValueKey failed for '%S' with status 0x%lx\n", 
+            AttributeName, Status);
+    }
+
     return Status;
 }
 

From 65e890e0e95aee932ccf280a23cb7921af99423f Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 10 Mar 2013 21:49:10 +0000
Subject: [PATCH 03/61] [SAMSRV] Update .spec file to Windows XP SP3.

svn path=/trunk/; revision=58466
---
 reactos/dll/win32/samsrv/samsrv.spec | 86 ++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/reactos/dll/win32/samsrv/samsrv.spec b/reactos/dll/win32/samsrv/samsrv.spec
index a6c9e5a50ae..b17b4a36ed8 100644
--- a/reactos/dll/win32/samsrv/samsrv.spec
+++ b/reactos/dll/win32/samsrv/samsrv.spec
@@ -1,7 +1,22 @@
 @ stub SamIAccountRestrictions
+@ stub SamIAddDSNameToAlias
+@ stub SamIAddDSNameToGroup
+@ stub SamIAmIGC
+@ stub SamIChangePasswordForeignUser
+@ stub SamIChangePasswordForeignUser2
 @ stub SamIConnect
 @ stub SamICreateAccountByRid
+@ stub SamIDemote
+@ stub SamIDemoteUndo
+@ stub SamIDoFSMORoleChange
+@ stub SamIDsCreateObjectInDomain
+@ stub SamIDsSetObjectInformation
 @ stub SamIEnumerateAccountRids
+@ stub SamIEnumerateInterdomainTrustAccountsForUpgrade
+@ stub SamIFloatingSingleMasterOpEx
+@ stub SamIFreeSidAndAttributesList
+@ stub SamIFreeSidArray
+@ stub SamIFreeVoid
 @ stub SamIFree_SAMPR_ALIAS_INFO_BUFFER
 @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER
 @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER
@@ -14,15 +29,83 @@
 @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR
 @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr)
 @ stub SamIFree_SAMPR_USER_INFO_BUFFER
+@ stub SamIFree_UserInternal6Information
+@ stub SamIGCLookupNames
+@ stub SamIGCLookupSids
+@ stub SamIGetAliasMembership
+@ stub SamIGetBootKeyInformation
+@ stub SamIGetDefaultAdministratorName
+@ stub SamIGetFixedAttributes
+@ stub SamIGetinterdomainTrustAccountPasswordsForUpgrade
 @ stub SamIGetPrivateData
+@ stub SamIGetResourceGroupmembershipsTransitive
 @ stub SamIGetSerialNumberDomain
+@ stub SamIGetuserLogonInformation
+@ stub SamIGetuserLogonInformation2
+@ stub SamIGetuserLogonInformationEx
+@ stub SamIImpersonateNullSession
+@ stub SamIIncrementPerformanceCounter
 @ stdcall SamIInitialize()
+@ stub SamIIsDownlevelDcUpgrade
+@ stub SamIIsExtendedSidMode
+@ stub SamIIsRebootAfterPromotion
+@ stub SamIIsSetupInProgress
+@ stub SamILoadDownlevelDatabase
+@ stub SamILoopbackConnect
+@ stub SamIMixedDomain
+@ stub SamIMixedDomain2
+@ stub SamINT4UpgradeInProgress
+@ stub SamINetLogonPing
 @ stub SamINotifyDelta
+@ stub SamINotifyRoleChange
+@ stub SamINotifyServerDelta
+@ stub SamIOpenAccount
+@ stub SamIOpenUserByAlternateId
+@ stub SamIPromote
+@ stub SamIPromoteUndo
+@ stub SamIQueryServerRole
+@ stub SamIQueryServerRole2
+@ stub SamIRemoveDSNameFromAlias
+@ stub SamIRemoveDSNameFromGroup
+@ stub SamIRelaceDownlevelDatabase
+@ stub SamIResetBadPwdCountOnPdc
+@ stub SamIRetrievePrimaryCredentials
+@ stub SamIRevertNullSession
+@ stub SamISameSite
 @ stub SamISetAuditingInformation
+@ stub SamISetMixedDomainFlag
+@ stub SamISetPasswordForeignUser
+@ stub SamISetPasswordForeignUser2
+@ stub SamISetPasswordInfoOnPdc
 @ stub SamISetPrivateData
 @ stub SamISetSerialNumberDomain
+@ stub SamIStorePrimaryCredentials
+@ stub SamIUPNFromUserHandle
+@ stub SamIUnLoadDownlevelDatabase
+@ stub SamIUpdateLogonStatistics
+@ stub SampAbortSingleLoopbackTask
+@ stub SampAccountControlToFlags
+@ stub SampAcquireSamLockExclusive
+@ stub SampAcquireWriteLock
+@ stub SampCommitBufferedWrites
+@ stub SampConvertNt4SdToNt5Sd
+@ stub SampDsChangePasswordUser
+@ stub SampFlagsToAccountControl
+@ stub SampGetDefaultSecurityDescriptorForClass
+@ stub SampGetSerialNumberDomain2
 @ stdcall SampInitializeRegistry()
+@ stub SampInitializeSdConversion
+@ stub SampInvalidateDomainCache
+@ stub SampInvalidateRidRange
+@ stub SampNetLogonNotificationRequired
+@ stub SampNotifyReplicatedInChange
+@ stub SampProcessSingleLoopbackTask
+@ stub SampReleaseSamLockExclusive
+@ stub SampReleaseWriteLock
 @ stub SampRtlConvertUlongToUnicodeString
+@ stub SampSetSerialNumberDomain2
+@ stub SampUsingDsData
+@ stub SampWriteGroupType
 @ stdcall SamrAddMemberToAlias(ptr ptr)
 @ stdcall SamrAddMemberToGroup(ptr long long)
 @ stdcall SamrAddMultipleMembersToAlias(ptr ptr)
@@ -31,6 +114,7 @@
 @ stdcall SamrConnect(ptr ptr long)
 @ stdcall SamrCreateAliasInDomain(ptr ptr long ptr ptr)
 @ stdcall SamrCreateGroupInDomain(ptr ptr long ptr ptr)
+@ stdcall SamrCreateUser2InDomain(ptr ptr long long ptr ptr ptr)
 @ stdcall SamrCreateUserInDomain(ptr ptr long ptr ptr)
 @ stdcall SamrDeleteAlias(ptr)
 @ stdcall SamrDeleteGroup(ptr)
@@ -61,6 +145,7 @@
 @ stdcall SamrRemoveMemberFromForeignDomain(ptr ptr)
 @ stdcall SamrRemoveMemberFromGroup(ptr long)
 @ stdcall SamrRemoveMultipleMembersFromAlias(ptr ptr)
+@ stdcall SamrRidToSid(ptr long ptr)
 @ stdcall SamrSetInformationAlias(ptr long ptr)
 @ stdcall SamrSetInformationDomain(ptr long ptr)
 @ stdcall SamrSetInformationGroup(ptr long ptr)
@@ -70,4 +155,5 @@
 @ stdcall SamrShutdownSamServer(ptr)
 @ stdcall SamrTestPrivateFunctionsDomain(ptr)
 @ stdcall SamrTestPrivateFunctionsUser(ptr)
+@ stdcall SamrUnicodeChangePasswordUser2(ptr ptr ptr ptr ptr long ptr ptr)
 ; EOF
\ No newline at end of file

From 8a40130a380549e905183eafcac9fc46ce2900c1 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 10 Mar 2013 22:28:26 +0000
Subject: [PATCH 04/61] [SAMSRV] Implement SamIFree_SAMPR_PSID_ARRAY.

svn path=/trunk/; revision=58467
---
 reactos/dll/win32/samsrv/samsrv.c    | 14 ++++++++++++++
 reactos/dll/win32/samsrv/samsrv.spec |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c
index c78cfb856b2..2aa3925eb42 100644
--- a/reactos/dll/win32/samsrv/samsrv.c
+++ b/reactos/dll/win32/samsrv/samsrv.c
@@ -64,6 +64,20 @@ SampInitializeRegistry(VOID)
 }
 
 
+VOID
+NTAPI
+SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr)
+{
+    if (Ptr != NULL)
+    {
+        if (Ptr->Sids !=0)
+        {
+            MIDL_user_free(Ptr->Sids);
+        }
+    }
+}
+
+
 VOID
 NTAPI
 SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr)
diff --git a/reactos/dll/win32/samsrv/samsrv.spec b/reactos/dll/win32/samsrv/samsrv.spec
index b17b4a36ed8..bfb09feb64a 100644
--- a/reactos/dll/win32/samsrv/samsrv.spec
+++ b/reactos/dll/win32/samsrv/samsrv.spec
@@ -24,7 +24,7 @@
 @ stub SamIFree_SAMPR_GET_GROUPS_BUFFER
 @ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER
 @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER
-@ stub SamIFree_SAMPR_PSID_ARRAY
+@ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr)
 @ stdcall SamIFree_SAMPR_RETURNED_USTRING_ARRAY(ptr)
 @ stub SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR
 @ stdcall SamIFree_SAMPR_ULONG_ARRAY(ptr)

From 328a638575507a62903a4fa60fe8a875b3ae9915 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 11 Mar 2013 19:31:40 +0000
Subject: [PATCH 05/61] [SAL] * Add _Outptr_opt_result_buffer_ and
 _Outptr_opt_result_bytebuffer_ annotations.

svn path=/trunk/; revision=58468
---
 reactos/include/psdk/sal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h
index 6fd8a036e81..b1d80924c8f 100644
--- a/reactos/include/psdk/sal.h
+++ b/reactos/include/psdk/sal.h
@@ -807,13 +807,13 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default};
 //#define _Out_z_capcount_(capcount)
 #define _Outptr_                                                    _SAL2_NAME(_Outptr_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")])
 #define _Outptr_opt_                                                _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,ValidElements="\n""1")])
-//#define _Outptr_opt_result_buffer_(size)
+#define _Outptr_opt_result_buffer_(size)                            _SAL2_NAME(_Outptr_opt_result_buffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableElements="\n" _SA_SPECSTRIZE(size))])
 //#define _Outptr_opt_result_buffer_all_(size)
 //#define _Outptr_opt_result_buffer_all_maybenull_(size)
 //#define _Outptr_opt_result_buffer_maybenull_(size)
 //#define _Outptr_opt_result_buffer_to_(size, count)
 //#define _Outptr_opt_result_buffer_to_maybenull_(size, count)
-//#define _Outptr_opt_result_bytebuffer_(size)
+#define _Outptr_opt_result_bytebuffer_(size)                        _SAL2_NAME(_Outptr_opt_result_bytebuffer_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_No,Notref=1,WritableBytes="\n" _SA_SPECSTRIZE(size))])
 //#define _Outptr_opt_result_bytebuffer_all_(size)
 #define _Outptr_opt_result_bytebuffer_all_maybenull_(size)          _SAL2_NAME(_Outptr_opt_) _Group_([SA_Pre(Null=SA_Maybe,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidBytes="\n" _SA_SPECSTRIZE(size))])
 //#define _Outptr_opt_result_bytebuffer_maybenull_(size)

From a371d8238512e465789b3b9f7bbd782d37386436 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 11 Mar 2013 19:48:21 +0000
Subject: [PATCH 06/61] [PSDK] * Annotate some structures in ntddstor.h.

svn path=/trunk/; revision=58469
---
 reactos/include/psdk/ntddstor.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/reactos/include/psdk/ntddstor.h b/reactos/include/psdk/ntddstor.h
index 3d5081e0e14..c1955d6ab2a 100644
--- a/reactos/include/psdk/ntddstor.h
+++ b/reactos/include/psdk/ntddstor.h
@@ -435,12 +435,12 @@ typedef struct _STORAGE_PROPERTY_QUERY {
   UCHAR AdditionalParameters[1];
 } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
 
-typedef struct _STORAGE_DESCRIPTOR_HEADER {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_DESCRIPTOR_HEADER {
   ULONG Version;
   ULONG Size;
 } STORAGE_DESCRIPTOR_HEADER, *PSTORAGE_DESCRIPTOR_HEADER;
 
-typedef struct _STORAGE_DEVICE_DESCRIPTOR {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_DESCRIPTOR {
   ULONG Version;
   ULONG Size;
   UCHAR DeviceType;
@@ -456,7 +456,7 @@ typedef struct _STORAGE_DEVICE_DESCRIPTOR {
   UCHAR RawDeviceProperties[1];
 } STORAGE_DEVICE_DESCRIPTOR, *PSTORAGE_DEVICE_DESCRIPTOR;
 
-typedef struct _STORAGE_ADAPTER_DESCRIPTOR {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_ADAPTER_DESCRIPTOR {
   ULONG Version;
   ULONG Size;
   ULONG MaximumTransferLength;
@@ -475,7 +475,7 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR {
   USHORT BusMinorVersion;
 } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR;
 
-typedef struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR {
   ULONG Version;
   ULONG Size;
   ULONG BytesPerCacheLine;
@@ -539,7 +539,7 @@ typedef struct _STORAGE_IDENTIFIER {
   UCHAR Identifier[1];
 } STORAGE_IDENTIFIER, *PSTORAGE_IDENTIFIER;
 
-typedef struct _STORAGE_DEVICE_ID_DESCRIPTOR {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_DEVICE_ID_DESCRIPTOR {
   ULONG Version;
   ULONG Size;
   ULONG NumberOfIdentifiers;
@@ -646,7 +646,7 @@ typedef struct _PERSISTENT_RESERVE_COMMAND {
 
 #endif /* defined(_MSC_EXTENSIONS) */
 
-typedef struct _STORAGE_READ_CAPACITY {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_READ_CAPACITY {
   ULONG Version;
   ULONG Size;
   ULONG BlockLength;
@@ -679,7 +679,7 @@ typedef enum _WRITE_THROUGH {
   WriteThroughSupported
 } WRITE_THROUGH;
 
-typedef struct _STORAGE_WRITE_CACHE_PROPERTY {
+typedef _Struct_size_bytes_(Size) struct _STORAGE_WRITE_CACHE_PROPERTY {
   ULONG Version;
   ULONG Size;
   WRITE_CACHE_TYPE WriteCacheType;

From df89cea5a4f0d38fe2ecba51d78ab563368c3b91 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 11 Mar 2013 19:49:26 +0000
Subject: [PATCH 07/61] [DDK] * Annotate ntpoapi.h.

svn path=/trunk/; revision=58470
---
 reactos/include/ddk/ntpoapi.h | 88 +++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/reactos/include/ddk/ntpoapi.h b/reactos/include/ddk/ntpoapi.h
index ae1665610ba..7f1496308d2 100644
--- a/reactos/include/ddk/ntpoapi.h
+++ b/reactos/include/ddk/ntpoapi.h
@@ -150,9 +150,11 @@ typedef struct _PROCESSOR_IDLE_TIMES {
   ULONG IdleHandlerReserved[4];
 } PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES;
 
-typedef BOOLEAN
-(FASTCALL*PPROCESSOR_IDLE_HANDLER)(
-  IN OUT PPROCESSOR_IDLE_TIMES IdleTimes);
+_Function_class_(PROCESSOR_IDLE_HANDLER)
+typedef NTSTATUS
+(FASTCALL *PPROCESSOR_IDLE_HANDLER)(
+  _In_ ULONG_PTR Context,
+  _Inout_ PPROCESSOR_IDLE_TIMES IdleTimes);
 
 typedef struct _PROCESSOR_IDLE_HANDLER_INFO {
   ULONG HardwareLatency;
@@ -188,17 +190,21 @@ typedef enum _POWER_STATE_HANDLER_TYPE {
   PowerStateMaximum
 } POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE;
 
+_Function_class_(ENTER_STATE_SYSTEM_HANDLER)
+_IRQL_requires_same_
 typedef NTSTATUS
-(NTAPI*PENTER_STATE_SYSTEM_HANDLER)(
-  IN PVOID SystemContext);
+(NTAPI *PENTER_STATE_SYSTEM_HANDLER)(
+  _In_ PVOID SystemContext);
 
+_Function_class_(ENTER_STATE_HANDLER)
+_IRQL_requires_same_
 typedef NTSTATUS
-(NTAPI*PENTER_STATE_HANDLER)(
-  IN PVOID Context,
-  IN PENTER_STATE_SYSTEM_HANDLER SystemHandler OPTIONAL,
-  IN PVOID SystemContext,
-  IN LONG NumberProcessors,
-  IN LONG volatile *Number);
+(NTAPI *PENTER_STATE_HANDLER)(
+  _In_opt_ PVOID Context,
+  _In_opt_ PENTER_STATE_SYSTEM_HANDLER SystemHandler,
+  _In_opt_ PVOID SystemContext,
+  _In_ LONG NumberProcessors,
+  _In_opt_ LONG volatile *Number);
 
 typedef struct _POWER_STATE_HANDLER {
   POWER_STATE_HANDLER_TYPE Type;
@@ -208,26 +214,30 @@ typedef struct _POWER_STATE_HANDLER {
   PVOID Context;
 } POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER;
 
+_Function_class_(ENTER_STATE_NOTIFY_HANDLER)
+_IRQL_requires_same_
 typedef NTSTATUS
-(NTAPI*PENTER_STATE_NOTIFY_HANDLER)(
-  IN POWER_STATE_HANDLER_TYPE State,
-  IN PVOID Context,
-  IN BOOLEAN Entering);
+(NTAPI *PENTER_STATE_NOTIFY_HANDLER)(
+  _In_ POWER_STATE_HANDLER_TYPE State,
+  _In_ PVOID Context,
+  _In_ BOOLEAN Entering);
 
 typedef struct _POWER_STATE_NOTIFY_HANDLER {
   PENTER_STATE_NOTIFY_HANDLER Handler;
   PVOID Context;
 } POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER;
 
+_IRQL_requires_max_(APC_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtPowerInformation(
-  IN POWER_INFORMATION_LEVEL InformationLevel,
-  IN PVOID InputBuffer OPTIONAL,
-  IN ULONG InputBufferLength,
-  OUT PVOID OutputBuffer OPTIONAL,
-  IN ULONG OutputBufferLength);
+  _In_ POWER_INFORMATION_LEVEL InformationLevel,
+  _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer,
+  _In_ ULONG InputBufferLength,
+  _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer,
+  _In_ ULONG OutputBufferLength);
 
 #define PROCESSOR_STATE_TYPE_PERFORMANCE  1
 #define PROCESSOR_STATE_TYPE_THROTTLE     2
@@ -261,49 +271,59 @@ typedef struct _PROCESSOR_STATE_HANDLER2 {
   PROCESSOR_PERF_LEVEL PerfLevel[1];
 } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2;
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtSetThreadExecutionState(
-  IN EXECUTION_STATE esFlags,
-  OUT EXECUTION_STATE *PreviousFlags);
+  _In_ EXECUTION_STATE esFlags,
+  _Out_ EXECUTION_STATE *PreviousFlags);
 
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtRequestWakeupLatency(
-  IN LATENCY_TIME latency);
+  _In_ LATENCY_TIME latency);
 
+_IRQL_requires_max_(APC_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtInitiatePowerAction(
-  IN POWER_ACTION SystemAction,
-  IN SYSTEM_POWER_STATE MinSystemState,
-  IN ULONG Flags,
-  IN BOOLEAN Asynchronous);
+  _In_ POWER_ACTION SystemAction,
+  _In_ SYSTEM_POWER_STATE MinSystemState,
+  _In_ ULONG Flags,
+  _In_ BOOLEAN Asynchronous);
 
+_IRQL_requires_max_(APC_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtSetSystemPowerState(
-  IN POWER_ACTION SystemAction,
-  IN SYSTEM_POWER_STATE MinSystemState,
-  IN ULONG Flags);
+  _In_ POWER_ACTION SystemAction,
+  _In_ SYSTEM_POWER_STATE MinSystemState,
+  _In_ ULONG Flags);
 
+_IRQL_requires_max_(APC_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtGetDevicePowerState(
-  IN HANDLE Device,
-  OUT DEVICE_POWER_STATE *State);
+  _In_ HANDLE Device,
+  _Out_ DEVICE_POWER_STATE *State);
 
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtCancelDeviceWakeupRequest(
-  IN HANDLE Device);
+  _In_ HANDLE Device);
 
+_IRQL_requires_max_(APC_LEVEL)
+__kernel_entry
 NTSYSCALLAPI
 BOOLEAN
 NTAPI
@@ -313,7 +333,7 @@ NTSYSCALLAPI
 NTSTATUS
 NTAPI
 NtRequestDeviceWakeup(
-  IN HANDLE Device);
+  _In_ HANDLE Device);
 
 #define WINLOGON_LOCK_ON_SLEEP            0x00000001
 

From 8caefdd06a549f7830c789e7e3c8d08035858f77 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Mon, 11 Mar 2013 20:59:01 +0000
Subject: [PATCH 08/61] [AUDIOSRV] Fix log message.

svn path=/trunk/; revision=58471
---
 reactos/base/services/audiosrv/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/base/services/audiosrv/main.c b/reactos/base/services/audiosrv/main.c
index 13c4a640312..b9324b015d1 100644
--- a/reactos/base/services/audiosrv/main.c
+++ b/reactos/base/services/audiosrv/main.c
@@ -149,7 +149,7 @@ ServiceMain(DWORD argc, LPWSTR argv)
         return;
     }
 
-    logmsg("* Service started");
+    logmsg("* Service started\n");
     /* Tell SCM we are now running, and we may be stopped */
     service_status.dwCurrentState = SERVICE_RUNNING;
     service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP;

From 39d6a9161088a87eac9f719fc740511b125c57ff Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 11 Mar 2013 21:01:30 +0000
Subject: [PATCH 09/61] [SAMSRV] - Implement SamIConnect. - Add a trusted
 caller flag to the database object type and inherit it to opened or created
 sub objects. - Restrict access to
 SamrQueryInformationUser.UserInternal1Information for non-trusted callers.

svn path=/trunk/; revision=58472
---
 reactos/dll/win32/samsrv/database.c  | 10 ++++++--
 reactos/dll/win32/samsrv/samrpc.c    | 11 +++++++--
 reactos/dll/win32/samsrv/samsrv.c    | 37 ++++++++++++++++++++++++++++
 reactos/dll/win32/samsrv/samsrv.h    |  4 +++
 reactos/dll/win32/samsrv/samsrv.spec |  4 +--
 5 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/samsrv/database.c b/reactos/dll/win32/samsrv/database.c
index 3d2a8825ce1..fc459a073fc 100644
--- a/reactos/dll/win32/samsrv/database.c
+++ b/reactos/dll/win32/samsrv/database.c
@@ -210,7 +210,7 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject,
     }
 
     NewObject = RtlAllocateHeap(RtlGetProcessHeap(),
-                                0,
+                                HEAP_ZERO_MEMORY,
                                 sizeof(SAM_DB_OBJECT));
     if (NewObject == NULL)
     {
@@ -243,6 +243,9 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject,
     NewObject->RelativeId = RelativeId;
     NewObject->ParentObject = ParentObject;
 
+    if (ParentObject != NULL)
+        NewObject->Trusted = ParentObject->Trusted;
+
     *DbObject = NewObject;
 
     return STATUS_SUCCESS;
@@ -359,7 +362,7 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject,
     }
 
     NewObject = RtlAllocateHeap(RtlGetProcessHeap(),
-                                0,
+                                HEAP_ZERO_MEMORY,
                                 sizeof(SAM_DB_OBJECT));
     if (NewObject == NULL)
     {
@@ -391,6 +394,9 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject,
     NewObject->RelativeId = RelativeId;
     NewObject->ParentObject = ParentObject;
 
+    if (ParentObject != NULL)
+        NewObject->Trusted = ParentObject->Trusted;
+
     *DbObject = NewObject;
 
     return STATUS_SUCCESS;
diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c
index ead3344d7c9..83aa582b069 100644
--- a/reactos/dll/win32/samsrv/samrpc.c
+++ b/reactos/dll/win32/samsrv/samrpc.c
@@ -57,6 +57,8 @@ static GENERIC_MAPPING UserMapping =
     USER_ALL_ACCESS
 };
 
+PGENERIC_MAPPING pServerMapping = &ServerMapping;
+
 
 /* FUNCTIONS *****************************************************************/
 
@@ -6043,14 +6045,19 @@ done:
 }
 
 
-static NTSTATUS
+static
+NTSTATUS
 SampQueryUserInternal1(PSAM_DB_OBJECT UserObject,
-                      PSAMPR_USER_INFO_BUFFER *Buffer)
+                       PSAMPR_USER_INFO_BUFFER *Buffer)
 {
     PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL;
     ULONG Length = 0;
     NTSTATUS Status = STATUS_SUCCESS;
 
+    /* Fail, if the caller is not a trusted caller */
+    if (UserObject->Trusted == FALSE)
+        return STATUS_INVALID_INFO_CLASS;
+
     *Buffer = NULL;
 
     InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER));
diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c
index 2aa3925eb42..59d5b8718cf 100644
--- a/reactos/dll/win32/samsrv/samsrv.c
+++ b/reactos/dll/win32/samsrv/samsrv.c
@@ -25,6 +25,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
 
 /* FUNCTIONS ****************************************************************/
 
+NTSTATUS
+NTAPI
+SamIConnect(IN PSAMPR_SERVER_NAME ServerName,
+            OUT SAMPR_HANDLE *ServerHandle,
+            IN ACCESS_MASK DesiredAccess,
+            IN BOOLEAN Trusted)
+{
+    PSAM_DB_OBJECT ServerObject;
+    NTSTATUS Status;
+
+    TRACE("SamIConnect(%p %p %lx %ld)\n",
+          ServerName, ServerHandle, DesiredAccess, Trusted);
+
+    /* Map generic access rights */
+    RtlMapGenericMask(&DesiredAccess,
+                      pServerMapping);
+
+    /* Open the Server Object */
+    Status = SampOpenDbObject(NULL,
+                              NULL,
+                              L"SAM",
+                              0,
+                              SamDbServerObject,
+                              DesiredAccess,
+                              &ServerObject);
+    if (NT_SUCCESS(Status))
+    {
+        ServerObject->Trusted = Trusted;
+        *ServerHandle = (SAMPR_HANDLE)ServerObject;
+    }
+
+    TRACE("SamIConnect done (Status 0x%08lx)\n", Status);
+
+    return Status;
+}
+
+
 NTSTATUS
 NTAPI
 SamIInitialize(VOID)
diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index a9bc13ed5ec..e95e78fe22e 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -50,6 +50,7 @@ typedef struct _SAM_DB_OBJECT
     HANDLE KeyHandle;
     HANDLE MembersKeyHandle;  // only used by Aliases
     ULONG RelativeId;
+    BOOLEAN Trusted;
     struct _SAM_DB_OBJECT *ParentObject;
 } SAM_DB_OBJECT, *PSAM_DB_OBJECT;
 
@@ -113,6 +114,9 @@ typedef struct _SAM_USER_FIXED_DATA
 } SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA;
 
 
+extern PGENERIC_MAPPING pServerMapping;
+
+
 /* database.c */
 
 NTSTATUS
diff --git a/reactos/dll/win32/samsrv/samsrv.spec b/reactos/dll/win32/samsrv/samsrv.spec
index bfb09feb64a..e4ae0d2b29f 100644
--- a/reactos/dll/win32/samsrv/samsrv.spec
+++ b/reactos/dll/win32/samsrv/samsrv.spec
@@ -4,7 +4,7 @@
 @ stub SamIAmIGC
 @ stub SamIChangePasswordForeignUser
 @ stub SamIChangePasswordForeignUser2
-@ stub SamIConnect
+@ stdcall SamIConnect(ptr ptr long long)
 @ stub SamICreateAccountByRid
 @ stub SamIDemote
 @ stub SamIDemoteUndo
@@ -156,4 +156,4 @@
 @ stdcall SamrTestPrivateFunctionsDomain(ptr)
 @ stdcall SamrTestPrivateFunctionsUser(ptr)
 @ stdcall SamrUnicodeChangePasswordUser2(ptr ptr ptr ptr ptr long ptr ptr)
-; EOF
\ No newline at end of file
+; EOF

From 02f8bfdb8e02b5ca0e10664dd451c02150b96cb7 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Mon, 11 Mar 2013 21:49:11 +0000
Subject: [PATCH 10/61] [SAMSRV] Implement SamrShutdownSamServer.

svn path=/trunk/; revision=58473
---
 reactos/dll/win32/samsrv/samrpc.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/samsrv/samrpc.c b/reactos/dll/win32/samsrv/samrpc.c
index 83aa582b069..24892e596aa 100644
--- a/reactos/dll/win32/samsrv/samrpc.c
+++ b/reactos/dll/win32/samsrv/samrpc.c
@@ -205,8 +205,23 @@ NTSTATUS
 NTAPI
 SamrShutdownSamServer(IN SAMPR_HANDLE ServerHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    PSAM_DB_OBJECT ServerObject;
+    NTSTATUS Status;
+
+    TRACE("(%p)\n", ServerHandle);
+
+    /* Validate the server handle */
+    Status = SampValidateDbObject(ServerHandle,
+                                  SamDbServerObject,
+                                  SAM_SERVER_SHUTDOWN,
+                                  &ServerObject);
+    if (!NT_SUCCESS(Status))
+        return Status;
+
+    /* Shut the server down */
+    RpcMgmtStopServerListening(0);
+
+    return STATUS_SUCCESS;
 }
 
 

From 447b3b8db91e9dfd5e797c94a3172cbae94c35c7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 11 Mar 2013 22:06:16 +0000
Subject: [PATCH 11/61] [CRT] * Annotate malloc.h.

svn path=/trunk/; revision=58474
---
 reactos/include/crt/malloc.h | 262 ++++++++++++++++++++++++++++++-----
 1 file changed, 227 insertions(+), 35 deletions(-)

diff --git a/reactos/include/crt/malloc.h b/reactos/include/crt/malloc.h
index 51542e6cdee..c0ebb2ec25b 100644
--- a/reactos/include/crt/malloc.h
+++ b/reactos/include/crt/malloc.h
@@ -69,23 +69,129 @@ extern "C" {
 
 #ifndef _CRT_ALLOCATION_DEFINED
 #define _CRT_ALLOCATION_DEFINED
-  void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements);
-  void __cdecl free(void *_Memory);
-  void *__cdecl malloc(size_t _Size);
-  void *__cdecl realloc(void *_Memory,size_t _NewSize);
-  _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_NumOfElements * _SizeOfElements)
+  void*
+  __cdecl
+  calloc(
+    _In_ size_t _NumOfElements,
+    _In_ size_t _SizeOfElements);
+
+  void
+  __cdecl
+  free(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Size)
+  void*
+  __cdecl
+  malloc(
+    _In_ size_t _Size);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_NewSize)
+  void*
+  __cdecl
+  realloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _NewSize);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Count * _Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _recalloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _Count,
+    _In_ size_t _Size);
 
 #ifdef __DO_ALIGN_DEFINES
-  _CRTIMP void __cdecl _aligned_free(void *_Memory);
-  _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment);
-#endif
 
-  _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);
-  _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);
-  _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);
-  _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset);
-  _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);
-#endif
+  _CRTIMP
+  void
+  __cdecl
+  _aligned_free(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_malloc(
+    _In_ size_t _Size,
+    _In_ size_t _Alignment);
+
+#endif /* __DO_ALIGN_DEFINES */
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_offset_malloc(
+    _In_ size_t _Size,
+    _In_ size_t _Alignment,
+    _In_ size_t _Offset);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_realloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _Size,
+    _In_ size_t _Alignment);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Count * _Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_recalloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _Count,
+    _In_ size_t _Size,
+    _In_ size_t _Alignment);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_offset_realloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _Size,
+    _In_ size_t _Alignment,
+    _In_ size_t _Offset);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_Count * _Size)
+  _CRTIMP
+  void*
+  __cdecl
+  _aligned_offset_recalloc(
+    _Pre_maybenull_ _Post_invalid_ void *_Memory,
+    _In_ size_t _Count,
+    _In_ size_t _Size,
+    _In_ size_t _Alignment,
+    _In_ size_t _Offset);
+
+#endif /* _CRT_ALLOCATION_DEFINED */
 
 #ifdef __DO_ALIGN_DEFINES
 #undef __DO_ALIGN_DEFINES
@@ -98,27 +204,109 @@ extern "C" {
 #define _MAX_WAIT_MALLOC_CRT 60000
 
   _CRTIMP int __cdecl _resetstkoflw (void);
-  _CRTIMP unsigned long __cdecl _set_malloc_crt_max_wait(unsigned long _NewValue);
 
-  _CRTIMP void *__cdecl _expand(void *_Memory,size_t _NewSize);
-  _CRTIMP size_t __cdecl _msize(void *_Memory);
+  _CRTIMP
+  unsigned long
+  __cdecl
+  _set_malloc_crt_max_wait(
+    _In_ unsigned long _NewValue);
+
+  _Check_return_
+  _Ret_maybenull_
+  _Post_writable_byte_size_(_NewSize)
+  _CRTIMP
+  void*
+  __cdecl
+  _expand(
+    _In_opt_ void *_Memory,
+    _In_ size_t _NewSize);
+
+  _Check_return_
+  _CRTIMP
+  size_t
+  __cdecl
+  _msize(
+    _In_ void *_Memory);
+
 #ifdef __GNUC__
 #undef _alloca
 #define _alloca(x) __builtin_alloca((x))
 #else
-  void *__cdecl _alloca(size_t _Size);
+  _Ret_notnull_
+  _Post_writable_byte_size_(_Size)
+  void*
+  __cdecl
+  _alloca(
+    _In_ size_t _Size);
 #endif
-  _CRTIMP size_t __cdecl _get_sbh_threshold(void);
-  _CRTIMP int __cdecl _set_sbh_threshold(size_t _NewValue);
-  _CRTIMP errno_t __cdecl _set_amblksiz(size_t _Value);
-  _CRTIMP errno_t __cdecl _get_amblksiz(size_t *_Value);
-  _CRTIMP int __cdecl _heapadd(void *_Memory,size_t _Size);
-  _CRTIMP int __cdecl _heapchk(void);
-  _CRTIMP int __cdecl _heapmin(void);
-  _CRTIMP int __cdecl _heapset(unsigned int _Fill);
-  _CRTIMP int __cdecl _heapwalk(_HEAPINFO *_EntryInfo);
-  _CRTIMP size_t __cdecl _heapused(size_t *_Used,size_t *_Commit);
-  _CRTIMP intptr_t __cdecl _get_heap_handle(void);
+
+  _Check_return_
+  _CRTIMP
+  size_t
+  __cdecl
+  _get_sbh_threshold(void);
+
+  _CRTIMP
+  int
+  __cdecl
+  _set_sbh_threshold(
+    _In_ size_t _NewValue);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _set_amblksiz(
+    _In_ size_t _Value);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _get_amblksiz(
+    _Out_ size_t *_Value);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _heapadd(
+    _In_ void *_Memory,
+    _In_ size_t _Size);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _heapchk(void);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _heapmin(void);
+
+  _CRTIMP
+  int
+  __cdecl
+  _heapset(
+    _In_ unsigned int _Fill);
+
+  _CRTIMP
+  int
+  __cdecl
+  _heapwalk(
+    _Inout_ _HEAPINFO *_EntryInfo);
+
+  _CRTIMP
+  size_t
+  __cdecl
+  _heapused(
+    size_t *_Used,
+    size_t *_Commit);
+
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _get_heap_handle(void);
 
 #define _ALLOCA_S_THRESHOLD 1024
 #define _ALLOCA_S_STACK_MARKER 0xCCCC
@@ -179,14 +367,18 @@ extern "C" {
   typedef int (__cdecl *_HEAPHOOK)(int,size_t,void *,void **);
 #endif
 
-  _CRTIMP _HEAPHOOK __cdecl _setheaphook(_HEAPHOOK _NewHook);
+  _CRTIMP
+  _HEAPHOOK
+  __cdecl
+  _setheaphook(
+    _In_opt_ _HEAPHOOK _NewHook);
 
-#define _HEAP_MALLOC 1
-#define _HEAP_CALLOC 2
-#define _HEAP_FREE 3
+#define _HEAP_MALLOC  1
+#define _HEAP_CALLOC  2
+#define _HEAP_FREE    3
 #define _HEAP_REALLOC 4
-#define _HEAP_MSIZE 5
-#define _HEAP_EXPAND 6
+#define _HEAP_MSIZE   5
+#define _HEAP_EXPAND  6
 #endif
 
 #ifdef __cplusplus

From 8fc7b3332f1e67159962c527e37814acea567bc7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 12 Mar 2013 11:40:11 +0000
Subject: [PATCH 12/61] [PSDK] * Annotate evntprov.h.

svn path=/trunk/; revision=58475
---
 reactos/include/psdk/evntprov.h | 153 ++++++++++++++++----------------
 1 file changed, 76 insertions(+), 77 deletions(-)

diff --git a/reactos/include/psdk/evntprov.h b/reactos/include/psdk/evntprov.h
index c7c37d5047e..13c1ed0b44b 100644
--- a/reactos/include/psdk/evntprov.h
+++ b/reactos/include/psdk/evntprov.h
@@ -90,72 +90,72 @@ typedef struct _EVENT_FILTER_HEADER {
 
 typedef VOID
 (NTAPI *PENABLECALLBACK)(
-  IN LPCGUID SourceId,
-  IN ULONG IsEnabled,
-  IN UCHAR Level,
-  IN ULONGLONG MatchAnyKeyword,
-  IN ULONGLONG MatchAllKeyword,
-  IN PEVENT_FILTER_DESCRIPTOR FilterData OPTIONAL,
-  IN OUT PVOID CallbackContext OPTIONAL);
+  _In_ LPCGUID SourceId,
+  _In_ ULONG IsEnabled,
+  _In_ UCHAR Level,
+  _In_ ULONGLONG MatchAnyKeyword,
+  _In_ ULONGLONG MatchAllKeyword,
+  _In_opt_ PEVENT_FILTER_DESCRIPTOR FilterData,
+  _Inout_opt_ PVOID CallbackContext);
 
 #if (WINVER >= _WIN32_WINNT_VISTA)
 ULONG
 EVNTAPI
 EventRegister(
-  IN LPCGUID ProviderId,
-  IN PENABLECALLBACK EnableCallback OPTIONAL,
-  IN PVOID CallbackContext OPTIONAL,
-  OUT PREGHANDLE RegHandle);
+  _In_ LPCGUID ProviderId,
+  _In_opt_ PENABLECALLBACK EnableCallback,
+  _In_opt_ PVOID CallbackContext,
+  _Out_ PREGHANDLE RegHandle);
 
 ULONG
 EVNTAPI
 EventUnregister(
-  IN REGHANDLE RegHandle);
+  _In_ REGHANDLE RegHandle);
 
 BOOLEAN
 EVNTAPI
 EventEnabled(
-  IN REGHANDLE RegHandle,
-  IN PCEVENT_DESCRIPTOR EventDescriptor);
+  _In_ REGHANDLE RegHandle,
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor);
 
 BOOLEAN
 EVNTAPI
 EventProviderEnabled(
-  IN REGHANDLE RegHandle,
-  IN UCHAR Level,
-  IN ULONGLONG Keyword);
+  _In_ REGHANDLE RegHandle,
+  _In_ UCHAR Level,
+  _In_ ULONGLONG Keyword);
 
 ULONG
 EVNTAPI
 EventWrite(
-  IN REGHANDLE RegHandle,
-  IN PCEVENT_DESCRIPTOR EventDescriptor,
-  IN ULONG UserDataCount,
-  IN PEVENT_DATA_DESCRIPTOR UserData);
+  _In_ REGHANDLE RegHandle,
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor,
+  _In_ ULONG UserDataCount,
+  _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData);
 
 ULONG
 EVNTAPI
 EventWriteTransfer(
-  IN REGHANDLE RegHandle,
-  IN PCEVENT_DESCRIPTOR EventDescriptor,
-  IN LPCGUID ActivityId OPTIONAL,
-  IN LPCGUID RelatedActivityId OPTIONAL,
-  IN ULONG UserDataCount,
-  IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL);
+  _In_ REGHANDLE RegHandle,
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor,
+  _In_opt_ LPCGUID ActivityId,
+  _In_opt_ LPCGUID RelatedActivityId,
+  _In_ ULONG UserDataCount,
+  _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData);
 
 ULONG
 EVNTAPI
 EventWriteString(
-  IN REGHANDLE RegHandle,
-  IN UCHAR Level,
-  IN ULONGLONG Keyword,
-  IN PCWSTR String);
+  _In_ REGHANDLE RegHandle,
+  _In_ UCHAR Level,
+  _In_ ULONGLONG Keyword,
+  _In_ PCWSTR String);
 
 ULONG
 EVNTAPI
 EventActivityIdControl(
-  IN ULONG ControlCode,
-  IN OUT LPGUID ActivityId);
+  _In_ ULONG ControlCode,
+  _Inout_ LPGUID ActivityId);
 
 #endif /* (WINVER >= _WIN32_WINNT_VISTA) */
 
@@ -163,14 +163,14 @@ EventActivityIdControl(
 ULONG
 EVNTAPI
 EventWriteEx(
-  IN REGHANDLE RegHandle,
-  IN PCEVENT_DESCRIPTOR EventDescriptor,
-  IN ULONG64 Filter,
-  IN ULONG Flags,
-  IN LPCGUID ActivityId OPTIONAL,
-  IN LPCGUID RelatedActivityId OPTIONAL,
-  IN ULONG UserDataCount,
-  IN PEVENT_DATA_DESCRIPTOR UserData OPTIONAL);
+  _In_ REGHANDLE RegHandle,
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor,
+  _In_ ULONG64 Filter,
+  _In_ ULONG Flags,
+  _In_opt_ LPCGUID ActivityId,
+  _In_opt_ LPCGUID RelatedActivityId,
+  _In_ ULONG UserDataCount,
+  _In_reads_opt_(UserDataCount) PEVENT_DATA_DESCRIPTOR UserData);
 #endif
 
 #endif // _ETW_KM_ 
@@ -178,9 +178,9 @@ EventWriteEx(
 FORCEINLINE
 VOID
 EventDataDescCreate(
-  OUT PEVENT_DATA_DESCRIPTOR EventDataDescriptor,
-  IN const VOID* DataPtr,
-  IN ULONG DataSize)
+  _Out_ PEVENT_DATA_DESCRIPTOR EventDataDescriptor,
+  _In_reads_bytes_(DataSize) const VOID* DataPtr,
+  _In_ ULONG DataSize)
 {
   EventDataDescriptor->Ptr = (ULONGLONG)(ULONG_PTR)DataPtr;
   EventDataDescriptor->Size = DataSize;
@@ -190,14 +190,14 @@ EventDataDescCreate(
 FORCEINLINE
 VOID
 EventDescCreate(
-  OUT PEVENT_DESCRIPTOR EventDescriptor,
-  IN USHORT Id,
-  IN UCHAR Version,
-  IN UCHAR Channel,
-  IN UCHAR Level,
-  IN USHORT Task,
-  IN UCHAR Opcode,
-  IN ULONGLONG Keyword)
+  _Out_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ USHORT Id,
+  _In_ UCHAR Version,
+  _In_ UCHAR Channel,
+  _In_ UCHAR Level,
+  _In_ USHORT Task,
+  _In_ UCHAR Opcode,
+  _In_ ULONGLONG Keyword)
 {
   EventDescriptor->Id = Id;
   EventDescriptor->Version = Version;
@@ -211,7 +211,7 @@ EventDescCreate(
 FORCEINLINE
 VOID
 EventDescZero(
-  OUT PEVENT_DESCRIPTOR EventDescriptor)
+  _Out_ PEVENT_DESCRIPTOR EventDescriptor)
 {
   memset(EventDescriptor, 0, sizeof(EVENT_DESCRIPTOR));
 }
@@ -219,7 +219,7 @@ EventDescZero(
 FORCEINLINE
 USHORT
 EventDescGetId(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Id);
 }
@@ -227,7 +227,7 @@ EventDescGetId(
 FORCEINLINE
 UCHAR
 EventDescGetVersion(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Version);
 }
@@ -235,7 +235,7 @@ EventDescGetVersion(
 FORCEINLINE
 USHORT
 EventDescGetTask(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Task);
 }
@@ -243,7 +243,7 @@ EventDescGetTask(
 FORCEINLINE
 UCHAR
 EventDescGetOpcode(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Opcode);
 }
@@ -251,7 +251,7 @@ EventDescGetOpcode(
 FORCEINLINE
 UCHAR
 EventDescGetChannel(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Channel);
 }
@@ -259,7 +259,7 @@ EventDescGetChannel(
 FORCEINLINE
 UCHAR
 EventDescGetLevel(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Level);
 }
@@ -267,7 +267,7 @@ EventDescGetLevel(
 FORCEINLINE
 ULONGLONG
 EventDescGetKeyword(
-  IN PCEVENT_DESCRIPTOR EventDescriptor)
+  _In_ PCEVENT_DESCRIPTOR EventDescriptor)
 {
   return (EventDescriptor->Keyword);
 }
@@ -275,8 +275,8 @@ EventDescGetKeyword(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetId(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN USHORT Id)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ USHORT Id)
 {
   EventDescriptor->Id = Id;
   return (EventDescriptor);
@@ -285,8 +285,8 @@ EventDescSetId(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetVersion(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN UCHAR Version)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ UCHAR Version)
 {
   EventDescriptor->Version = Version;
   return (EventDescriptor);
@@ -295,8 +295,8 @@ EventDescSetVersion(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetTask(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN USHORT Task)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ USHORT Task)
 {
   EventDescriptor->Task = Task;
   return (EventDescriptor);
@@ -305,8 +305,8 @@ EventDescSetTask(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetOpcode(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN UCHAR Opcode)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ UCHAR Opcode)
 {
   EventDescriptor->Opcode = Opcode;
   return (EventDescriptor);
@@ -315,8 +315,8 @@ EventDescSetOpcode(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetLevel(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN UCHAR  Level)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ UCHAR  Level)
 {
   EventDescriptor->Level = Level;
   return (EventDescriptor);
@@ -325,8 +325,8 @@ EventDescSetLevel(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetChannel(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN UCHAR Channel)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ UCHAR Channel)
 {
   EventDescriptor->Channel = Channel;
   return (EventDescriptor);
@@ -335,8 +335,8 @@ EventDescSetChannel(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescSetKeyword(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN ULONGLONG Keyword)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ ULONGLONG Keyword)
 {
   EventDescriptor->Keyword = Keyword;
   return (EventDescriptor);
@@ -346,8 +346,8 @@ EventDescSetKeyword(
 FORCEINLINE
 PEVENT_DESCRIPTOR
 EventDescOrKeyword(
-  IN PEVENT_DESCRIPTOR EventDescriptor,
-  IN ULONGLONG Keyword)
+  _In_ PEVENT_DESCRIPTOR EventDescriptor,
+  _In_ ULONGLONG Keyword)
 {
   EventDescriptor->Keyword |= Keyword;
   return (EventDescriptor);
@@ -356,4 +356,3 @@ EventDescOrKeyword(
 #ifdef __cplusplus
 }
 #endif
-

From 6b643aa9535ba81471a3eddf2ca777846be0ba50 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 12 Mar 2013 20:07:56 +0000
Subject: [PATCH 13/61] [SAMSRV] Add helper functions SampOpenAliasObject,
 SampOpenGroupObject and SampRemoveUserFromAllGroups.

svn path=/trunk/; revision=58476
---
 reactos/dll/win32/samsrv/CMakeLists.txt |  1 +
 reactos/dll/win32/samsrv/alias.c        | 42 +++++++++++++++++
 reactos/dll/win32/samsrv/group.c        | 24 ++++++++++
 reactos/dll/win32/samsrv/samsrv.h       | 18 +++++++
 reactos/dll/win32/samsrv/user.c         | 63 +++++++++++++++++++++++++
 5 files changed, 148 insertions(+)
 create mode 100644 reactos/dll/win32/samsrv/alias.c

diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt
index 101748a9f2f..0639b26f9e2 100644
--- a/reactos/dll/win32/samsrv/CMakeLists.txt
+++ b/reactos/dll/win32/samsrv/CMakeLists.txt
@@ -8,6 +8,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl)
 spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
+    alias.c
     database.c
     domain.c
     group.c
diff --git a/reactos/dll/win32/samsrv/alias.c b/reactos/dll/win32/samsrv/alias.c
new file mode 100644
index 00000000000..96e70c854a8
--- /dev/null
+++ b/reactos/dll/win32/samsrv/alias.c
@@ -0,0 +1,42 @@
+/*
+ * PROJECT:     Local Security Authority Server DLL
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        dll/win32/samsrv/alias.c
+ * PURPOSE:     Alias specific helper functions
+ * COPYRIGHT:   Copyright 2013 Eric Kohl
+ */
+
+/* INCLUDES ****************************************************************/
+
+#include "samsrv.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
+
+
+/* FUNCTIONS ***************************************************************/
+
+NTSTATUS
+SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject,
+                    IN ULONG AliasId,
+                    IN ACCESS_MASK DesiredAccess,
+                    OUT PSAM_DB_OBJECT *AliasObject)
+{
+    WCHAR szRid[9];
+
+    TRACE("(%p %lu %lx %p)\n",
+          DomainObject, AliasId, DesiredAccess, AliasObject);
+
+    /* Convert the RID into a string (hex) */
+    swprintf(szRid, L"%08lX", AliasId);
+
+    /* Create the user object */
+    return SampOpenDbObject(DomainObject,
+                            L"Aliases",
+                            szRid,
+                            AliasId,
+                            SamDbAliasObject,
+                            DesiredAccess,
+                            AliasObject);
+}
+
+/* EOF */
diff --git a/reactos/dll/win32/samsrv/group.c b/reactos/dll/win32/samsrv/group.c
index 4b1ab718a3d..9bf0c86168e 100644
--- a/reactos/dll/win32/samsrv/group.c
+++ b/reactos/dll/win32/samsrv/group.c
@@ -15,6 +15,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
 
 /* FUNCTIONS ***************************************************************/
 
+NTSTATUS
+SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject,
+                    IN ULONG GroupId,
+                    IN ACCESS_MASK DesiredAccess,
+                    OUT PSAM_DB_OBJECT *GroupObject)
+{
+    WCHAR szRid[9];
+
+    TRACE("(%p %lu %lx %p)\n",
+          DomainObject, GroupId, DesiredAccess, GroupObject);
+
+    /* Convert the RID into a string (hex) */
+    swprintf(szRid, L"%08lX", GroupId);
+
+    /* Create the user object */
+    return SampOpenDbObject(DomainObject,
+                            L"Groups",
+                            szRid,
+                            GroupId,
+                            SamDbGroupObject,
+                            DesiredAccess,
+                            GroupObject);
+}
+
 
 NTSTATUS
 SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject,
diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index e95e78fe22e..9e838b572e7 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -117,6 +117,15 @@ typedef struct _SAM_USER_FIXED_DATA
 extern PGENERIC_MAPPING pServerMapping;
 
 
+/* alias.c */
+
+NTSTATUS
+SampOpenAliasObject(IN PSAM_DB_OBJECT DomainObject,
+                    IN ULONG AliasId,
+                    IN ACCESS_MASK DesiredAccess,
+                    OUT PSAM_DB_OBJECT *AliasObject);
+
+
 /* database.c */
 
 NTSTATUS
@@ -192,6 +201,12 @@ SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject,
 
 /* group.h */
 
+NTSTATUS
+SampOpenGroupObject(IN PSAM_DB_OBJECT DomainObject,
+                    IN ULONG GroupId,
+                    IN ACCESS_MASK DesiredAccess,
+                    OUT PSAM_DB_OBJECT *GroupObject);
+
 NTSTATUS
 SampAddMemberToGroup(IN PSAM_DB_OBJECT GroupObject,
                      IN ULONG MemberId);
@@ -301,6 +316,9 @@ SampSetUserGroupAttributes(IN PSAM_DB_OBJECT DomainObject,
                            IN ULONG GroupId,
                            IN ULONG GroupAttributes);
 
+NTSTATUS
+SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject);
+
 NTSTATUS
 SampSetUserPassword(IN PSAM_DB_OBJECT UserObject,
                     IN PENCRYPTED_NT_OWF_PASSWORD NtPassword,
diff --git a/reactos/dll/win32/samsrv/user.c b/reactos/dll/win32/samsrv/user.c
index 0aa392a4a4d..a80402bd4ab 100644
--- a/reactos/dll/win32/samsrv/user.c
+++ b/reactos/dll/win32/samsrv/user.c
@@ -320,6 +320,69 @@ done:
 }
 
 
+NTSTATUS
+SampRemoveUserFromAllGroups(IN PSAM_DB_OBJECT UserObject)
+{
+    PGROUP_MEMBERSHIP GroupsBuffer = NULL;
+    PSAM_DB_OBJECT GroupObject;
+    ULONG Length = 0;
+    ULONG i;
+    NTSTATUS Status;
+
+    SampGetObjectAttribute(UserObject,
+                           L"Groups",
+                           NULL,
+                           NULL,
+                           &Length);
+
+    if (Length == 0)
+        return STATUS_SUCCESS;
+
+    GroupsBuffer = midl_user_allocate(Length);
+    if (GroupsBuffer == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    Status = SampGetObjectAttribute(UserObject,
+                                    L"Groups",
+                                    NULL,
+                                    GroupsBuffer,
+                                    &Length);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    for (i = 0; i < (Length / sizeof(GROUP_MEMBERSHIP)); i++)
+    {
+        Status = SampOpenGroupObject(UserObject->ParentObject,
+                                     GroupsBuffer[i].RelativeId,
+                                     0,
+                                     &GroupObject);
+        if (!NT_SUCCESS(Status))
+        {
+            goto done;
+        }
+
+        Status = SampRemoveMemberFromGroup(GroupObject,
+                                           UserObject->RelativeId);
+
+        SampCloseDbObject(GroupObject);
+
+        if (!NT_SUCCESS(Status))
+        {
+            goto done;
+        }
+    }
+
+done:
+    if (GroupsBuffer != NULL)
+        midl_user_free(GroupsBuffer);
+
+    return Status;
+}
+
+
 NTSTATUS
 SampSetUserPassword(IN PSAM_DB_OBJECT UserObject,
                     IN PENCRYPTED_NT_OWF_PASSWORD NtPassword,

From 6993ef3cbb173957824ce5996b93b6eaa49b04da Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 12 Mar 2013 21:16:25 +0000
Subject: [PATCH 14/61] [PSDK] * Annotate batclass.h.

svn path=/trunk/; revision=58477
---
 reactos/include/psdk/batclass.h | 110 +++++++++++++++++++++-----------
 1 file changed, 72 insertions(+), 38 deletions(-)

diff --git a/reactos/include/psdk/batclass.h b/reactos/include/psdk/batclass.h
index 371ecc4d47e..f97140d9b05 100644
--- a/reactos/include/psdk/batclass.h
+++ b/reactos/include/psdk/batclass.h
@@ -163,28 +163,40 @@ typedef struct _BATTERY_STATUS {
 #define BATTERY_CLASS_MAJOR_VERSION       0x0001
 #define BATTERY_CLASS_MINOR_VERSION       0x0000
 
+_Function_class_(BCLASS_QUERY_TAG_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_QUERY_TAG_CALLBACK)(
-  IN PVOID Context,
-  OUT PULONG BatteryTag);
+  _In_ PVOID Context,
+  _Out_ PULONG BatteryTag);
 typedef BCLASS_QUERY_TAG_CALLBACK *PBCLASS_QUERY_TAG_CALLBACK;
 
+_Function_class_(BCLASS_QUERY_INFORMATION_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_QUERY_INFORMATION_CALLBACK)(
-  IN PVOID Context,
-  IN ULONG BatteryTag,
-  IN BATTERY_QUERY_INFORMATION_LEVEL Level,
-  IN LONG AtRate,
-  OUT PVOID Buffer,
-  IN ULONG BufferLength,
-  OUT PULONG ReturnedLength);
+  _In_ PVOID Context,
+  _In_ ULONG BatteryTag,
+  _In_ BATTERY_QUERY_INFORMATION_LEVEL Level,
+  _In_ LONG AtRate,
+  _Out_writes_bytes_to_(BufferLength, *ReturnedLength) PVOID Buffer,
+  _In_ ULONG BufferLength,
+  _Out_ PULONG ReturnedLength);
 typedef BCLASS_QUERY_INFORMATION_CALLBACK *PBCLASS_QUERY_INFORMATION_CALLBACK;
 
+_Function_class_(BCLASS_QUERY_STATUS_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_QUERY_STATUS_CALLBACK)(
-  IN PVOID Context,
-  IN ULONG BatteryTag,
-  OUT PBATTERY_STATUS BatteryStatus);
+  _In_ PVOID Context,
+  _In_ ULONG BatteryTag,
+  _Out_ PBATTERY_STATUS BatteryStatus);
 typedef BCLASS_QUERY_STATUS_CALLBACK *PBCLASS_QUERY_STATUS_CALLBACK;
 
 typedef struct _BATTERY_NOTIFY {
@@ -193,24 +205,36 @@ typedef struct _BATTERY_NOTIFY {
   ULONG HighCapacity;
 } BATTERY_NOTIFY, *PBATTERY_NOTIFY;
 
+_Function_class_(BCLASS_SET_STATUS_NOTIFY_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_SET_STATUS_NOTIFY_CALLBACK)(
-  IN PVOID Context,
-  IN ULONG BatteryTag,
-  IN PBATTERY_NOTIFY BatteryNotify);
+  _In_ PVOID Context,
+  _In_ ULONG BatteryTag,
+  _In_ PBATTERY_NOTIFY BatteryNotify);
 typedef BCLASS_SET_STATUS_NOTIFY_CALLBACK *PBCLASS_SET_STATUS_NOTIFY_CALLBACK;
 
+_Function_class_(BCLASS_SET_INFORMATION_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_SET_INFORMATION_CALLBACK)(
-  IN PVOID Context,
-  IN ULONG BatteryTag,
-  IN BATTERY_SET_INFORMATION_LEVEL Level,
-  IN PVOID Buffer OPTIONAL);
+  _In_ PVOID Context,
+  _In_ ULONG BatteryTag,
+  _In_ BATTERY_SET_INFORMATION_LEVEL Level,
+  _In_opt_ PVOID Buffer);
 typedef BCLASS_SET_INFORMATION_CALLBACK *PBCLASS_SET_INFORMATION_CALLBACK;
 
+_Function_class_(BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK)
+_IRQL_requires_same_
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 typedef NTSTATUS
 (NTAPI BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK)(
-  IN PVOID Context);
+  _In_ PVOID Context);
 typedef BCLASS_DISABLE_STATUS_NOTIFY_CALLBACK *PBCLASS_DISABLE_STATUS_NOTIFY_CALLBACK;
 
 typedef PBCLASS_QUERY_TAG_CALLBACK BCLASS_QUERY_TAG;
@@ -302,57 +326,67 @@ typedef struct _BATTERY_TAG_CHANGE {
 #define BCLASSAPI DECLSPEC_IMPORT
 #endif
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassInitializeDevice(
-  IN PBATTERY_MINIPORT_INFO MiniportInfo,
-  IN PVOID *ClassData);
+  _In_ PBATTERY_MINIPORT_INFO MiniportInfo,
+  _Out_ PVOID *ClassData);
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassIoctl(
-  IN PVOID ClassData,
-  IN OUT PIRP Irp);
+  _In_ PVOID ClassData,
+  _Inout_ PIRP Irp);
 
+_IRQL_requires_max_(DISPATCH_LEVEL)
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassStatusNotify(
-  IN PVOID  ClassData);
+  _In_ PVOID ClassData);
 
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassQueryWmiDataBlock(
-  IN PVOID ClassData,
-  IN OUT PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  IN ULONG GuidIndex,
-  OUT PULONG InstanceLengthArray,
-  IN ULONG OutBufferSize,
-  OUT PUCHAR Buffer OPTIONAL);
+  _In_ PVOID ClassData,
+  _Inout_ PDEVICE_OBJECT DeviceObject,
+  _Inout_ PIRP Irp,
+  _In_ ULONG GuidIndex,
+  _Out_writes_(1) PULONG InstanceLengthArray,
+  _In_ ULONG OutBufferSize,
+  _Out_writes_bytes_opt_(OutBufferSize) PUCHAR Buffer);
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Check_return_
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassSystemControl(
-  IN PVOID ClassData,
-  IN PVOID WmiLibContext, /* PWMILIB_CONTEXT */
-  IN PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  OUT PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */
+  _In_ PVOID ClassData,
+  _In_ PVOID WmiLibContext, /* PWMILIB_CONTEXT */
+  _In_ PDEVICE_OBJECT DeviceObject,
+  _Inout_ PIRP Irp,
+  _Out_ PVOID Disposition); /* PSYSCTL_IRP_DISPOSITION */
 
 #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
 BCLASSAPI
 NTSTATUS
 NTAPI
 BatteryClassUnload(
-  IN PVOID ClassData);
+  _In_ PVOID ClassData);
 
 #endif /* _WINDOWS_H */
 

From 0a47615a921cc2de78a1a4dfd97f00120e74c8b8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Tue, 12 Mar 2013 21:27:35 +0000
Subject: [PATCH 15/61] [SAMSRV] Set MaxPasswordAge, LockoutDuration and
 LockoutObservationWindow for domains during setup.

svn path=/trunk/; revision=58478
---
 reactos/dll/win32/samsrv/samsrv.h | 10 +++++-----
 reactos/dll/win32/samsrv/setup.c  | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/samsrv/samsrv.h b/reactos/dll/win32/samsrv/samsrv.h
index 9e838b572e7..672211b68b4 100644
--- a/reactos/dll/win32/samsrv/samsrv.h
+++ b/reactos/dll/win32/samsrv/samsrv.h
@@ -69,11 +69,11 @@ typedef struct _SAM_DOMAIN_FIXED_DATA
     ULONG Reserved;
     LARGE_INTEGER CreationTime;
     LARGE_INTEGER DomainModifiedCount;
-    LARGE_INTEGER MaxPasswordAge;
-    LARGE_INTEGER MinPasswordAge;
-    LARGE_INTEGER ForceLogoff;
-    LARGE_INTEGER LockoutDuration;
-    LARGE_INTEGER LockoutObservationWindow;
+    LARGE_INTEGER MaxPasswordAge;               /* relative Time */
+    LARGE_INTEGER MinPasswordAge;               /* relative Time */
+    LARGE_INTEGER ForceLogoff;                  /* relative Time */
+    LARGE_INTEGER LockoutDuration;              /* relative Time */
+    LARGE_INTEGER LockoutObservationWindow;     /* relative Time */
     LARGE_INTEGER ModifiedCountAtLastPromotion;
     ULONG NextRid;
     ULONG PasswordProperties;
diff --git a/reactos/dll/win32/samsrv/setup.c b/reactos/dll/win32/samsrv/setup.c
index 6f87a600fc0..bab10fecda2 100644
--- a/reactos/dll/win32/samsrv/setup.c
+++ b/reactos/dll/win32/samsrv/setup.c
@@ -13,10 +13,14 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(samsrv);
 
+
 /* GLOBALS *****************************************************************/
 
+#define TICKS_PER_SECOND 10000000LL
+
 SID_IDENTIFIER_AUTHORITY SecurityNtAuthority = {SECURITY_NT_AUTHORITY};
 
+
 /* FUNCTIONS ***************************************************************/
 
 BOOL
@@ -423,11 +427,11 @@ SampCreateDomain(IN HKEY hDomainsKey,
     FixedData.Version = 1;
     NtQuerySystemTime(&FixedData.CreationTime);
     FixedData.DomainModifiedCount.QuadPart = 0;
-//    FixedData.MaxPasswordAge                 // 6 Weeks
-    FixedData.MinPasswordAge.QuadPart = 0;     // Now
-//    FixedData.ForceLogoff
-//    FixedData.LockoutDuration                // 30 minutes
-//    FixedData.LockoutObservationWindow       // 30 minutes
+    FixedData.MaxPasswordAge.QuadPart = -(6LL * 7LL * 24LL * 60LL * 60LL * TICKS_PER_SECOND); /* 6 weeks */
+    FixedData.MinPasswordAge.QuadPart = 0;                                                    /* right now */
+//    FixedData.ForceLogoff.QuadPart = // very far in the future aka never
+    FixedData.LockoutDuration.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND);                   /* 30 minutes */
+    FixedData.LockoutObservationWindow.QuadPart = -(30LL * 60LL * TICKS_PER_SECOND);          /* 30 minutes */
     FixedData.ModifiedCountAtLastPromotion.QuadPart = 0;
     FixedData.NextRid = 1000;
     FixedData.PasswordProperties = 0;

From 77faf36cdd1fdc762dbb6ba90c6b89dcff0c76de Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 13 Mar 2013 12:06:41 +0000
Subject: [PATCH 16/61] [PSDK] * Annotate winnls.h.

svn path=/trunk/; revision=58482
---
 reactos/include/psdk/winnls.h | 448 ++++++++++++++++++++++++++++------
 1 file changed, 371 insertions(+), 77 deletions(-)

diff --git a/reactos/include/psdk/winnls.h b/reactos/include/psdk/winnls.h
index b3dfdcb7e90..4b1a9c328f5 100644
--- a/reactos/include/psdk/winnls.h
+++ b/reactos/include/psdk/winnls.h
@@ -624,44 +624,199 @@ typedef struct _FILEMUIINFO {
 #define IS_LOW_SURROGATE(ch) ((ch) >= LOW_SURROGATE_START  && (ch) <= LOW_SURROGATE_END)
 #define IS_SURROGATE_PAIR(high,low) (IS_HIGH_SURROGATE(high) && IS_LOW_SURROGATE(low))
 
-int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int);
-int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int);
-LCID WINAPI ConvertDefaultLocale(LCID);
-BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD);
-BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD);
-BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD);
-BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD);
-BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC);
-BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
-BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
-BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD);
-BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD);
-int WINAPI FoldStringA(DWORD,LPCSTR,int,LPSTR,int);
-int WINAPI FoldStringW(DWORD,LPCWSTR,int,LPWSTR,int);
+int
+WINAPI
+CompareStringA(
+  _In_ LCID Locale,
+  _In_ DWORD dwCmpFlags,
+  _In_reads_(cchCount1) LPCSTR lpString1,
+  _In_ int cchCount1,
+  _In_reads_(cchCount2) LPCSTR lpString2,
+  _In_ int cchCount2);
+
+int
+WINAPI
+CompareStringW(
+  _In_ LCID Locale,
+  _In_ DWORD dwCmpFlags,
+  _In_reads_(cchCount1) LPCWSTR lpString1,
+  _In_ int cchCount1,
+  _In_reads_(cchCount2) LPCWSTR lpString2,
+  _In_ int cchCount2);
+
+LCID WINAPI ConvertDefaultLocale(_In_ LCID);
+BOOL WINAPI EnumCalendarInfoA(_In_ CALINFO_ENUMPROCA, _In_ LCID, _In_ CALID, _In_ CALTYPE);
+BOOL WINAPI EnumCalendarInfoW(_In_ CALINFO_ENUMPROCW, _In_ LCID, _In_ CALID, _In_ CALTYPE);
+BOOL WINAPI EnumDateFormatsA(_In_ DATEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD);
+BOOL WINAPI EnumDateFormatsW(_In_ DATEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD);
+BOOL WINAPI EnumSystemCodePagesA(_In_ CODEPAGE_ENUMPROCA, _In_ DWORD);
+BOOL WINAPI EnumSystemCodePagesW(_In_ CODEPAGE_ENUMPROCW, _In_ DWORD);
+BOOL WINAPI EnumSystemGeoID(_In_ GEOCLASS, _In_ GEOID, _In_ GEO_ENUMPROC);
+BOOL WINAPI EnumSystemLocalesA(_In_ LOCALE_ENUMPROCA, _In_ DWORD);
+BOOL WINAPI EnumSystemLocalesW(_In_ LOCALE_ENUMPROCW, _In_ DWORD);
+BOOL WINAPI EnumTimeFormatsA(_In_ TIMEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD);
+BOOL WINAPI EnumTimeFormatsW(_In_ TIMEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD);
+
+int
+WINAPI
+FoldStringA(
+  _In_ DWORD dwMapFlags,
+  _In_reads_(cchSrc) LPCSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_opt_(cchDest) LPSTR lpDestStr,
+  _In_ int cchDest);
+
+int
+WINAPI
+FoldStringW(
+  _In_ DWORD dwMapFlags,
+  _In_reads_(cchSrc) LPCWSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_opt_(cchDest) LPWSTR lpDestStr,
+  _In_ int cchDest);
+
 UINT WINAPI GetACP(void);
-int WINAPI GetCalendarInfoA(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
-int WINAPI GetCalendarInfoW(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
-BOOL WINAPI GetCPInfo(UINT,LPCPINFO);
-BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA);
-BOOL WINAPI GetCPInfoExW(UINT,DWORD,LPCPINFOEXW);
-int WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,int);
-int WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int);
+
+int
+WINAPI
+GetCalendarInfoA(
+  _In_ LCID Locale,
+  _In_ CALID Calendar,
+  _In_ CALTYPE CalType,
+  _Out_writes_opt_(cchData) LPSTR lpCalData,
+  _In_ int cchData,
+  _Out_opt_ LPDWORD lpValue);
+
+int
+WINAPI
+GetCalendarInfoW(
+  _In_ LCID Locale,
+  _In_ CALID Calendar,
+  _In_ CALTYPE CalType,
+  _Out_writes_opt_(cchData) LPWSTR lpCalData,
+  _In_ int cchData,
+  _Out_opt_ LPDWORD lpValue);
+
+BOOL WINAPI GetCPInfo(_In_ UINT, _Out_ LPCPINFO);
+BOOL WINAPI GetCPInfoExA(_In_ UINT, _In_ DWORD, _Out_ LPCPINFOEXA);
+BOOL WINAPI GetCPInfoExW(_In_ UINT, _In_ DWORD, _Out_ LPCPINFOEXW);
+
+int
+WINAPI
+GetCurrencyFormatA(
+  _In_ LCID Locale,
+  _In_ DWORD dwFlags,
+  _In_ LPCSTR lpValue,
+  _In_opt_ const CURRENCYFMTA *lpFormat,
+  _Out_writes_opt_(cchCurrency) LPSTR lpCurrencyStr,
+  _In_ int cchCurrency);
+
+int
+WINAPI
+GetCurrencyFormatW(
+  _In_ LCID Locale,
+  _In_ DWORD dwFlags,
+  _In_ LPCWSTR lpValue,
+  _In_opt_ const CURRENCYFMTW *lpFormat,
+  _Out_writes_opt_(cchCurrency) LPWSTR lpCurrencyStr,
+  _In_ int cchCurrency);
+
 int WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int);
 int WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
-int WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,int,LANGID);
-int WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,int,LANGID);
-int WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,int);
-int WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,int);
-BOOL WINAPI GetNLSVersion(NLS_FUNCTION,LCID,LPNLSVERSIONINFO);
-int WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,int);
-int WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int);
+
+int
+WINAPI
+GetGeoInfoA(
+  _In_ GEOID Location,
+  _In_ GEOTYPE GeoType,
+  _Out_writes_opt_(cchData) LPSTR lpGeoData,
+  _In_ int cchData,
+  _In_ LANGID LangId);
+
+int
+WINAPI
+GetGeoInfoW(
+  _In_ GEOID Location,
+  _In_ GEOTYPE GeoType,
+  _Out_writes_opt_(cchData) LPWSTR lpGeoData,
+  _In_ int cchData,
+  _In_ LANGID LangId);
+
+int
+WINAPI
+GetLocaleInfoA(
+  _In_ LCID Locale,
+  _In_ LCTYPE LCType,
+  _Out_writes_opt_(cchData) LPSTR lpLCData,
+  _In_ int cchData);
+
+int
+WINAPI
+GetLocaleInfoW(
+  _In_ LCID Locale,
+  _In_ LCTYPE LCType,
+  _Out_writes_opt_(cchData) LPWSTR lpLCData,
+  _In_ int cchData);
+
+BOOL WINAPI GetNLSVersion(_In_ NLS_FUNCTION, _In_ LCID, _Inout_ LPNLSVERSIONINFO);
+
+int
+WINAPI
+GetNumberFormatA(
+  _In_ LCID Locale,
+  _In_ DWORD dwFlags,
+  _In_ LPCSTR lpValue,
+  _In_opt_ const NUMBERFMTA *lpFormat,
+  _Out_writes_opt_(cchNumber) LPSTR lpNumberStr,
+  _In_ int cchNumber);
+
+int
+WINAPI
+GetNumberFormatW(
+  _In_ LCID Locale,
+  _In_ DWORD dwFlags,
+  _In_ LPCWSTR lpValue,
+  _In_opt_ const NUMBERFMTW *lpFormat,
+  _Out_writes_opt_(cchNumber) LPWSTR lpNumberStr,
+  _In_ int cchNumber);
+
 UINT WINAPI GetOEMCP(void);
-BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,int,LPWORD);
+
+BOOL
+WINAPI
+GetStringTypeA(
+  _In_ LCID Locale,
+  _In_ DWORD dwInfoType,
+  _In_reads_(cchSrc) LPCSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_ LPWORD lpCharType);
+
+BOOL
+WINAPI
+GetStringTypeW(
+  _In_ DWORD dwInfoType,
+  _In_reads_(cchSrc) LPCWSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_ LPWORD lpCharType);
+
+BOOL
+WINAPI
+GetStringTypeExA(
+  _In_ LCID Locale,
+  _In_ DWORD dwInfoType,
+  _In_reads_(cchSrc) LPCSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_(cchSrc) LPWORD lpCharType);
+
+BOOL
+WINAPI
+GetStringTypeExW(
+  _In_ LCID Locale,
+  _In_ DWORD dwInfoType,
+  _In_reads_(cchSrc) LPCWSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_(cchSrc) LPWORD lpCharType);
+
 LANGID WINAPI GetSystemDefaultLangID(void);
 LCID WINAPI GetSystemDefaultLCID(void);
 LCID WINAPI GetThreadLocale(void);
@@ -670,60 +825,199 @@ int WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
 LANGID WINAPI GetUserDefaultLangID(void);
 LCID WINAPI GetUserDefaultLCID(void);
 LANGID WINAPI GetUserDefaultUILanguage(void);
-GEOID WINAPI GetUserGeoID(GEOCLASS);
-BOOL WINAPI IsDBCSLeadByte(BYTE);
-BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE);
-BOOL WINAPI IsNLSDefinedString(NLS_FUNCTION,DWORD,LPNLSVERSIONINFO,LPCWSTR,int);
-BOOL WINAPI IsValidCodePage(UINT);
-BOOL WINAPI IsValidLocale(LCID,DWORD);
-int WINAPI LCMapStringA(LCID,DWORD,LPCSTR,int,LPSTR,int);
-int WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,int,LPWSTR,int);
+GEOID WINAPI GetUserGeoID(_In_ GEOCLASS);
+BOOL WINAPI IsDBCSLeadByte(_In_ BYTE);
+BOOL WINAPI IsDBCSLeadByteEx(_In_ UINT, _In_ BYTE);
+
+BOOL
+WINAPI
+IsNLSDefinedString(
+  _In_ NLS_FUNCTION Function,
+  _In_ DWORD dwFlags,
+  _In_ LPNLSVERSIONINFO lpVersionInformation,
+  _In_reads_(cchStr) LPCWSTR lpString,
+  _In_ int cchStr);
+
+BOOL WINAPI IsValidCodePage(_In_ UINT);
+BOOL WINAPI IsValidLocale(_In_ LCID, _In_ DWORD);
+
+int
+WINAPI
+LCMapStringA(
+  _In_ LCID Locale,
+  _In_ DWORD dwMapFlags,
+  _In_reads_(cchSrc) LPCSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_opt_(_Inexpressible_(cchDest)) LPSTR lpDestStr,
+  _In_ int cchDest);
+
+int
+WINAPI
+LCMapStringW(
+  _In_ LCID Locale,
+  _In_ DWORD dwMapFlags,
+  _In_reads_(cchSrc) LPCWSTR lpSrcStr,
+  _In_ int cchSrc,
+  _Out_writes_opt_(_Inexpressible_(cchDest)) LPWSTR lpDestStr,
+  _In_ int cchDest);
+
 int WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,int,LPWSTR,int);
-int WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR);
-int WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR);
-BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR);
-BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR);
-BOOL WINAPI SetThreadLocale(LCID);
-LANGID WINAPI SetThreadUILanguage(LANGID);
+int WINAPI SetCalendarInfoA(_In_ LCID, _In_ CALID, _In_ CALTYPE, _In_ LPCSTR);
+int WINAPI SetCalendarInfoW(_In_ LCID, _In_ CALID, _In_ CALTYPE, _In_ LPCWSTR);
+BOOL WINAPI SetLocaleInfoA(_In_ LCID, _In_ LCTYPE, _In_ LPCSTR);
+BOOL WINAPI SetLocaleInfoW(_In_ LCID, _In_ LCTYPE, _In_ LPCWSTR);
+BOOL WINAPI SetThreadLocale(_In_ LCID);
+LANGID WINAPI SetThreadUILanguage(_In_ LANGID);
 BOOL WINAPI SetUserDefaultLCID(LCID);
 BOOL WINAPI SetUserDefaultUILanguage(LANGID);
-BOOL WINAPI SetUserGeoID(GEOID);
+BOOL WINAPI SetUserGeoID(_In_ GEOID);
 int WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL);
 #if (WINVER >= 0x0500)
-BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA,LCID,DWORD);
-BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW,LCID,DWORD);
-BOOL WINAPI EnumSystemLanguageGroupsA(LANGUAGEGROUP_ENUMPROCA,DWORD,LONG_PTR);
-BOOL WINAPI EnumSystemLanguageGroupsW(LANGUAGEGROUP_ENUMPROCW,DWORD,LONG_PTR);
-BOOL WINAPI EnumLanguageGroupLocalesA(LANGGROUPLOCALE_ENUMPROCA,LGRPID,DWORD,LONG_PTR);
-BOOL WINAPI EnumLanguageGroupLocalesW(LANGGROUPLOCALE_ENUMPROCW,LGRPID,DWORD,LONG_PTR);
-BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA,DWORD,LONG_PTR);
-BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW,DWORD,LONG_PTR);
+BOOL WINAPI EnumCalendarInfoExA(_In_ CALINFO_ENUMPROCEXA, _In_ LCID, _In_ CALID, _In_ CALTYPE);
+BOOL WINAPI EnumCalendarInfoExW(_In_ CALINFO_ENUMPROCEXW, _In_ LCID, _In_ CALID, _In_ CALTYPE);
+BOOL WINAPI EnumDateFormatsExA(_In_ DATEFMT_ENUMPROCEXA, _In_ LCID, _In_ DWORD);
+BOOL WINAPI EnumDateFormatsExW(_In_ DATEFMT_ENUMPROCEXW, _In_ LCID, _In_ DWORD);
+BOOL WINAPI EnumSystemLanguageGroupsA(_In_ LANGUAGEGROUP_ENUMPROCA, _In_ DWORD, _In_ LONG_PTR);
+BOOL WINAPI EnumSystemLanguageGroupsW(_In_ LANGUAGEGROUP_ENUMPROCW, _In_ DWORD, _In_ LONG_PTR);
+BOOL WINAPI EnumLanguageGroupLocalesA(_In_ LANGGROUPLOCALE_ENUMPROCA, _In_ LGRPID, _In_ DWORD, _In_ LONG_PTR);
+BOOL WINAPI EnumLanguageGroupLocalesW(_In_ LANGGROUPLOCALE_ENUMPROCW, _In_ LGRPID, _In_ DWORD, _In_ LONG_PTR);
+BOOL WINAPI EnumUILanguagesA(_In_ UILANGUAGE_ENUMPROCA, _In_ DWORD, _In_ LONG_PTR);
+BOOL WINAPI EnumUILanguagesW(_In_ UILANGUAGE_ENUMPROCW, _In_ DWORD, _In_ LONG_PTR);
 LANGID WINAPI GetSystemDefaultUILanguage(void);
 LANGID WINAPI GetUserDefaultUILanguage(void);
-BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD);
+BOOL WINAPI IsValidLanguageGroup(_In_ LGRPID, _In_ DWORD);
 #endif /* (WINVER >= 0x0500) */
+
 #if (WINVER >= 0x0600)
-BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*);
-BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG);
+
+_Success_(return != FALSE)
+BOOL
+WINAPI
+GetFileMUIInfo(
+  _In_ DWORD dwFlags,
+  _In_ PCWSTR pcwszFilePath,
+  _Inout_updates_bytes_to_opt_(*pcbFileMUIInfo, *pcbFileMUIInfo) PFILEMUIINFO pFileMUIInfo,
+  _Inout_ DWORD *pcbFileMUIInfo);
+
+BOOL
+WINAPI
+GetFileMUIPath(
+  _In_ DWORD dwFlags,
+  _In_ PCWSTR pcwszFilePath,
+  _Inout_updates_opt_(*pcchLanguage) PWSTR pwszLanguage,
+  _Inout_ PULONG pcchLanguage,
+  _Out_writes_opt_(*pcchFileMUIPath) PWSTR pwszFileMUIPath,
+  _Inout_ PULONG pcchFileMUIPath,
+  _Inout_ PULONGLONG pululEnumerator);
+
 WINBASEAPI
-int WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,int);
-BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG);
-BOOL WINAPI GetSystemPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG);
-BOOL WINAPI GetThreadPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG);
+int
+WINAPI
+GetLocaleInfoEx(
+  _In_opt_ LPCWSTR lpLocaleName,
+  _In_ LCTYPE LCType,
+  _Out_writes_opt_(cchData) LPWSTR lpLCData,
+  _In_ int cchData);
+
+BOOL
+WINAPI
+GetProcessPreferredUILanguages(
+  _In_ DWORD dwFlags,
+  _Out_ PULONG pulNumLanguages,
+  _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
+  _Inout_ PULONG pcchLanguagesBuffer);
+
+BOOL
+WINAPI
+GetSystemPreferredUILanguages(
+  _In_ DWORD dwFlags,
+  _Out_ PULONG pulNumLanguages,
+  _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
+  _Inout_ PULONG pcchLanguagesBuffer);
+
+BOOL
+WINAPI
+GetThreadPreferredUILanguages(
+  _In_ DWORD dwFlags,
+  _Out_ PULONG pulNumLanguages,
+  _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
+  _Inout_ PULONG pcchLanguagesBuffer);
+
 LANGID WINAPI GetThreadUILanguage(void);
-BOOL WINAPI GetUILanguageInfo(DWORD,PCZZWSTR,PZZWSTR,PDWORD,PDWORD);
-BOOL WINAPI GetUserPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG);
-int WINAPI IdnToAscii(DWORD,LPCWSTR,int,LPWSTR,int);
-int WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,int,LPWSTR,int);
-int WINAPI IdnToUnicode(DWORD,LPCWSTR,int,LPWSTR,int);
-BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int);
-int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int);
-int WINAPI GetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int);
-BOOL WINAPI SetProcessPreferredUILanguages(DWORD,PCZZWSTR,PULONG);
-BOOL WINAPI SetThreadPreferredUILanguages(DWORD,PCZZWSTR,PULONG);
-BOOL WINAPI VerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int);
+
+BOOL
+WINAPI
+GetUILanguageInfo(
+  _In_ DWORD dwFlags,
+  _In_ PCZZWSTR pwmszLanguage,
+  _Out_writes_opt_(*pcchFallbackLanguages) PZZWSTR pwszFallbackLanguages,
+  _Inout_opt_ PDWORD pcchFallbackLanguages,
+  _Out_ PDWORD pAttributes);
+
+BOOL
+WINAPI
+GetUserPreferredUILanguages(
+  _In_ DWORD dwFlags,
+  _Out_ PULONG pulNumLanguages,
+  _Out_writes_opt_(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
+  _Inout_ PULONG pcchLanguagesBuffer);
+
+int
+WINAPI
+IdnToAscii(
+  _In_ DWORD dwFlags,
+  _In_reads_(cchUnicodeChar) LPCWSTR lpUnicodeCharStr,
+  _In_ int cchUnicodeChar,
+  _Out_writes_opt_(cchASCIIChar) LPWSTR lpASCIICharStr,
+  _In_ int cchASCIIChar);
+
+int
+WINAPI
+IdnToNameprepUnicode(
+  _In_ DWORD dwFlags,
+  _In_reads_(cchUnicodeChar) LPCWSTR lpUnicodeCharStr,
+  _In_ int cchUnicodeChar,
+  _Out_writes_opt_(cchNameprepChar) LPWSTR lpNameprepCharStr,
+  _In_ int cchNameprepChar);
+
+int
+WINAPI
+IdnToUnicode(
+  _In_ DWORD dwFlags,
+  _In_reads_(cchASCIIChar) LPCWSTR lpASCIICharStr,
+  _In_ int cchASCIIChar,
+  _Out_writes_opt_(cchUnicodeChar) LPWSTR lpUnicodeCharStr,
+  _In_ int cchUnicodeChar);
+
+BOOL
+WINAPI
+IsNormalizedString(
+  _In_ NORM_FORM NormForm,
+  _In_reads_(cwLength) LPCWSTR lpString,
+  _In_ int cwLength);
+
+int
+WINAPI
+NormalizeString(
+  _In_ NORM_FORM NormForm,
+  _In_reads_(cwSrcLength) LPCWSTR lpSrcString,
+  _In_ int cwSrcLength,
+  _Out_writes_opt_(cwDstLength) LPWSTR lpDstString,
+  _In_ int cwDstLength);
+
+int
+WINAPI
+GetStringScripts(
+  _In_ DWORD dwFlags,
+  _In_ LPCWSTR lpString,
+  _In_ int cchString,
+  _Out_writes_opt_(cchScripts) LPWSTR lpScripts,
+  _In_ int cchScripts);
+
+BOOL WINAPI SetProcessPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG);
+BOOL WINAPI SetThreadPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG);
+BOOL WINAPI VerifyScripts(_In_ DWORD, _In_ LPCWSTR, _In_ int, _In_ LPCWSTR, _In_ int);
+
 #endif /* (WINVER >= 0x0600) */
 
 #ifdef UNICODE

From 01a913e5186cf2468cff50c6dcccd4e649c634c1 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 13 Mar 2013 12:30:49 +0000
Subject: [PATCH 17/61] [CRT] * Annotate errno.h.

svn path=/trunk/; revision=58483
---
 reactos/include/crt/errno.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/include/crt/errno.h b/reactos/include/crt/errno.h
index 944b3ad504b..8e8917b5458 100644
--- a/reactos/include/crt/errno.h
+++ b/reactos/include/crt/errno.h
@@ -17,8 +17,8 @@ extern "C" {
   _CRTIMP extern int *__cdecl _errno(void);
 #define errno (*_errno())
 
-  errno_t __cdecl _set_errno(int _Value);
-  errno_t __cdecl _get_errno(int *_Value);
+  errno_t __cdecl _set_errno(_In_ int _Value);
+  errno_t __cdecl _get_errno(_Out_ int *_Value);
 #endif
 
 #define EPERM 1

From 3637c5fa0727a9034b03a242d69f1d74cb0d7d3f Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 13 Mar 2013 14:19:51 +0000
Subject: [PATCH 18/61] [CRT] * Annotate locale.h.

svn path=/trunk/; revision=58484
---
 reactos/include/crt/locale.h | 69 ++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 10 deletions(-)

diff --git a/reactos/include/crt/locale.h b/reactos/include/crt/locale.h
index d7ba1077288..f5cdc8a50fa 100644
--- a/reactos/include/crt/locale.h
+++ b/reactos/include/crt/locale.h
@@ -68,19 +68,68 @@ extern "C" {
 
 #endif
 
-  int __cdecl _configthreadlocale(int _Flag);
-  char *__cdecl setlocale(int _Category,const char *_Locale);
-  _CRTIMP struct lconv *__cdecl localeconv(void);
-  _locale_t __cdecl _get_current_locale(void);
-  _locale_t __cdecl _create_locale(int _Category,const char *_Locale);
-  void __cdecl _free_locale(_locale_t _Locale);
-  _locale_t __cdecl __get_current_locale(void);
-  _locale_t __cdecl __create_locale(int _Category,const char *_Locale);
-  void __cdecl __free_locale(_locale_t _Locale);
+  _Check_return_opt_
+  int
+  __cdecl
+  _configthreadlocale(
+    _In_ int _Flag);
+
+  _Check_return_opt_
+  char*
+  __cdecl
+  setlocale(
+    _In_ int _Category,
+    _In_opt_z_ const char *_Locale);
+
+  _Check_return_opt_
+  _CRTIMP
+  struct lconv*
+  __cdecl
+  localeconv(void);
+
+  _Check_return_opt_
+  _locale_t
+  __cdecl
+  _get_current_locale(void);
+
+  _Check_return_opt_
+  _locale_t
+  __cdecl
+  _create_locale(
+    _In_ int _Category,
+    _In_z_ const char *_Locale);
+
+  void
+  __cdecl
+  _free_locale(
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _locale_t
+  __cdecl
+  __get_current_locale(void);
+
+  _Check_return_
+  _locale_t
+  __cdecl
+  __create_locale(
+    _In_ int _Category,
+    _In_z_ const char *_Locale);
+
+  void
+  __cdecl
+  __free_locale(
+    _In_opt_ _locale_t _Locale);
 
 #ifndef _WLOCALE_DEFINED
 #define _WLOCALE_DEFINED
-  _CRTIMP wchar_t *__cdecl _wsetlocale(int _Category,const wchar_t *_Locale);
+  _Check_return_opt_
+  _CRTIMP
+  wchar_t*
+  __cdecl
+  _wsetlocale(
+    _In_ int _Category,
+    _In_opt_z_ const wchar_t *_Locale);
 #endif
 
 #ifdef __cplusplus

From 7df32873159feabcc0b82c6233e729884007723c Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 13 Mar 2013 18:13:55 +0000
Subject: [PATCH 19/61] [NTOSKRNL] - Implement "!pool" kdbg extension that
 works like in WinDbg - Implement ExpCheckPoolAllocation to check a single
 allocation for sanity - Rename MEMORY_ARE::PageOpCount (which is unused) to
 Magic and set it to 'MAre' - Implement MiRosCheckMemoryAreas, that checks all
 memory areas for integrity and PspCheckProcessList that checks the process
 list. The code is not used anywhere, since it can cause a major performance
 impact, but it proved useful to detect non paged pool corruptions. So I'll
 commit it in the hope that it will be useful.

svn path=/trunk/; revision=58485
---
 reactos/ntoskrnl/include/internal/mm.h |  21 ++-
 reactos/ntoskrnl/kdbg/kdb.h            |   6 +
 reactos/ntoskrnl/kdbg/kdb_cli.c        |  23 +++-
 reactos/ntoskrnl/mm/ARM3/expool.c      | 177 +++++++++++++++++++++++++
 reactos/ntoskrnl/mm/marea.c            | 117 ++++++++++++++--
 reactos/ntoskrnl/ps/kill.c             |  48 +++++++
 6 files changed, 380 insertions(+), 12 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index b9799c40f64..a905b96ed80 100644
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -257,7 +257,7 @@ typedef struct _MEMORY_AREA
     ULONG Protect;
     ULONG Flags;
     BOOLEAN DeleteInProgress;
-    ULONG PageOpCount;
+    ULONG Magic;
     PVOID Vad;
     union
     {
@@ -586,6 +586,15 @@ MmMapMemoryArea(PVOID BaseAddress,
                 ULONG Consumer,
                 ULONG Protection);
 
+VOID
+NTAPI
+MiRosCheckMemoryAreas(
+   PMMSUPPORT AddressSpace);
+
+VOID
+NTAPI
+MiCheckAllProcessMemoryAreas(VOID);
+
 /* npool.c *******************************************************************/
 
 VOID
@@ -1748,3 +1757,13 @@ MmGetKernelAddressSpace(VOID)
 {
     return MmKernelAddressSpace;
 }
+
+
+/* expool.c ******************************************************************/
+
+VOID
+NTAPI
+ExpCheckPoolAllocation(
+    PVOID P,
+    POOL_TYPE PoolType,
+    ULONG Tag);
diff --git a/reactos/ntoskrnl/kdbg/kdb.h b/reactos/ntoskrnl/kdbg/kdb.h
index 1872377e96a..55c6698f29b 100644
--- a/reactos/ntoskrnl/kdbg/kdb.h
+++ b/reactos/ntoskrnl/kdbg/kdb.h
@@ -114,6 +114,12 @@ KdbpPrint(
    IN PCHAR Format,
    IN ...  OPTIONAL);
 
+BOOLEAN
+NTAPI
+KdbpGetHexNumber(
+    IN PCHAR pszNum,
+    OUT ULONG_PTR *pulValue);
+
 /* from kdb_expr.c */
 
 BOOLEAN
diff --git a/reactos/ntoskrnl/kdbg/kdb_cli.c b/reactos/ntoskrnl/kdbg/kdb_cli.c
index ec0e53f89e3..e7d04517647 100644
--- a/reactos/ntoskrnl/kdbg/kdb_cli.c
+++ b/reactos/ntoskrnl/kdbg/kdb_cli.c
@@ -90,6 +90,8 @@ static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]);
 static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]);
 static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]);
 
+BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]);
+
 #ifdef __ROS_DWARF__
 static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]);
 #endif
@@ -178,7 +180,8 @@ static const struct
     { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet },
     { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg },
     { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg },
-    { "help", "help", "Display help screen.", KdbpCmdHelp }
+    { "help", "help", "Display help screen.", KdbpCmdHelp },
+    { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }
 };
 
 /* FUNCTIONS *****************************************************************/
@@ -403,6 +406,24 @@ KdbpEvaluateExpression(
     return Ok;
 }
 
+BOOLEAN
+NTAPI
+KdbpGetHexNumber(
+    IN PCHAR pszNum,
+    OUT ULONG_PTR *pulValue)
+{
+    char *endptr;
+
+    /* Skip optional '0x' prefix */
+    if ((pszNum[0] == '0') && ((pszNum[1] == 'x') || (pszNum[1] == 'X')))
+        pszNum += 2;
+
+    /* Make a number from the string (hex) */
+    *pulValue = strtoul(pszNum, &endptr, 16);
+
+    return (*endptr == '\0');
+}
+
 /*!\brief Evaluates an expression and displays the result.
  */
 static BOOLEAN
diff --git a/reactos/ntoskrnl/mm/ARM3/expool.c b/reactos/ntoskrnl/mm/ARM3/expool.c
index d496345e5d8..39e3cccb7ed 100644
--- a/reactos/ntoskrnl/mm/ARM3/expool.c
+++ b/reactos/ntoskrnl/mm/ARM3/expool.c
@@ -281,6 +281,86 @@ ExpCheckPoolHeader(IN PPOOL_HEADER Entry)
     }
 }
 
+VOID
+NTAPI
+ExpCheckPoolAllocation(
+    PVOID P,
+    POOL_TYPE PoolType,
+    ULONG Tag)
+{
+    PPOOL_HEADER Entry;
+    ULONG i;
+    KIRQL OldIrql;
+    POOL_TYPE RealPoolType;
+
+    /* Get the pool header */
+    Entry = ((PPOOL_HEADER)P) - 1;
+
+    /* Check if this is a large allocation */
+    if (PAGE_ALIGN(P) == P)
+    {
+        /* Lock the pool table */
+        KeAcquireSpinLock(&ExpLargePoolTableLock, &OldIrql);
+
+        /* Find the pool tag */
+        for (i = 0; i < PoolBigPageTableSize; i++)
+        {
+            /* Check if this is our allocation */
+            if (PoolBigPageTable[i].Va == P)
+            {
+                /* Make sure the tag is ok */
+                if (PoolBigPageTable[i].Key != Tag)
+                {
+                    KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, PoolBigPageTable[i].Key, Tag);
+                }
+
+                break;
+            }
+        }
+
+        /* Release the lock */
+        KeReleaseSpinLock(&ExpLargePoolTableLock, OldIrql);
+
+        if (i == PoolBigPageTableSize)
+        {
+            /* Did not find the allocation */
+            //ASSERT(FALSE);
+        }
+
+        /* Get Pool type by address */
+        RealPoolType = MmDeterminePoolType(P);
+    }
+    else
+    {
+        /* Verify the tag */
+        if (Entry->PoolTag != Tag)
+        {
+            DPRINT1("Allocation has wrong pool tag! Expected '%.4s', got '%.4s' (0x%08lx)\n",
+                    &Tag, &Entry->PoolTag, Entry->PoolTag);
+            KeBugCheckEx(BAD_POOL_CALLER, 0x0A, (ULONG_PTR)P, Entry->PoolTag, Tag);
+        }
+
+        /* Check the rest of the header */
+        ExpCheckPoolHeader(Entry);
+
+        /* Get Pool type from entry */
+        RealPoolType = (Entry->PoolType - 1);
+    }
+
+    /* Should we check the pool type? */
+    if (PoolType != -1)
+    {
+        /* Verify the pool type */
+        if (RealPoolType != PoolType)
+        {
+            DPRINT1("Wrong pool type! Expected %s, got %s\n",
+                    PoolType & BASE_POOL_TYPE_MASK ? "PagedPool" : "NonPagedPool",
+                    (Entry->PoolType - 1) & BASE_POOL_TYPE_MASK ? "PagedPool" : "NonPagedPool");
+            KeBugCheckEx(BAD_POOL_CALLER, 0xCC, (ULONG_PTR)P, Entry->PoolTag, Tag);
+        }
+    }
+}
+
 VOID
 NTAPI
 ExpCheckPoolBlocks(IN PVOID Block)
@@ -2436,4 +2516,101 @@ ExAllocatePoolWithQuotaTag(IN POOL_TYPE PoolType,
     return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag);
 }
 
+
+BOOLEAN
+ExpKdbgExtPool(
+    ULONG Argc,
+    PCHAR Argv[])
+{
+    ULONG_PTR Address = 0, Flags = 0;
+    PVOID PoolPage;
+    PPOOL_HEADER Entry;
+    BOOLEAN ThisOne;
+    PULONG Data;
+
+    if (Argc > 1)
+    {
+        /* Get address */
+        if (!KdbpGetHexNumber(Argv[1], &Address))
+        {
+            KdbpPrint("Invalid parameter: %s\n", Argv[0]);
+            return TRUE;
+        }
+    }
+
+    if (Argc > 2)
+    {
+        /* Get address */
+        if (!KdbpGetHexNumber(Argv[1], &Flags))
+        {
+            KdbpPrint("Invalid parameter: %s\n", Argv[0]);
+            return TRUE;
+        }
+    }
+
+    /* Check if we got an address */
+    if (Address != 0)
+    {
+        /* Get the base page */
+        PoolPage = PAGE_ALIGN(Address);
+    }
+    else
+    {
+        KdbpPrint("Heap is unimplemented\n");
+        return TRUE;
+    }
+
+    /* No paging support! */
+    if (!MmIsAddressValid(PoolPage))
+    {
+        KdbpPrint("Address not accessible!\n");
+        return TRUE;
+    }
+
+    /* Get pool type */
+    if ((Address >= (ULONG_PTR)MmPagedPoolStart) && (Address <= (ULONG_PTR)MmPagedPoolEnd))
+        KdbpPrint("Allocation is from PagedPool region\n");
+    else if ((Address >= (ULONG_PTR)MmNonPagedPoolStart) && (Address <= (ULONG_PTR)MmNonPagedPoolEnd))
+        KdbpPrint("Allocation is from NonPagedPool region\n");
+    else
+    {
+        KdbpPrint("Address 0x%p is not within any pool!\n", (PVOID)Address);
+        return TRUE;
+    }
+
+    /* Loop all entries of that page */
+    Entry = PoolPage;
+    do
+    {
+        /* Check if the address is within that entry */
+        ThisOne = ((Address >= (ULONG_PTR)Entry) &&
+                   (Address < (ULONG_PTR)(Entry + Entry->BlockSize)));
+
+        if (!(Flags & 1) || ThisOne)
+        {
+            /* Print the line */
+            KdbpPrint("%c%p size: %4d previous size: %4d  %s  %.4s\n",
+                     ThisOne ? '*' : ' ', Entry, Entry->BlockSize, Entry->PreviousSize,
+                     (Flags & 0x80000000) ? "" : (Entry->PoolType ? "(Allocated)" : "(Free)     "),
+                     (Flags & 0x80000000) ? "" : (PCHAR)&Entry->PoolTag);
+        }
+
+        if (Flags & 1)
+        {
+            Data = (PULONG)(Entry + 1);
+            KdbpPrint("    %p  %08lx %08lx %08lx %08lx\n"
+                     "    %p  %08lx %08lx %08lx %08lx\n",
+                     &Data[0], Data[0], Data[1], Data[2], Data[3],
+                     &Data[4], Data[4], Data[5], Data[6], Data[7]);
+        }
+
+        /* Go to next entry */
+        Entry = POOL_BLOCK(Entry, Entry->BlockSize);
+    }
+    while ((Entry->BlockSize != 0) && ((ULONG_PTR)Entry < (ULONG_PTR)PoolPage + PAGE_SIZE));
+
+    return TRUE;
+}
+
+
 /* EOF */
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index 9ecaeb91883..aae43d6f19e 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -401,7 +401,7 @@ MmInsertMemoryArea(
        Vad->u.VadFlags.Spare = 1;
        Vad->u.VadFlags.PrivateMemory = 1;
        Vad->u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect);
-       
+
        /* Insert the VAD */
        MiInsertVad(Vad, Process);
        marea->Vad = Vad;
@@ -676,6 +676,100 @@ NTAPI
 MiRemoveNode(IN PMMADDRESS_NODE Node,
 IN PMM_AVL_TABLE Table);
 
+#if DBG
+
+static
+VOID
+MiRosCheckMemoryAreasRecursive(
+   PMEMORY_AREA Node)
+{
+    /* Check if the allocation is ok */
+    ExpCheckPoolAllocation(Node, NonPagedPool, 'ERAM');
+
+    /* Check some fields */
+    ASSERT(Node->Magic == 'erAM');
+    ASSERT(PAGE_ALIGN(Node->StartingAddress) == Node->StartingAddress);
+    ASSERT(Node->EndingAddress != NULL);
+    ASSERT(PAGE_ALIGN(Node->EndingAddress) == Node->EndingAddress);
+    ASSERT((ULONG_PTR)Node->StartingAddress < (ULONG_PTR)Node->EndingAddress);
+    ASSERT((Node->Type == 0) ||
+           (Node->Type == MEMORY_AREA_CACHE) ||
+          // (Node->Type == MEMORY_AREA_CACHE_SEGMENT) ||
+           (Node->Type == MEMORY_AREA_SECTION_VIEW) ||
+           (Node->Type == MEMORY_AREA_OWNED_BY_ARM3) ||
+           (Node->Type == (MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC)));
+
+    /* Recursively check children */
+    if (Node->LeftChild != NULL)
+        MiRosCheckMemoryAreasRecursive(Node->LeftChild);
+    if (Node->RightChild != NULL)
+        MiRosCheckMemoryAreasRecursive(Node->RightChild);
+}
+
+VOID
+NTAPI
+MiRosCheckMemoryAreas(
+   PMMSUPPORT AddressSpace)
+{
+    PMEMORY_AREA RootNode;
+    PEPROCESS AddressSpaceOwner;
+    BOOLEAN NeedReleaseLock;
+
+    NeedReleaseLock = FALSE;
+
+    /* Get the address space owner */
+    AddressSpaceOwner = CONTAINING_RECORD(AddressSpace, EPROCESS, Vm);
+
+    /* Check if we already own the address space lock */
+    if (AddressSpaceOwner->AddressCreationLock.Owner != KeGetCurrentThread())
+    {
+        /* We must own it! */
+        MmLockAddressSpace(AddressSpace);
+        NeedReleaseLock = TRUE;
+    }
+
+    /* Check all memory areas */
+    RootNode = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink;
+    MiRosCheckMemoryAreasRecursive(RootNode);
+
+    /* Release the lock, if we acquired it */
+    if (NeedReleaseLock)
+    {
+        MmUnlockAddressSpace(AddressSpace);
+    }
+}
+
+extern KGUARDED_MUTEX PspActiveProcessMutex;
+
+VOID
+NTAPI
+MiCheckAllProcessMemoryAreas(VOID)
+{
+    PEPROCESS Process;
+    PLIST_ENTRY Entry;
+
+    /* Acquire the Active Process Lock */
+    KeAcquireGuardedMutex(&PspActiveProcessMutex);
+
+    /* Loop the process list */
+    Entry = PsActiveProcessHead.Flink;
+    while (Entry != &PsActiveProcessHead)
+    {
+        /* Get the process */
+        Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks);
+
+        /* Check memory areas */
+        MiRosCheckMemoryAreas(&Process->Vm);
+
+        Entry = Entry->Flink;
+    }
+
+    /* Release the lock */
+    KeReleaseGuardedMutex(&PspActiveProcessMutex);
+}
+
+#endif
+
 /**
  * @name MmFreeMemoryArea
  *
@@ -712,6 +806,12 @@ MmFreeMemoryArea(
    ULONG_PTR Address;
    PVOID EndAddress;
 
+   /* Make sure we own the address space lock! */
+   ASSERT(CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock.Owner == KeGetCurrentThread());
+
+    /* Check magic */
+    ASSERT(MemoryArea->Magic == 'erAM');
+
    if (MemoryArea->Type != MEMORY_AREA_OWNED_BY_ARM3)
    {
        PEPROCESS CurrentProcess = PsGetCurrentProcess();
@@ -731,7 +831,7 @@ MmFreeMemoryArea(
             BOOLEAN Dirty = FALSE;
             SWAPENTRY SwapEntry = 0;
             PFN_NUMBER Page = 0;
-             
+
              if (MmIsPageSwapEntry(Process, (PVOID)Address))
              {
                 MmDeletePageFileMapping(Process, (PVOID)Address, &SwapEntry);
@@ -788,9 +888,6 @@ MmFreeMemoryArea(
        }
     }
 
-    /* There must be no page ops in progress */
-    ASSERT(MemoryArea->PageOpCount == 0);
-
    /* Remove the tree item. */
    {
       if (MemoryArea->Parent != NULL)
@@ -979,7 +1076,7 @@ MmCreateMemoryArea(PMMSUPPORT AddressSpace,
    MemoryArea->Protect = Protect;
    MemoryArea->Flags = AllocationFlags;
    //MemoryArea->LockCount = 0;
-   MemoryArea->PageOpCount = 0;
+   MemoryArea->Magic = 'erAM';
    MemoryArea->DeleteInProgress = FALSE;
 
    MmInsertMemoryArea(AddressSpace, MemoryArea);
@@ -1072,17 +1169,17 @@ MmDeleteProcessAddressSpace(PEPROCESS Process)
             KeBugCheck(MEMORY_MANAGEMENT);
       }
    }
-   
+
 #if (_MI_PAGING_LEVELS == 2)
     {
         KIRQL OldIrql;
         PMMPDE pointerPde;
         /* Attach to Process */
         KeAttachProcess(&Process->Pcb);
-        
+
         /* Acquire PFN lock */
         OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock);
-        
+
         for(Address = MI_LOWEST_VAD_ADDRESS;
             Address < MM_HIGHEST_VAD_ADDRESS;
             Address =(PVOID)((ULONG_PTR)Address + (PAGE_SIZE * PTE_COUNT)))
@@ -1098,7 +1195,7 @@ MmDeleteProcessAddressSpace(PEPROCESS Process)
         }
         /* Release lock */
         KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);
-        
+
         /* Detach */
         KeDetachProcess();
     }
diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index d864d96c08e..bea94ce9133 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -205,6 +205,52 @@ PspReapRoutine(IN PVOID Context)
                                                (PVOID)1) != (PVOID)1);
 }
 
+#if DBG
+VOID
+NTAPI
+PspCheckProcessList()
+{
+    PLIST_ENTRY Entry;
+
+    KeAcquireGuardedMutex(&PspActiveProcessMutex);
+    DbgPrint("# checking PsActiveProcessHead @ %p\n", &PsActiveProcessHead);
+    for (Entry = PsActiveProcessHead.Flink;
+         Entry != &PsActiveProcessHead;
+         Entry = Entry->Flink)
+    {
+        PEPROCESS Process = CONTAINING_RECORD(Entry, EPROCESS, ActiveProcessLinks);
+        POBJECT_HEADER Header;
+        PVOID Info, HeaderLocation;
+
+        /* Get the header and assume this is what we'll free */
+        Header = OBJECT_TO_OBJECT_HEADER(Process);
+        HeaderLocation = Header;
+
+        /* To find the header, walk backwards from how we allocated */
+        if ((Info = OBJECT_HEADER_TO_CREATOR_INFO(Header)))
+        {
+            HeaderLocation = Info;
+        }
+        if ((Info = OBJECT_HEADER_TO_NAME_INFO(Header)))
+        {
+            HeaderLocation = Info;
+        }
+        if ((Info = OBJECT_HEADER_TO_HANDLE_INFO(Header)))
+        {
+            HeaderLocation = Info;
+        }
+        if ((Info = OBJECT_HEADER_TO_QUOTA_INFO(Header)))
+        {
+            HeaderLocation = Info;
+        }
+
+        ExpCheckPoolAllocation(HeaderLocation, NonPagedPool, 'corP');
+    }
+
+    KeReleaseGuardedMutex(&PspActiveProcessMutex);
+}
+#endif
+
 VOID
 NTAPI
 PspDeleteProcess(IN PVOID ObjectBody)
@@ -221,6 +267,8 @@ PspDeleteProcess(IN PVOID ObjectBody)
         /* Remove it from the Active List */
         KeAcquireGuardedMutex(&PspActiveProcessMutex);
         RemoveEntryList(&Process->ActiveProcessLinks);
+        Process->ActiveProcessLinks.Flink = NULL;
+        Process->ActiveProcessLinks.Blink = NULL;
         KeReleaseGuardedMutex(&PspActiveProcessMutex);
     }
 

From edbd8144520b25201cf115a2211921853dd3665e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 13 Mar 2013 18:25:52 +0000
Subject: [PATCH 20/61] [NTOSKRNL] Fix non-KDBG builds

svn path=/trunk/; revision=58486
---
 reactos/ntoskrnl/mm/ARM3/expool.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/reactos/ntoskrnl/mm/ARM3/expool.c b/reactos/ntoskrnl/mm/ARM3/expool.c
index 39e3cccb7ed..ee330ca2f8c 100644
--- a/reactos/ntoskrnl/mm/ARM3/expool.c
+++ b/reactos/ntoskrnl/mm/ARM3/expool.c
@@ -2516,6 +2516,7 @@ ExAllocatePoolWithQuotaTag(IN POOL_TYPE PoolType,
     return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag);
 }
 
+#if DBG && KDBG
 
 BOOLEAN
 ExpKdbgExtPool(
@@ -2612,5 +2613,6 @@ ExpKdbgExtPool(
     return TRUE;
 }
 
+#endif // DBG && KDBG
 
 /* EOF */

From 9156f1fe0f093ec9341dc5cc479788d9c4bf6e53 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 13 Mar 2013 18:26:11 +0000
Subject: [PATCH 21/61] [NTOSKRNL] Disable enqueuing processes into the
 SessionGlobal->ProcessList, since it's broken and causes non paged pool
 corruption. The reason is that sometimes the process is not removed, so a
 dead allocation stays in the list, causing havoc, when the next or previous
 process in that list is removed.

svn path=/trunk/; revision=58487
---
 reactos/ntoskrnl/mm/ARM3/procsup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/reactos/ntoskrnl/mm/ARM3/procsup.c b/reactos/ntoskrnl/mm/ARM3/procsup.c
index d9c1e7102df..4a7fafabbde 100644
--- a/reactos/ntoskrnl/mm/ARM3/procsup.c
+++ b/reactos/ntoskrnl/mm/ARM3/procsup.c
@@ -1644,7 +1644,8 @@ MiSessionRemoveProcess(VOID)
     ASSERT(MmIsAddressValid(MmSessionSpace) == TRUE);
 
     /* Remove the process from the list ,and dereference the session */
-    RemoveEntryList(&CurrentProcess->SessionProcessLinks);
+    // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!!
+    //RemoveEntryList(&CurrentProcess->SessionProcessLinks);
     //MiDereferenceSession();
 }
 
@@ -1673,7 +1674,8 @@ MiSessionAddProcess(IN PEPROCESS NewProcess)
     NewProcess->Session = SessionGlobal;
 
     /* Insert it into the process list */
-    InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks);
+    // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!!
+    //InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks);
 
     /* Set the flag */
     PspSetProcessFlag(NewProcess, PSF_PROCESS_IN_SESSION_BIT);

From 7f6b593bb0e538f1a0b71b1c478418e5213339b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Wed, 13 Mar 2013 20:40:43 +0000
Subject: [PATCH 22/61] [SYSSETUP] Reorder closing of handles (the service
 handle then the SCM handle), it clarifies the logic (but not change it
 dramatically).

[RSYM64]
Correct a misspelling, no code change.

svn path=/trunk/; revision=58488
---
 reactos/dll/win32/syssetup/install.c | 4 ++--
 reactos/tools/rsym/rsym64.c          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index 43867e28427..4869e8ee8f8 100644
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -439,10 +439,10 @@ EnableUserModePnpManager(VOID)
     bRet = TRUE;
 
 cleanup:
-    if (hSCManager != NULL)
-        CloseServiceHandle(hSCManager);
     if (hService != NULL)
         CloseServiceHandle(hService);
+    if (hSCManager != NULL)
+        CloseServiceHandle(hSCManager);
     return bRet;
 }
 
diff --git a/reactos/tools/rsym/rsym64.c b/reactos/tools/rsym/rsym64.c
index 3c08ce1c324..746e5e4cfd0 100644
--- a/reactos/tools/rsym/rsym64.c
+++ b/reactos/tools/rsym/rsym64.c
@@ -787,7 +787,7 @@ ParsePEHeaders(PFILE_INFO File)
     File->UsedSections = 0;
     File->eh_frame.idx = -1;
 
-    /* Allocate array of chars, specifiying wheter to copy the section */
+    /* Allocate array of chars, specifiying whether to copy the section */
     File->UseSection = malloc(File->AllSections);
 
     for (i = 0; i < File->AllSections; i++)

From 0823512b4a866eedad3820ca364a60f40aefa9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Wed, 13 Mar 2013 23:50:08 +0000
Subject: [PATCH 23/61] - Remove ALL the unneeded "author date id revision" svn
 properties. - Remove the erroneous svn:eol-syle or svn:eol-stlye properties
 (and replace them by svn:eol-style)

svn path=/trunk/; revision=58489
---
 reactos/base/applications/cmdutils/hostname/hostname.c      | 2 +-
 reactos/base/applications/sndvol32/misc.c                   | 2 +-
 reactos/base/applications/sndvol32/mixer.c                  | 2 +-
 reactos/base/applications/sndvol32/sndvol32.c               | 2 +-
 reactos/base/setup/reactos/reactos.c                        | 2 +-
 reactos/base/setup/usetup/bootsup.h                         | 2 +-
 reactos/base/setup/usetup/drivesup.c                        | 2 +-
 reactos/base/setup/usetup/drivesup.h                        | 2 +-
 reactos/base/setup/usetup/filequeue.h                       | 2 +-
 reactos/base/setup/usetup/filesup.h                         | 2 +-
 reactos/base/setup/usetup/format.h                          | 2 +-
 reactos/base/setup/usetup/genlist.h                         | 2 +-
 reactos/base/setup/usetup/inicache.c                        | 2 +-
 reactos/base/setup/usetup/progress.h                        | 2 +-
 reactos/base/setup/usetup/registry.h                        | 2 +-
 reactos/base/setup/usetup/settings.h                        | 2 +-
 reactos/base/setup/welcome/welcome.c                        | 2 +-
 reactos/base/shell/cmd/window.c                             | 2 +-
 reactos/base/system/winlogon/setup.h                        | 2 +-
 reactos/dll/cpl/console/lang/en-US.rc                       | 2 +-
 reactos/dll/cpl/desk/background.c                           | 2 +-
 reactos/dll/cpl/desk/desk.c                                 | 2 +-
 reactos/dll/cpl/desk/dibitmap.c                             | 2 +-
 reactos/dll/cpl/intl/currency.c                             | 2 +-
 reactos/dll/cpl/intl/date.c                                 | 2 +-
 reactos/dll/cpl/intl/generalp.c                             | 2 +-
 reactos/dll/cpl/intl/inplocale.c                            | 2 +-
 reactos/dll/cpl/intl/intl.c                                 | 2 +-
 reactos/dll/cpl/intl/numbers.c                              | 2 +-
 reactos/dll/cpl/intl/sort.c                                 | 2 +-
 reactos/dll/cpl/main/keyboard.c                             | 2 +-
 reactos/dll/cpl/main/main.c                                 | 2 +-
 reactos/dll/cpl/main/mouse.c                                | 2 +-
 reactos/dll/cpl/odbccp32/odbccp32.c                         | 2 +-
 reactos/dll/cpl/powercfg/advanced.c                         | 2 +-
 reactos/dll/cpl/powercfg/alarms.c                           | 2 +-
 reactos/dll/cpl/powercfg/hibernate.c                        | 2 +-
 reactos/dll/cpl/powercfg/powercfg.c                         | 2 +-
 reactos/dll/cpl/powercfg/powershemes.c                      | 2 +-
 reactos/dll/directx/d3d8/d3d8.rc                            | 2 +-
 reactos/dll/directx/d3d9/d3d9.rc                            | 2 +-
 reactos/dll/directx/ddraw/Clipper/clipper_main.c            | 2 +-
 reactos/dll/directx/ddraw/Ddraw/GetCaps.c                   | 2 +-
 reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c       | 2 +-
 reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c         | 2 +-
 reactos/dll/directx/ddraw/Ddraw/ddraw_main.c                | 2 +-
 reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c | 2 +-
 reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c               | 2 +-
 reactos/dll/directx/ddraw/Surface/surface_main.c            | 2 +-
 reactos/dll/directx/ddraw/Surface/surface_stubs.c           | 2 +-
 reactos/dll/directx/ddraw/ddraw.rc                          | 2 +-
 reactos/dll/directx/ddraw/main.c                            | 2 +-
 reactos/dll/shellext/slayer/slayer.c                        | 2 +-
 reactos/dll/win32/aclui/aclui.c                             | 2 +-
 reactos/dll/win32/aclui/checklist.c                         | 2 +-
 reactos/dll/win32/aclui/misc.c                              | 2 +-
 reactos/dll/win32/advapi32/misc/dllmain.c                   | 2 +-
 reactos/dll/win32/advapi32/sec/ac.c                         | 2 +-
 reactos/dll/win32/advapi32/sec/audit.c                      | 2 +-
 reactos/dll/win32/advapi32/sec/sec.c                        | 2 +-
 reactos/dll/win32/advapi32/sec/trustee.c                    | 2 +-
 reactos/dll/win32/advapi32/token/privilege.c                | 2 +-
 reactos/dll/win32/devmgr/hwpage.c                           | 2 +-
 reactos/dll/win32/hid/hid.c                                 | 2 +-
 reactos/dll/win32/hid/stubs.c                               | 2 +-
 reactos/dll/win32/iprtprio/iprtprio.rc                      | 2 +-
 reactos/dll/win32/msgina/stubs.c                            | 2 +-
 reactos/dll/win32/mswsock/stubs.c                           | 2 +-
 reactos/dll/win32/psapi/internal.h                          | 2 +-
 reactos/dll/win32/psapi/malloc.c                            | 2 +-
 reactos/dll/win32/psapi/psapi.c                             | 2 +-
 reactos/dll/win32/samlib/dllmain.c                          | 2 +-
 reactos/dll/win32/samlib/samlib.c                           | 2 +-
 reactos/dll/win32/secur32/dllmain.c                         | 2 +-
 reactos/dll/win32/smdll/dllmain.c                           | 2 +-
 reactos/dll/win32/smdll/query.c                             | 2 +-
 reactos/dll/win32/smdll/readme.txt                          | 2 +-
 reactos/dll/win32/syssetup/dllmain.c                        | 2 +-
 reactos/dll/win32/userenv/desktop.c                         | 2 +-
 reactos/dll/win32/userenv/directory.c                       | 2 +-
 reactos/dll/win32/userenv/environment.c                     | 2 +-
 reactos/dll/win32/userenv/internal.h                        | 2 +-
 reactos/dll/win32/userenv/misc.c                            | 2 +-
 reactos/dll/win32/userenv/registry.c                        | 2 +-
 reactos/dll/win32/userenv/resources.h                       | 2 +-
 reactos/dll/win32/userenv/setup.c                           | 2 +-
 reactos/dll/win32/userenv/userenv.c                         | 2 +-
 reactos/dll/win32/winfax/winfax.c                           | 2 +-
 reactos/dll/win32/winscard/winscard.c                       | 2 +-
 reactos/dll/win32/winscard/winscard.rc                      | 2 +-
 reactos/dll/win32/winspool/stubs.c                          | 2 +-
 reactos/dll/win32/wsock32/stubs.c                           | 2 +-
 reactos/drivers/base/beep/beep.rc                           | 2 +-
 reactos/drivers/base/bootvid/bootvid.rc                     | 2 +-
 reactos/drivers/base/null/null.rc                           | 2 +-
 reactos/drivers/bus/isapnp/isapnp.rc                        | 2 +-
 reactos/drivers/bus/pci/pci.rc                              | 2 +-
 reactos/drivers/bus/pci/pcidef.h                            | 2 +-
 reactos/drivers/filesystems/cdfs/cdfs.c                     | 2 +-
 reactos/drivers/filesystems/cdfs/cdfs.rc                    | 2 +-
 reactos/drivers/filesystems/cdfs/cleanup.c                  | 2 +-
 reactos/drivers/filesystems/cdfs/close.c                    | 2 +-
 reactos/drivers/filesystems/cdfs/common.c                   | 2 +-
 reactos/drivers/filesystems/cdfs/create.c                   | 2 +-
 reactos/drivers/filesystems/cdfs/dirctl.c                   | 2 +-
 reactos/drivers/filesystems/cdfs/fcb.c                      | 2 +-
 reactos/drivers/filesystems/cdfs/finfo.c                    | 2 +-
 reactos/drivers/filesystems/cdfs/misc.c                     | 2 +-
 reactos/drivers/filesystems/cdfs/rw.c                       | 2 +-
 reactos/drivers/filesystems/cdfs/volinfo.c                  | 2 +-
 reactos/drivers/filesystems/msfs/msfs.rc                    | 2 +-
 reactos/drivers/filesystems/mup/create.c                    | 2 +-
 reactos/drivers/filesystems/mup/mup.c                       | 2 +-
 reactos/drivers/filesystems/mup/mup.rc                      | 2 +-
 reactos/drivers/input/kbdclass/kbdclass.rc                  | 2 +-
 reactos/drivers/input/mouclass/mouclass.rc                  | 2 +-
 reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc     | 2 +-
 reactos/drivers/multimedia/audio/sound/sb16.c               | 2 +-
 reactos/drivers/multimedia/audio/sound/sb16.rc              | 2 +-
 reactos/drivers/network/afd/afd.rc                          | 2 +-
 reactos/drivers/network/afd/afd/bind.c                      | 2 +-
 reactos/drivers/network/afd/afd/connect.c                   | 2 +-
 reactos/drivers/network/afd/afd/context.c                   | 2 +-
 reactos/drivers/network/afd/afd/info.c                      | 2 +-
 reactos/drivers/network/afd/afd/listen.c                    | 2 +-
 reactos/drivers/network/afd/afd/lock.c                      | 2 +-
 reactos/drivers/network/afd/afd/main.c                      | 2 +-
 reactos/drivers/network/afd/afd/read.c                      | 2 +-
 reactos/drivers/network/afd/afd/tdiconn.c                   | 2 +-
 reactos/drivers/network/afd/include/afd.h                   | 2 +-
 reactos/drivers/network/dd/ne2000/ne2000.rc                 | 2 +-
 reactos/drivers/network/dd/pcnet/pcnet.rc                   | 2 +-
 reactos/drivers/network/lan/lan.rc                          | 2 +-
 reactos/drivers/network/ndis/ndis.rc                        | 2 +-
 reactos/drivers/network/tdi/cte/string.c                    | 2 +-
 reactos/drivers/network/tdi/misc/tdi.rc                     | 2 +-
 reactos/drivers/network/tdi/tdi/handler.c                   | 2 +-
 reactos/drivers/network/tdi/tdi/obsolete.c                  | 2 +-
 reactos/drivers/network/tdi/tdi/stubs.c                     | 2 +-
 reactos/drivers/parallel/parallel/parallel.c                | 2 +-
 reactos/drivers/parallel/parallel/parallel.rc               | 2 +-
 reactos/drivers/serial/serenum/serenum.rc                   | 2 +-
 reactos/drivers/serial/serial/serial.rc                     | 2 +-
 reactos/drivers/setup/blue/blue.rc                          | 2 +-
 reactos/drivers/storage/class/cdrom/cdrom.rc                | 2 +-
 reactos/drivers/storage/class/disk/disk.rc                  | 2 +-
 reactos/drivers/storage/class/include/class2.h              | 2 +-
 reactos/drivers/storage/floppy/floppy.rc                    | 2 +-
 reactos/drivers/storage/ide/atapi/atapi.rc                  | 2 +-
 reactos/hal/halx86/include/halirq.h                         | 2 +-
 reactos/hal/halx86/mp/apic.c                                | 2 +-
 reactos/hal/halx86/mp/halinit_mp.c                          | 2 +-
 reactos/hal/halx86/mp/ipi_mp.c                              | 2 +-
 reactos/hal/halx86/mp/processor_mp.c                        | 2 +-
 reactos/hal/halx86/up/halinit_up.c                          | 2 +-
 reactos/hal/halx86/xbox/halinit_xbox.c                      | 2 +-
 reactos/hal/halx86/xbox/halxbox.h                           | 2 +-
 reactos/hal/halx86/xbox/part_xbox.c                         | 2 +-
 reactos/include/reactos/libs/epsapi/epsapi.h                | 2 +-
 reactos/include/reactos/libs/syssetup/syssetup.h            | 2 +-
 reactos/include/reactos/subsys/lsass/lsass.h                | 2 +-
 reactos/include/reactos/subsys/sm/helper.h                  | 2 +-
 reactos/include/reactos/subsys/sm/ns.h                      | 2 +-
 reactos/include/reactos/winlogon.h                          | 2 +-
 reactos/lib/3rdparty/adns/README.html                       | 2 +-
 reactos/lib/3rdparty/freetype/README.ROS                    | 2 +-
 reactos/lib/epsapi/enum/drivers.c                           | 2 +-
 reactos/lib/epsapi/enum/modules.c                           | 2 +-
 reactos/lib/epsapi/enum/processes.c                         | 2 +-
 reactos/lib/sdk/crt/except/i386/chkstk_asm.s                | 2 +-
 reactos/lib/sdk/crt/math/adjust.c                           | 2 +-
 reactos/lib/sdk/crt/mem/i386/memchr_asm.s                   | 2 +-
 reactos/lib/sdk/crt/mem/i386/memset_asm.s                   | 2 +-
 reactos/lib/sdk/crt/mem/memccpy.c                           | 2 +-
 reactos/lib/sdk/crt/mem/memchr.c                            | 2 +-
 reactos/lib/sdk/crt/mem/memcmp.c                            | 2 +-
 reactos/lib/sdk/crt/mem/memset.c                            | 2 +-
 reactos/lib/sdk/crt/setjmp/i386/setjmp.s                    | 2 +-
 reactos/lib/sdk/crt/stdlib/makepath.c                       | 2 +-
 reactos/lib/sdk/crt/stdlib/wmakpath.c                       | 2 +-
 reactos/lib/sdk/crt/string/i386/strcat_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/strchr_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/strcmp_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/strcpy_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/strlen_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/strncat_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/strncmp_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/strncpy_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/strnlen_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/strrchr_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/tchar.h                     | 2 +-
 reactos/lib/sdk/crt/string/i386/wcscat_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/wcschr_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/wcscmp_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/wcscpy_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/wcslen_asm.s                | 2 +-
 reactos/lib/sdk/crt/string/i386/wcsncat_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s               | 2 +-
 reactos/lib/sdk/crt/string/strcat.c                         | 2 +-
 reactos/lib/sdk/crt/string/strchr.c                         | 2 +-
 reactos/lib/sdk/crt/string/strcmp.c                         | 2 +-
 reactos/lib/sdk/crt/string/strcpy.c                         | 2 +-
 reactos/lib/sdk/crt/string/strcspn.c                        | 2 +-
 reactos/lib/sdk/crt/string/strlen.c                         | 2 +-
 reactos/lib/sdk/crt/string/strncat.c                        | 2 +-
 reactos/lib/sdk/crt/string/strncmp.c                        | 2 +-
 reactos/lib/sdk/crt/string/strncpy.c                        | 2 +-
 reactos/lib/sdk/crt/string/strnlen.c                        | 2 +-
 reactos/lib/sdk/crt/string/strrchr.c                        | 2 +-
 reactos/lib/sdk/crt/string/strspn.c                         | 2 +-
 reactos/lib/sdk/crt/string/strxspn.h                        | 2 +-
 reactos/lib/sdk/crt/string/tcscat.h                         | 2 +-
 reactos/lib/sdk/crt/string/tcschr.h                         | 2 +-
 reactos/lib/sdk/crt/string/tcscmp.h                         | 2 +-
 reactos/lib/sdk/crt/string/tcscpy.h                         | 2 +-
 reactos/lib/sdk/crt/string/tcslen.h                         | 2 +-
 reactos/lib/sdk/crt/string/tcsncat.h                        | 2 +-
 reactos/lib/sdk/crt/string/tcsncmp.h                        | 2 +-
 reactos/lib/sdk/crt/string/tcsncpy.h                        | 2 +-
 reactos/lib/sdk/crt/string/tcsnlen.h                        | 2 +-
 reactos/lib/sdk/crt/string/tcsrchr.h                        | 2 +-
 reactos/lib/sdk/crt/string/wcscat.c                         | 2 +-
 reactos/lib/sdk/crt/string/wcschr.c                         | 2 +-
 reactos/lib/sdk/crt/string/wcscmp.c                         | 2 +-
 reactos/lib/sdk/crt/string/wcscpy.c                         | 2 +-
 reactos/lib/sdk/crt/string/wcslen.c                         | 2 +-
 reactos/lib/sdk/crt/string/wcsncat.c                        | 2 +-
 reactos/lib/sdk/crt/string/wcsncmp.c                        | 2 +-
 reactos/lib/sdk/crt/string/wcsncpy.c                        | 2 +-
 reactos/lib/sdk/crt/string/wcsnlen.c                        | 2 +-
 reactos/lib/sdk/crt/string/wcsrchr.c                        | 2 +-
 reactos/lib/sdk/crt/string/witow.c                          | 2 +-
 reactos/lib/smlib/compses.c                                 | 2 +-
 reactos/lib/smlib/connect.c                                 | 2 +-
 reactos/lib/smlib/execpgm.c                                 | 2 +-
 reactos/lib/smlib/lookupss.c                                | 2 +-
 reactos/subsystems/ntvdm/ntvdm.c                            | 2 +-
 reactos/subsystems/ntvdm/ntvdm.rc                           | 2 +-
 reactos/subsystems/win/basesrv/basesrv.def                  | 2 +-
 reactos/subsystems/win/basesrv/init.c                       | 2 +-
 reactos/subsystems/win/basesrv/main.c                       | 2 +-
 reactos/subsystems/win/basesrv/server.c                     | 2 +-
 reactos/tools/cdmake/cdmake.c                               | 2 +-
 reactos/tools/cdmake/llmosrt.c                              | 2 +-
 reactos/tools/ms2ps/ms2ps.cpp                               | 2 +-
 reactos/tools/rgenstat/llmosrt.c                            | 2 +-
 reactos/win32ss/gdi/gdi32/main/dllmain.c                    | 4 ++--
 reactos/win32ss/user/ntuser/csr.h                           | 2 +-
 reactos/win32ss/user/ntuser/vis.h                           | 2 +-
 reactos/win32ss/user/user32/include/regcontrol.h            | 2 +-
 reactos/win32ss/user/user32/misc/desktop.c                  | 2 +-
 reactos/win32ss/user/user32/misc/object.c                   | 2 +-
 reactos/win32ss/user/user32/misc/timer.c                    | 2 +-
 reactos/win32ss/user/user32/misc/winsta.c                   | 2 +-
 reactos/win32ss/user/user32/windows/accel.c                 | 2 +-
 reactos/win32ss/user/user32/windows/caret.c                 | 2 +-
 reactos/win32ss/user/user32/windows/clipboard.c             | 2 +-
 reactos/win32ss/user/user32/windows/dc.c                    | 2 +-
 reactos/win32ss/user/user32/windows/font.c                  | 2 +-
 reactos/win32ss/user/user32/windows/rect.c                  | 2 +-
 reactos/win32ss/user/user32/windows/text.c                  | 2 +-
 reactos/win32ss/user/win32csr/conio.h                       | 2 +-
 reactos/win32ss/user/win32csr/desktopbg.h                   | 2 +-
 reactos/win32ss/user/win32csr/exitros.c                     | 2 +-
 reactos/win32ss/user/win32csr/guiconsole.c                  | 2 +-
 reactos/win32ss/user/win32csr/guiconsole.h                  | 2 +-
 reactos/win32ss/user/win32csr/handle.c                      | 2 +-
 reactos/win32ss/user/win32csr/resource.h                    | 2 +-
 reactos/win32ss/user/win32csr/tuiconsole.c                  | 2 +-
 reactos/win32ss/user/win32csr/tuiconsole.h                  | 2 +-
 reactos/win32ss/user/win32csr/win32csr.h                    | 2 +-
 reactos/win32ss/user/winsrv/dllmain.c                       | 2 +-
 reactos/win32ss/user/winsrv/init.c                          | 2 +-
 reactos/win32ss/user/winsrv/server.c                        | 2 +-
 reactos/win32ss/user/winsrv/winsrv.def                      | 2 +-
 reactos/win32ss/win32k.rc                                   | 2 +-
 279 files changed, 280 insertions(+), 280 deletions(-)

diff --git a/reactos/base/applications/cmdutils/hostname/hostname.c b/reactos/base/applications/cmdutils/hostname/hostname.c
index 08f754ba943..b1c66713ce5 100644
--- a/reactos/base/applications/cmdutils/hostname/hostname.c
+++ b/reactos/base/applications/cmdutils/hostname/hostname.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: hostname.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT : See COPYING in the top level directory
  * PROJECT   : ReactOS/Win32 get host name
diff --git a/reactos/base/applications/sndvol32/misc.c b/reactos/base/applications/sndvol32/misc.c
index 596cd2fafdc..b362c475fa3 100644
--- a/reactos/base/applications/sndvol32/misc.c
+++ b/reactos/base/applications/sndvol32/misc.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
diff --git a/reactos/base/applications/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c
index bafee13dd73..697d240854f 100644
--- a/reactos/base/applications/sndvol32/mixer.c
+++ b/reactos/base/applications/sndvol32/mixer.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: mixer.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
diff --git a/reactos/base/applications/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c
index a31f7d04ba6..e484acd39e6 100644
--- a/reactos/base/applications/sndvol32/sndvol32.c
+++ b/reactos/base/applications/sndvol32/sndvol32.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: sndvol32.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
index 1fbfc4d911e..3697dd14a5c 100644
--- a/reactos/base/setup/reactos/reactos.c
+++ b/reactos/base/setup/reactos/reactos.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: reactos.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS GUI first stage setup application
diff --git a/reactos/base/setup/usetup/bootsup.h b/reactos/base/setup/usetup/bootsup.h
index 75c772a2140..dcde104c808 100644
--- a/reactos/base/setup/usetup/bootsup.h
+++ b/reactos/base/setup/usetup/bootsup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: bootsup.h 48703 2010-09-05 17:09:18Z cgutman $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/bootsup.h
diff --git a/reactos/base/setup/usetup/drivesup.c b/reactos/base/setup/usetup/drivesup.c
index 526305dfbad..60a5bfd5f21 100644
--- a/reactos/base/setup/usetup/drivesup.c
+++ b/reactos/base/setup/usetup/drivesup.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: drivesup.c 47686 2010-06-07 21:38:49Z spetreolle $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/drivesup.c
diff --git a/reactos/base/setup/usetup/drivesup.h b/reactos/base/setup/usetup/drivesup.h
index 287b5a54e60..cc6c58b9815 100644
--- a/reactos/base/setup/usetup/drivesup.h
+++ b/reactos/base/setup/usetup/drivesup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: drivesup.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/drivesup.h
diff --git a/reactos/base/setup/usetup/filequeue.h b/reactos/base/setup/usetup/filequeue.h
index 28829a45fea..3948f0d5214 100644
--- a/reactos/base/setup/usetup/filequeue.h
+++ b/reactos/base/setup/usetup/filequeue.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: filequeue.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/filequeue.h
diff --git a/reactos/base/setup/usetup/filesup.h b/reactos/base/setup/usetup/filesup.h
index b7aecd8e622..4d0a9425306 100644
--- a/reactos/base/setup/usetup/filesup.h
+++ b/reactos/base/setup/usetup/filesup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: filesup.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/filesup.h
diff --git a/reactos/base/setup/usetup/format.h b/reactos/base/setup/usetup/format.h
index d2784c16e61..90830182def 100644
--- a/reactos/base/setup/usetup/format.h
+++ b/reactos/base/setup/usetup/format.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: format.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/format.h
diff --git a/reactos/base/setup/usetup/genlist.h b/reactos/base/setup/usetup/genlist.h
index fd5682c9819..9eaebf797c5 100644
--- a/reactos/base/setup/usetup/genlist.h
+++ b/reactos/base/setup/usetup/genlist.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: genlist.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/genlist.h
diff --git a/reactos/base/setup/usetup/inicache.c b/reactos/base/setup/usetup/inicache.c
index 3010aa64b39..a25a9a68bd5 100644
--- a/reactos/base/setup/usetup/inicache.c
+++ b/reactos/base/setup/usetup/inicache.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: inicache.c 47686 2010-06-07 21:38:49Z spetreolle $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/inicache.c
diff --git a/reactos/base/setup/usetup/progress.h b/reactos/base/setup/usetup/progress.h
index 630967d24d1..6319058660d 100644
--- a/reactos/base/setup/usetup/progress.h
+++ b/reactos/base/setup/usetup/progress.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: progress.h 52467 2011-06-26 10:08:31Z rharabien $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/partlist.h
diff --git a/reactos/base/setup/usetup/registry.h b/reactos/base/setup/usetup/registry.h
index 63d2b67ef8b..49196666b11 100644
--- a/reactos/base/setup/usetup/registry.h
+++ b/reactos/base/setup/usetup/registry.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: registry.h 47037 2010-04-26 15:10:23Z ekohl $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/registry.h
diff --git a/reactos/base/setup/usetup/settings.h b/reactos/base/setup/usetup/settings.h
index 65b59ef8aee..aff6c5e13d7 100644
--- a/reactos/base/setup/usetup/settings.h
+++ b/reactos/base/setup/usetup/settings.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: settings.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/settings.h
diff --git a/reactos/base/setup/welcome/welcome.c b/reactos/base/setup/welcome/welcome.c
index 57da7b6cdba..3c0dc521005 100644
--- a/reactos/base/setup/welcome/welcome.c
+++ b/reactos/base/setup/welcome/welcome.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: welcome.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS welcome/autorun application
diff --git a/reactos/base/shell/cmd/window.c b/reactos/base/shell/cmd/window.c
index 504fc0ace9c..dc052b4bfab 100644
--- a/reactos/base/shell/cmd/window.c
+++ b/reactos/base/shell/cmd/window.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: window.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * WINDOW.C - activate & window internal commands.
  *
diff --git a/reactos/base/system/winlogon/setup.h b/reactos/base/system/winlogon/setup.h
index d16dbf3b134..efb14d16035 100644
--- a/reactos/base/system/winlogon/setup.h
+++ b/reactos/base/system/winlogon/setup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: setup.h 45685 2010-02-26 11:43:19Z gedmurphy $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS winlogon
  * FILE:            subsys/system/winlogon/setup.h
diff --git a/reactos/dll/cpl/console/lang/en-US.rc b/reactos/dll/cpl/console/lang/en-US.rc
index 634b9335a72..11865f312ba 100644
--- a/reactos/dll/cpl/console/lang/en-US.rc
+++ b/reactos/dll/cpl/console/lang/en-US.rc
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: en-US.rc 49139 2010-10-13 21:23:48Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c
index 12c5efefd4e..e964964a01c 100644
--- a/reactos/dll/cpl/desk/background.c
+++ b/reactos/dll/cpl/desk/background.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: background.c 55583 2012-02-13 20:52:20Z rharabien $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c
index dbab35e6b71..577ad3ed432 100644
--- a/reactos/dll/cpl/desk/desk.c
+++ b/reactos/dll/cpl/desk/desk.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: desk.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
diff --git a/reactos/dll/cpl/desk/dibitmap.c b/reactos/dll/cpl/desk/dibitmap.c
index b14b7155cc3..4724ccc6289 100644
--- a/reactos/dll/cpl/desk/dibitmap.c
+++ b/reactos/dll/cpl/desk/dibitmap.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dibitmap.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
diff --git a/reactos/dll/cpl/intl/currency.c b/reactos/dll/cpl/intl/currency.c
index 53a1067c903..af39005f1b4 100644
--- a/reactos/dll/cpl/intl/currency.c
+++ b/reactos/dll/cpl/intl/currency.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: currency.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/currency.c
diff --git a/reactos/dll/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c
index 2473ae828ae..388fb4ff852 100644
--- a/reactos/dll/cpl/intl/date.c
+++ b/reactos/dll/cpl/intl/date.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: date.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/date.c
diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index ee347d2c587..c48e076b7b1 100644
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: generalp.c 56849 2012-07-07 23:02:14Z fireball $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/generalp.c
diff --git a/reactos/dll/cpl/intl/inplocale.c b/reactos/dll/cpl/intl/inplocale.c
index 6451e8a10af..5eeb6d05c98 100644
--- a/reactos/dll/cpl/intl/inplocale.c
+++ b/reactos/dll/cpl/intl/inplocale.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: inplocale.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/inplocale.c
diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index eeed1ac4f06..ea5b82df441 100644
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: intl.c 54972 2012-01-15 13:37:25Z rharabien $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/intl.c
diff --git a/reactos/dll/cpl/intl/numbers.c b/reactos/dll/cpl/intl/numbers.c
index e2d86583b9e..d33a8b8fbb0 100644
--- a/reactos/dll/cpl/intl/numbers.c
+++ b/reactos/dll/cpl/intl/numbers.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: numbers.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/numbers.c
diff --git a/reactos/dll/cpl/intl/sort.c b/reactos/dll/cpl/intl/sort.c
index dc99a40fe7a..cefa0915b2a 100644
--- a/reactos/dll/cpl/intl/sort.c
+++ b/reactos/dll/cpl/intl/sort.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: sort.c 52956 2011-07-28 14:54:48Z akhaldi $
  *
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/sort.c
diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c
index 2f098a72d05..8929524e032 100644
--- a/reactos/dll/cpl/main/keyboard.c
+++ b/reactos/dll/cpl/main/keyboard.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: keyboard.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Main Control Panel
  * FILE:            dll/cpl/main/keyboard.c
diff --git a/reactos/dll/cpl/main/main.c b/reactos/dll/cpl/main/main.c
index 1853aa410b5..5cc246b4a92 100644
--- a/reactos/dll/cpl/main/main.c
+++ b/reactos/dll/cpl/main/main.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: main.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Sample Control Panel
  * FILE:            dll/cpl/main/main.c
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index 2badb9a5797..2e318294ab2 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: mouse.c 56254 2012-03-28 07:09:53Z tkreuzer $
  *
  * PROJECT:         ReactOS Main Control Panel
  * FILE:            dll/cpl/main/mouse.c
diff --git a/reactos/dll/cpl/odbccp32/odbccp32.c b/reactos/dll/cpl/odbccp32/odbccp32.c
index 7b3e787869b..2a8403f96d7 100644
--- a/reactos/dll/cpl/odbccp32/odbccp32.c
+++ b/reactos/dll/cpl/odbccp32/odbccp32.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: odbccp32.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS ODBC Control Panel Applet
  * FILE:            dll/cpl/main/main.c
diff --git a/reactos/dll/cpl/powercfg/advanced.c b/reactos/dll/cpl/powercfg/advanced.c
index 8fffcfdb04b..0b73f6352cb 100644
--- a/reactos/dll/cpl/powercfg/advanced.c
+++ b/reactos/dll/cpl/powercfg/advanced.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: advanced.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/cpl/powercfg/alarms.c b/reactos/dll/cpl/powercfg/alarms.c
index d58293203d9..1d315261574 100644
--- a/reactos/dll/cpl/powercfg/alarms.c
+++ b/reactos/dll/cpl/powercfg/alarms.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: alarms.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/cpl/powercfg/hibernate.c b/reactos/dll/cpl/powercfg/hibernate.c
index 1ea6ea3f273..94e7cde845d 100644
--- a/reactos/dll/cpl/powercfg/hibernate.c
+++ b/reactos/dll/cpl/powercfg/hibernate.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: hibernate.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c
index dca5e78a67d..7ef11c1986b 100644
--- a/reactos/dll/cpl/powercfg/powercfg.c
+++ b/reactos/dll/cpl/powercfg/powercfg.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: powercfg.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/cpl/powercfg/powershemes.c b/reactos/dll/cpl/powercfg/powershemes.c
index 3acbf91e4e4..d4bf28735cf 100644
--- a/reactos/dll/cpl/powercfg/powershemes.c
+++ b/reactos/dll/cpl/powercfg/powershemes.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: powershemes.c 54535 2011-11-29 14:55:58Z dgorbachev $
  *
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/directx/d3d8/d3d8.rc b/reactos/dll/directx/d3d8/d3d8.rc
index 5eec7309984..7856196638f 100644
--- a/reactos/dll/directx/d3d8/d3d8.rc
+++ b/reactos/dll/directx/d3d8/d3d8.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: d3d8.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
diff --git a/reactos/dll/directx/d3d9/d3d9.rc b/reactos/dll/directx/d3d9/d3d9.rc
index 4be22448cf2..34b108b141a 100644
--- a/reactos/dll/directx/d3d9/d3d9.rc
+++ b/reactos/dll/directx/d3d9/d3d9.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: d3d9.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
diff --git a/reactos/dll/directx/ddraw/Clipper/clipper_main.c b/reactos/dll/directx/ddraw/Clipper/clipper_main.c
index 8b20c9c816f..76b4874679c 100644
--- a/reactos/dll/directx/ddraw/Clipper/clipper_main.c
+++ b/reactos/dll/directx/ddraw/Clipper/clipper_main.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: clipper_main.c 36519 2008-09-25 19:26:09Z tkreuzer $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/GetCaps.c b/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
index 59f002dd990..567672b8d54 100644
--- a/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
+++ b/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: GetCaps.c 37776 2008-11-30 19:28:11Z hyperion $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c b/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
index 7903c8d494b..5f2fdeae971 100644
--- a/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
+++ b/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: GetDeviceIdentifier.c 37776 2008-11-30 19:28:11Z hyperion $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
index 6ef2a38628e..633286c6724 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ddraw_displaymode.c 37776 2008-11-30 19:28:11Z hyperion $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index fe02d0a0d76..4f01b33d10c 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ddraw_main.c 49872 2010-11-30 16:29:49Z fireball $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
index 26fa7f9f36d..17dfd6f809b 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ddraw_setcooperativelevel.c 40864 2009-05-09 12:27:40Z dchapyshev $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
index 4f11676ea86..17e00c2d833 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ddraw_stubs.c 49872 2010-11-30 16:29:49Z fireball $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Surface/surface_main.c b/reactos/dll/directx/ddraw/Surface/surface_main.c
index 81abdf8f88d..096be26a3b8 100644
--- a/reactos/dll/directx/ddraw/Surface/surface_main.c
+++ b/reactos/dll/directx/ddraw/Surface/surface_main.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: surface_main.c 49872 2010-11-30 16:29:49Z fireball $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/Surface/surface_stubs.c b/reactos/dll/directx/ddraw/Surface/surface_stubs.c
index aac63dde585..f21a0462603 100644
--- a/reactos/dll/directx/ddraw/Surface/surface_stubs.c
+++ b/reactos/dll/directx/ddraw/Surface/surface_stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: surface_stubs.c 37917 2008-12-07 21:48:44Z dgorbachev $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
diff --git a/reactos/dll/directx/ddraw/ddraw.rc b/reactos/dll/directx/ddraw/ddraw.rc
index 1434f28fb13..294d53e021e 100644
--- a/reactos/dll/directx/ddraw/ddraw.rc
+++ b/reactos/dll/directx/ddraw/ddraw.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ddraw.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #include "resource.h"
 
diff --git a/reactos/dll/directx/ddraw/main.c b/reactos/dll/directx/ddraw/main.c
index 152de2a9d76..3a90f953c40 100644
--- a/reactos/dll/directx/ddraw/main.c
+++ b/reactos/dll/directx/ddraw/main.c
@@ -1,5 +1,5 @@
 
-/* $Id$
+/* $Id: main.c 37776 2008-11-30 19:28:11Z hyperion $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
diff --git a/reactos/dll/shellext/slayer/slayer.c b/reactos/dll/shellext/slayer/slayer.c
index 68a8a42a48f..a9df768389c 100644
--- a/reactos/dll/shellext/slayer/slayer.c
+++ b/reactos/dll/shellext/slayer/slayer.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: slayer.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS Compatibility Layer Shell Extension
  * FILE:            lib/shellext/cplsample/cplsample.c
diff --git a/reactos/dll/win32/aclui/aclui.c b/reactos/dll/win32/aclui/aclui.c
index 1802278ae0e..60b5928bbe8 100644
--- a/reactos/dll/win32/aclui/aclui.c
+++ b/reactos/dll/win32/aclui/aclui.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: aclui.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/aclui.c
diff --git a/reactos/dll/win32/aclui/checklist.c b/reactos/dll/win32/aclui/checklist.c
index a6d445e17fc..d3157068564 100644
--- a/reactos/dll/win32/aclui/checklist.c
+++ b/reactos/dll/win32/aclui/checklist.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: checklist.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/checklist.c
diff --git a/reactos/dll/win32/aclui/misc.c b/reactos/dll/win32/aclui/misc.c
index 4ca54eb744e..9b18af8e2fd 100644
--- a/reactos/dll/win32/aclui/misc.c
+++ b/reactos/dll/win32/aclui/misc.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/misc.c
diff --git a/reactos/dll/win32/advapi32/misc/dllmain.c b/reactos/dll/win32/advapi32/misc/dllmain.c
index 042e3bf9da1..fc6b3498fd9 100644
--- a/reactos/dll/win32/advapi32/misc/dllmain.c
+++ b/reactos/dll/win32/advapi32/misc/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dllmain.c 53225 2011-08-14 11:31:23Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/advapi32/sec/ac.c b/reactos/dll/win32/advapi32/sec/ac.c
index c1b083f3f0a..42472c9e4fc 100644
--- a/reactos/dll/win32/advapi32/sec/ac.c
+++ b/reactos/dll/win32/advapi32/sec/ac.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ac.c 57331 2012-09-19 02:32:58Z ion $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/advapi32/sec/audit.c b/reactos/dll/win32/advapi32/sec/audit.c
index afd5a2c41ef..dc631ed4d5c 100644
--- a/reactos/dll/win32/advapi32/sec/audit.c
+++ b/reactos/dll/win32/advapi32/sec/audit.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: audit.c 56877 2012-07-12 19:48:30Z tfaber $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/advapi32/sec/sec.c b/reactos/dll/win32/advapi32/sec/sec.c
index d41e92f62cb..7292f3e68e7 100644
--- a/reactos/dll/win32/advapi32/sec/sec.c
+++ b/reactos/dll/win32/advapi32/sec/sec.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: sec.c 56451 2012-04-29 21:39:32Z ekohl $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/advapi32/sec/trustee.c b/reactos/dll/win32/advapi32/sec/trustee.c
index 9a2b533be26..b4611cfed80 100644
--- a/reactos/dll/win32/advapi32/sec/trustee.c
+++ b/reactos/dll/win32/advapi32/sec/trustee.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: trustee.c 53225 2011-08-14 11:31:23Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/advapi32/token/privilege.c b/reactos/dll/win32/advapi32/token/privilege.c
index 61a84bd3859..aaaaacc9533 100644
--- a/reactos/dll/win32/advapi32/token/privilege.c
+++ b/reactos/dll/win32/advapi32/token/privilege.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: privilege.c 37763 2008-11-30 11:42:05Z sginsberg $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c
index 794725f4e5e..b580308288b 100644
--- a/reactos/dll/win32/devmgr/hwpage.c
+++ b/reactos/dll/win32/devmgr/hwpage.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: hwpage.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS devmgr.dll
  * FILE:            lib/devmgr/hwpage.c
diff --git a/reactos/dll/win32/hid/hid.c b/reactos/dll/win32/hid/hid.c
index bd693d7e000..05ff0ac7e60 100644
--- a/reactos/dll/win32/hid/hid.c
+++ b/reactos/dll/win32/hid/hid.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: hid.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * PROJECT:         ReactOS Hid User Library
  * FILE:            lib/hid/hid.c
diff --git a/reactos/dll/win32/hid/stubs.c b/reactos/dll/win32/hid/stubs.c
index abd58df21cf..fca1934dfea 100644
--- a/reactos/dll/win32/hid/stubs.c
+++ b/reactos/dll/win32/hid/stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Hid User Library
diff --git a/reactos/dll/win32/iprtprio/iprtprio.rc b/reactos/dll/win32/iprtprio/iprtprio.rc
index 3f4caea9211..bd2d2df2b37 100644
--- a/reactos/dll/win32/iprtprio/iprtprio.rc
+++ b/reactos/dll/win32/iprtprio/iprtprio.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: iprtprio.rc 23585 2006-08-14 21:48:55Z gedmurphy $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS IP Route Priority API DLL\0"
diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
index 581991b5e48..a5253b61ceb 100644
--- a/reactos/dll/win32/msgina/stubs.c
+++ b/reactos/dll/win32/msgina/stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: stubs.c 58363 2013-02-24 19:44:41Z ekohl $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS msgina.dll
diff --git a/reactos/dll/win32/mswsock/stubs.c b/reactos/dll/win32/mswsock/stubs.c
index fe74b00b187..f36dd3db093 100644
--- a/reactos/dll/win32/mswsock/stubs.c
+++ b/reactos/dll/win32/mswsock/stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: stubs.c 53180 2011-08-11 15:07:19Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS WinSock DLL
diff --git a/reactos/dll/win32/psapi/internal.h b/reactos/dll/win32/psapi/internal.h
index 91579d66694..6ae39524cdb 100644
--- a/reactos/dll/win32/psapi/internal.h
+++ b/reactos/dll/win32/psapi/internal.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: internal.h 21298 2006-03-12 00:08:41Z jimtabor $
 */
 /*
  * epsapi.h
diff --git a/reactos/dll/win32/psapi/malloc.c b/reactos/dll/win32/psapi/malloc.c
index 089019e78ec..ade59502616 100644
--- a/reactos/dll/win32/psapi/malloc.c
+++ b/reactos/dll/win32/psapi/malloc.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: malloc.c 37763 2008-11-30 11:42:05Z sginsberg $
  */
 /*
  * COPYRIGHT:   None
diff --git a/reactos/dll/win32/psapi/psapi.c b/reactos/dll/win32/psapi/psapi.c
index 03734a92295..4803e802764 100644
--- a/reactos/dll/win32/psapi/psapi.c
+++ b/reactos/dll/win32/psapi/psapi.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: psapi.c 44602 2009-12-15 15:16:01Z tkreuzer $
  */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
diff --git a/reactos/dll/win32/samlib/dllmain.c b/reactos/dll/win32/samlib/dllmain.c
index e790d30be05..83ee5028591 100644
--- a/reactos/dll/win32/samlib/dllmain.c
+++ b/reactos/dll/win32/samlib/dllmain.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: dllmain.c 56648 2012-05-21 13:38:32Z ekohl $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
diff --git a/reactos/dll/win32/samlib/samlib.c b/reactos/dll/win32/samlib/samlib.c
index 74122acade1..59b37f49606 100644
--- a/reactos/dll/win32/samlib/samlib.c
+++ b/reactos/dll/win32/samlib/samlib.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: samlib.c 58259 2013-02-01 22:18:28Z ekohl $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
diff --git a/reactos/dll/win32/secur32/dllmain.c b/reactos/dll/win32/secur32/dllmain.c
index 39f8ad0c42d..69b25171a1c 100644
--- a/reactos/dll/win32/secur32/dllmain.c
+++ b/reactos/dll/win32/secur32/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c
index ade429ad204..1ecd476a801 100644
--- a/reactos/dll/win32/smdll/dllmain.c
+++ b/reactos/dll/win32/smdll/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS
diff --git a/reactos/dll/win32/smdll/query.c b/reactos/dll/win32/smdll/query.c
index 6dff3678abf..650e721d6b3 100644
--- a/reactos/dll/win32/smdll/query.c
+++ b/reactos/dll/win32/smdll/query.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: query.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/smdll/readme.txt b/reactos/dll/win32/smdll/readme.txt
index e2b8c33ba5f..512dbaa53b3 100644
--- a/reactos/dll/win32/smdll/readme.txt
+++ b/reactos/dll/win32/smdll/readme.txt
@@ -1,4 +1,4 @@
-$Id$
+$Id: readme.txt 58335 2013-02-17 15:06:22Z tkreuzer $
 
 This is SMDLL: a helper library to talk to the ReactOS session manager (SM).
 
diff --git a/reactos/dll/win32/syssetup/dllmain.c b/reactos/dll/win32/syssetup/dllmain.c
index 643f8ee855e..6e444477192 100644
--- a/reactos/dll/win32/syssetup/dllmain.c
+++ b/reactos/dll/win32/syssetup/dllmain.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: dllmain.c 54383 2011-11-15 08:44:37Z rharabien $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/desktop.c b/reactos/dll/win32/userenv/desktop.c
index 55ebba20880..5605fd61d94 100644
--- a/reactos/dll/win32/userenv/desktop.c
+++ b/reactos/dll/win32/userenv/desktop.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: desktop.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/directory.c b/reactos/dll/win32/userenv/directory.c
index 0cabeee075c..9f7f8f544a9 100644
--- a/reactos/dll/win32/userenv/directory.c
+++ b/reactos/dll/win32/userenv/directory.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: directory.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/environment.c b/reactos/dll/win32/userenv/environment.c
index cab99597406..e2e3bbb825f 100644
--- a/reactos/dll/win32/userenv/environment.c
+++ b/reactos/dll/win32/userenv/environment.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: environment.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/internal.h b/reactos/dll/win32/userenv/internal.h
index 526e1589120..8e7482e7fda 100644
--- a/reactos/dll/win32/userenv/internal.h
+++ b/reactos/dll/win32/userenv/internal.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: internal.h 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/misc.c b/reactos/dll/win32/userenv/misc.c
index 9af05efb794..3d02597f918 100644
--- a/reactos/dll/win32/userenv/misc.c
+++ b/reactos/dll/win32/userenv/misc.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/registry.c b/reactos/dll/win32/userenv/registry.c
index dec7685802d..0e8486dc37f 100644
--- a/reactos/dll/win32/userenv/registry.c
+++ b/reactos/dll/win32/userenv/registry.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: registry.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/resources.h b/reactos/dll/win32/userenv/resources.h
index 9f9120c14e1..3932e6dc83e 100644
--- a/reactos/dll/win32/userenv/resources.h
+++ b/reactos/dll/win32/userenv/resources.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: resources.h 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/setup.c b/reactos/dll/win32/userenv/setup.c
index b2a9ff04fd0..247f40efd2b 100644
--- a/reactos/dll/win32/userenv/setup.c
+++ b/reactos/dll/win32/userenv/setup.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: setup.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/userenv/userenv.c b/reactos/dll/win32/userenv/userenv.c
index d1338cbdf95..4c91acfccec 100644
--- a/reactos/dll/win32/userenv/userenv.c
+++ b/reactos/dll/win32/userenv/userenv.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: userenv.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/dll/win32/winfax/winfax.c b/reactos/dll/win32/winfax/winfax.c
index bb1b400c916..3e3530c33bd 100644
--- a/reactos/dll/win32/winfax/winfax.c
+++ b/reactos/dll/win32/winfax/winfax.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: winfax.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * PROJECT:         ReactOS FAX API Support
  * FILE:            lib/winfax/winfax.c
diff --git a/reactos/dll/win32/winscard/winscard.c b/reactos/dll/win32/winscard/winscard.c
index 9d993fe6726..f5201fc4fb4 100644
--- a/reactos/dll/win32/winscard/winscard.c
+++ b/reactos/dll/win32/winscard/winscard.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id$
+/* $Id: winscard.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * PROJECT:         ReactOS SmartCard API
  * FILE:            lib/winscard/winscard.c
diff --git a/reactos/dll/win32/winscard/winscard.rc b/reactos/dll/win32/winscard/winscard.rc
index e15de3ac0c7..26a49a02171 100644
--- a/reactos/dll/win32/winscard/winscard.rc
+++ b/reactos/dll/win32/winscard/winscard.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: winscard.rc 22413 2006-06-19 12:43:39Z gedmurphy $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SmartCard API\0"
diff --git a/reactos/dll/win32/winspool/stubs.c b/reactos/dll/win32/winspool/stubs.c
index d1f32d4ec92..7ffcc9d98a6 100644
--- a/reactos/dll/win32/winspool/stubs.c
+++ b/reactos/dll/win32/winspool/stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS winspool DRV
diff --git a/reactos/dll/win32/wsock32/stubs.c b/reactos/dll/win32/wsock32/stubs.c
index 9bedf5183e2..d6d70a36f3f 100644
--- a/reactos/dll/win32/wsock32/stubs.c
+++ b/reactos/dll/win32/wsock32/stubs.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS WinSock DLL
diff --git a/reactos/drivers/base/beep/beep.rc b/reactos/drivers/base/beep/beep.rc
index 7bc431afa99..87eb7a1e70c 100644
--- a/reactos/drivers/base/beep/beep.rc
+++ b/reactos/drivers/base/beep/beep.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: beep.rc 21705 2006-04-22 13:58:53Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PC Speaker Device Driver\0"
diff --git a/reactos/drivers/base/bootvid/bootvid.rc b/reactos/drivers/base/bootvid/bootvid.rc
index e491cb0d9a4..5bbf194de06 100644
--- a/reactos/drivers/base/bootvid/bootvid.rc
+++ b/reactos/drivers/base/bootvid/bootvid.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: bootvid.rc 31840 2008-01-17 14:50:36Z cfinck $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"VGA Boot Driver\0"
diff --git a/reactos/drivers/base/null/null.rc b/reactos/drivers/base/null/null.rc
index 5b0112577f8..d52736c090e 100644
--- a/reactos/drivers/base/null/null.rc
+++ b/reactos/drivers/base/null/null.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: null.rc 21842 2006-05-07 19:16:11Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Null Device Driver\0"
diff --git a/reactos/drivers/bus/isapnp/isapnp.rc b/reactos/drivers/bus/isapnp/isapnp.rc
index cc52ebe2744..b39405558c7 100644
--- a/reactos/drivers/bus/isapnp/isapnp.rc
+++ b/reactos/drivers/bus/isapnp/isapnp.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: isapnp.rc 27431 2007-07-06 20:18:43Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ISA Plug And Play Bus Driver\0"
diff --git a/reactos/drivers/bus/pci/pci.rc b/reactos/drivers/bus/pci/pci.rc
index ed1ed12f38d..765dbe5b202 100644
--- a/reactos/drivers/bus/pci/pci.rc
+++ b/reactos/drivers/bus/pci/pci.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pci.rc 27432 2007-07-06 20:24:15Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PCI Bus Driver\0"
diff --git a/reactos/drivers/bus/pci/pcidef.h b/reactos/drivers/bus/pci/pcidef.h
index 34407c4e856..2540544d10f 100644
--- a/reactos/drivers/bus/pci/pcidef.h
+++ b/reactos/drivers/bus/pci/pcidef.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ *	$Id: pcidef.h 45685 2010-02-26 11:43:19Z gedmurphy $
  *
  *	PCI defines and function prototypes
  *	Copyright 1994, Drew Eckhardt
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.c b/reactos/drivers/filesystems/cdfs/cdfs.c
index 172282eff77..ea561b20a5f 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.c
+++ b/reactos/drivers/filesystems/cdfs/cdfs.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: cdfs.c 48654 2010-08-30 11:51:17Z mjmartin $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.rc b/reactos/drivers/filesystems/cdfs/cdfs.rc
index 08da8919a11..1cf70c60840 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.rc
+++ b/reactos/drivers/filesystems/cdfs/cdfs.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cdfs.rc 21710 2006-04-22 16:36:21Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ISO9660 Driver\0"
diff --git a/reactos/drivers/filesystems/cdfs/cleanup.c b/reactos/drivers/filesystems/cdfs/cleanup.c
index 3e0100f655a..1b048eecc03 100644
--- a/reactos/drivers/filesystems/cdfs/cleanup.c
+++ b/reactos/drivers/filesystems/cdfs/cleanup.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: cleanup.c 43790 2009-10-27 10:34:16Z dgorbachev $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/close.c b/reactos/drivers/filesystems/cdfs/close.c
index 38f7e0aceaf..e2d8406a03f 100644
--- a/reactos/drivers/filesystems/cdfs/close.c
+++ b/reactos/drivers/filesystems/cdfs/close.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: close.c 43790 2009-10-27 10:34:16Z dgorbachev $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/common.c b/reactos/drivers/filesystems/cdfs/common.c
index d73864bb054..87b8e489a09 100644
--- a/reactos/drivers/filesystems/cdfs/common.c
+++ b/reactos/drivers/filesystems/cdfs/common.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: common.c 55057 2012-01-21 22:16:46Z cgutman $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/create.c b/reactos/drivers/filesystems/cdfs/create.c
index d7a6440d820..220943a46ee 100644
--- a/reactos/drivers/filesystems/cdfs/create.c
+++ b/reactos/drivers/filesystems/cdfs/create.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: create.c 52546 2011-07-05 13:55:39Z rharabien $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index 3cb8ada2ba9..99590cd652b 100644
--- a/reactos/drivers/filesystems/cdfs/dirctl.c
+++ b/reactos/drivers/filesystems/cdfs/dirctl.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: dirctl.c 57791 2012-12-02 21:04:31Z pschweitzer $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/fcb.c b/reactos/drivers/filesystems/cdfs/fcb.c
index 12bee1dd753..f0effcd0108 100644
--- a/reactos/drivers/filesystems/cdfs/fcb.c
+++ b/reactos/drivers/filesystems/cdfs/fcb.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: fcb.c 48654 2010-08-30 11:51:17Z mjmartin $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
index 3ad68bcd890..dca2adee539 100644
--- a/reactos/drivers/filesystems/cdfs/finfo.c
+++ b/reactos/drivers/filesystems/cdfs/finfo.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: finfo.c 53676 2011-09-10 21:31:09Z akhaldi $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/misc.c b/reactos/drivers/filesystems/cdfs/misc.c
index d1f618a7334..8acf3395b7c 100644
--- a/reactos/drivers/filesystems/cdfs/misc.c
+++ b/reactos/drivers/filesystems/cdfs/misc.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: misc.c 48494 2010-08-09 20:38:12Z fireball $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
index ef94d22e3ff..21aa1d68c1e 100644
--- a/reactos/drivers/filesystems/cdfs/rw.c
+++ b/reactos/drivers/filesystems/cdfs/rw.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: rw.c 54273 2011-10-30 00:58:21Z jgardou $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
index 0198335162d..e7b2cf21fe9 100644
--- a/reactos/drivers/filesystems/cdfs/volinfo.c
+++ b/reactos/drivers/filesystems/cdfs/volinfo.c
@@ -16,7 +16,7 @@
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-/* $Id$
+/* $Id: volinfo.c 44442 2009-12-06 18:49:19Z spetreolle $
 *
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/msfs/msfs.rc b/reactos/drivers/filesystems/msfs/msfs.rc
index bfbfbd10529..37e10dec2d8 100644
--- a/reactos/drivers/filesystems/msfs/msfs.rc
+++ b/reactos/drivers/filesystems/msfs/msfs.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msfs.rc 21716 2006-04-23 08:56:14Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Mailslot IFS Driver\0"
diff --git a/reactos/drivers/filesystems/mup/create.c b/reactos/drivers/filesystems/mup/create.c
index 6a0088bf1a9..6f3dba4e2b4 100644
--- a/reactos/drivers/filesystems/mup/create.c
+++ b/reactos/drivers/filesystems/mup/create.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: create.c 53683 2011-09-11 08:52:59Z ekohl $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/mup/mup.c b/reactos/drivers/filesystems/mup/mup.c
index 9da6cb75d02..27fd39d4b79 100644
--- a/reactos/drivers/filesystems/mup/mup.c
+++ b/reactos/drivers/filesystems/mup/mup.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: mup.c 53683 2011-09-11 08:52:59Z ekohl $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/filesystems/mup/mup.rc b/reactos/drivers/filesystems/mup/mup.rc
index bdfd6948e9c..73c212a7810 100644
--- a/reactos/drivers/filesystems/mup/mup.rc
+++ b/reactos/drivers/filesystems/mup/mup.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mup.rc 21385 2006-03-25 01:39:22Z peterw $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Multi UNC Provider\0"
diff --git a/reactos/drivers/input/kbdclass/kbdclass.rc b/reactos/drivers/input/kbdclass/kbdclass.rc
index 49988d987cc..bf223babdc0 100644
--- a/reactos/drivers/input/kbdclass/kbdclass.rc
+++ b/reactos/drivers/input/kbdclass/kbdclass.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: kbdclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Keyboard Device Driver\0"
diff --git a/reactos/drivers/input/mouclass/mouclass.rc b/reactos/drivers/input/mouclass/mouclass.rc
index 3721a5288cf..65419972702 100644
--- a/reactos/drivers/input/mouclass/mouclass.rc
+++ b/reactos/drivers/input/mouclass/mouclass.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mouclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Mouse Class Device Driver\0"
diff --git a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
index 8e9d3519e0f..7eb19f90117 100644
--- a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
+++ b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sndblst.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SoundBlaster Driver\0"
diff --git a/reactos/drivers/multimedia/audio/sound/sb16.c b/reactos/drivers/multimedia/audio/sound/sb16.c
index ea74f652fee..9f2c930466f 100644
--- a/reactos/drivers/multimedia/audio/sound/sb16.c
+++ b/reactos/drivers/multimedia/audio/sound/sb16.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: sb16.c 37762 2008-11-30 11:16:55Z sginsberg $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
diff --git a/reactos/drivers/multimedia/audio/sound/sb16.rc b/reactos/drivers/multimedia/audio/sound/sb16.rc
index 2cc53d9247d..194b7f91fe7 100644
--- a/reactos/drivers/multimedia/audio/sound/sb16.rc
+++ b/reactos/drivers/multimedia/audio/sound/sb16.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sb16.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SB16 driver\0"
diff --git a/reactos/drivers/network/afd/afd.rc b/reactos/drivers/network/afd/afd.rc
index 685f807e2a7..31e7c3efcc6 100644
--- a/reactos/drivers/network/afd/afd.rc
+++ b/reactos/drivers/network/afd/afd.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: afd.rc 21689 2006-04-21 17:45:51Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Socket Filesystem Driver\0"
diff --git a/reactos/drivers/network/afd/afd/bind.c b/reactos/drivers/network/afd/afd/bind.c
index c3e2c149569..b14bcfb6916 100644
--- a/reactos/drivers/network/afd/afd/bind.c
+++ b/reactos/drivers/network/afd/afd/bind.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: bind.c 57233 2012-09-04 03:01:15Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/bind.c
diff --git a/reactos/drivers/network/afd/afd/connect.c b/reactos/drivers/network/afd/afd/connect.c
index 86ce48f1253..b937c683ddb 100644
--- a/reactos/drivers/network/afd/afd/connect.c
+++ b/reactos/drivers/network/afd/afd/connect.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: connect.c 57233 2012-09-04 03:01:15Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/connect.c
diff --git a/reactos/drivers/network/afd/afd/context.c b/reactos/drivers/network/afd/afd/context.c
index ce2d9e1e3bd..741bf5bfc40 100644
--- a/reactos/drivers/network/afd/afd/context.c
+++ b/reactos/drivers/network/afd/afd/context.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: context.c 57233 2012-09-04 03:01:15Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/context.c
diff --git a/reactos/drivers/network/afd/afd/info.c b/reactos/drivers/network/afd/afd/info.c
index b1e771e2c5e..1f5656b5a4e 100644
--- a/reactos/drivers/network/afd/afd/info.c
+++ b/reactos/drivers/network/afd/afd/info.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: info.c 57233 2012-09-04 03:01:15Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/info.c
diff --git a/reactos/drivers/network/afd/afd/listen.c b/reactos/drivers/network/afd/afd/listen.c
index c47bad971c0..f316367047c 100644
--- a/reactos/drivers/network/afd/afd/listen.c
+++ b/reactos/drivers/network/afd/afd/listen.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: listen.c 57233 2012-09-04 03:01:15Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/listen.c
diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c
index d26fbf24643..2123c437e73 100644
--- a/reactos/drivers/network/afd/afd/lock.c
+++ b/reactos/drivers/network/afd/afd/lock.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lock.c 57237 2012-09-04 07:42:21Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/lock.c
diff --git a/reactos/drivers/network/afd/afd/main.c b/reactos/drivers/network/afd/afd/main.c
index eb050bd3953..ecd9109818a 100644
--- a/reactos/drivers/network/afd/afd/main.c
+++ b/reactos/drivers/network/afd/afd/main.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: main.c 57975 2012-12-23 09:53:36Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/main.c
diff --git a/reactos/drivers/network/afd/afd/read.c b/reactos/drivers/network/afd/afd/read.c
index fcaea4b3f60..06cc551e2b4 100644
--- a/reactos/drivers/network/afd/afd/read.c
+++ b/reactos/drivers/network/afd/afd/read.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: read.c 57975 2012-12-23 09:53:36Z cgutman $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/read.c
diff --git a/reactos/drivers/network/afd/afd/tdiconn.c b/reactos/drivers/network/afd/afd/tdiconn.c
index 517f8861a2d..fcb14dacb3d 100644
--- a/reactos/drivers/network/afd/afd/tdiconn.c
+++ b/reactos/drivers/network/afd/afd/tdiconn.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tdiconn.c 56389 2012-04-22 13:11:54Z tfaber $
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/tdiconn.c
diff --git a/reactos/drivers/network/afd/include/afd.h b/reactos/drivers/network/afd/include/afd.h
index 827e057df7e..038d79ec4cb 100644
--- a/reactos/drivers/network/afd/include/afd.h
+++ b/reactos/drivers/network/afd/include/afd.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: afd.h 57975 2012-12-23 09:53:36Z cgutman $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/network/dd/ne2000/ne2000.rc b/reactos/drivers/network/dd/ne2000/ne2000.rc
index 3e0beff2fbb..4fd998235d2 100644
--- a/reactos/drivers/network/dd/ne2000/ne2000.rc
+++ b/reactos/drivers/network/dd/ne2000/ne2000.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ne2000.rc 21473 2006-04-05 16:35:30Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Novell NE2000 network driver\0"
diff --git a/reactos/drivers/network/dd/pcnet/pcnet.rc b/reactos/drivers/network/dd/pcnet/pcnet.rc
index 9bf89cdc541..e5f3f5a5567 100644
--- a/reactos/drivers/network/dd/pcnet/pcnet.rc
+++ b/reactos/drivers/network/dd/pcnet/pcnet.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pcnet.rc 30251 2007-11-07 22:59:56Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PCNet Ethernet PCI Driver\0"
diff --git a/reactos/drivers/network/lan/lan.rc b/reactos/drivers/network/lan/lan.rc
index a58d91fefda..73fe1719fae 100644
--- a/reactos/drivers/network/lan/lan.rc
+++ b/reactos/drivers/network/lan/lan.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: lan.rc 21693 2006-04-22 04:56:37Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TCP/IP protocol driver\0"
diff --git a/reactos/drivers/network/ndis/ndis.rc b/reactos/drivers/network/ndis/ndis.rc
index da85ed05b23..dbbeb77f172 100644
--- a/reactos/drivers/network/ndis/ndis.rc
+++ b/reactos/drivers/network/ndis/ndis.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"NDIS Library\0"
diff --git a/reactos/drivers/network/tdi/cte/string.c b/reactos/drivers/network/tdi/cte/string.c
index 2f28750548e..dbbaa9ecec6 100644
--- a/reactos/drivers/network/tdi/cte/string.c
+++ b/reactos/drivers/network/tdi/cte/string.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: string.c 52934 2011-07-27 19:33:08Z akhaldi $
  *
  */
 #include "precomp.h"
diff --git a/reactos/drivers/network/tdi/misc/tdi.rc b/reactos/drivers/network/tdi/misc/tdi.rc
index 7b6bd1f07e9..ce92554094a 100644
--- a/reactos/drivers/network/tdi/misc/tdi.rc
+++ b/reactos/drivers/network/tdi/misc/tdi.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tdi.rc 21695 2006-04-22 05:22:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TDI wrapper kernel module\0"
diff --git a/reactos/drivers/network/tdi/tdi/handler.c b/reactos/drivers/network/tdi/tdi/handler.c
index fe24d0b1f5d..5f6e030e6cd 100644
--- a/reactos/drivers/network/tdi/tdi/handler.c
+++ b/reactos/drivers/network/tdi/tdi/handler.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: handler.c 52934 2011-07-27 19:33:08Z akhaldi $
  *
  * DESCRIPTION: Default TDI event handlers.
  */
diff --git a/reactos/drivers/network/tdi/tdi/obsolete.c b/reactos/drivers/network/tdi/tdi/obsolete.c
index 42c3935cea6..a84c7f09154 100644
--- a/reactos/drivers/network/tdi/tdi/obsolete.c
+++ b/reactos/drivers/network/tdi/tdi/obsolete.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: obsolete.c 52934 2011-07-27 19:33:08Z akhaldi $
  *
  */
 
diff --git a/reactos/drivers/network/tdi/tdi/stubs.c b/reactos/drivers/network/tdi/tdi/stubs.c
index 8af72d8bb85..c0c20fceac6 100644
--- a/reactos/drivers/network/tdi/tdi/stubs.c
+++ b/reactos/drivers/network/tdi/tdi/stubs.c
@@ -1,5 +1,5 @@
 
-/* $Id$
+/* $Id: stubs.c 52934 2011-07-27 19:33:08Z akhaldi $
  *
  */
 #include "precomp.h"
diff --git a/reactos/drivers/parallel/parallel/parallel.c b/reactos/drivers/parallel/parallel/parallel.c
index 25b9b27b219..8a27d03df11 100644
--- a/reactos/drivers/parallel/parallel/parallel.c
+++ b/reactos/drivers/parallel/parallel/parallel.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: parallel.c 54094 2011-10-12 12:24:19Z akhaldi $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
diff --git a/reactos/drivers/parallel/parallel/parallel.rc b/reactos/drivers/parallel/parallel/parallel.rc
index 5c9d86226fc..57b79adbb0e 100644
--- a/reactos/drivers/parallel/parallel/parallel.rc
+++ b/reactos/drivers/parallel/parallel/parallel.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: parallel.rc 21498 2006-04-07 10:15:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Parallel Port Device Driver\0"
diff --git a/reactos/drivers/serial/serenum/serenum.rc b/reactos/drivers/serial/serenum/serenum.rc
index a88af0f20f3..90dee990790 100644
--- a/reactos/drivers/serial/serenum/serenum.rc
+++ b/reactos/drivers/serial/serenum/serenum.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: serenum.rc 21507 2006-04-07 15:34:51Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Serial port enumerator\0"
diff --git a/reactos/drivers/serial/serial/serial.rc b/reactos/drivers/serial/serial/serial.rc
index b72104de0e1..a7bf9af4de0 100644
--- a/reactos/drivers/serial/serial/serial.rc
+++ b/reactos/drivers/serial/serial/serial.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: serial.rc 22516 2006-06-22 22:14:51Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Serial Port Device Driver\0"
diff --git a/reactos/drivers/setup/blue/blue.rc b/reactos/drivers/setup/blue/blue.rc
index f8fb24274f6..85074c4d01d 100644
--- a/reactos/drivers/setup/blue/blue.rc
+++ b/reactos/drivers/setup/blue/blue.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: blue.rc 21706 2006-04-22 14:01:25Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"HAL Console Device Driver\0"
diff --git a/reactos/drivers/storage/class/cdrom/cdrom.rc b/reactos/drivers/storage/class/cdrom/cdrom.rc
index 3ad0e51e230..0af3c65cecb 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.rc
+++ b/reactos/drivers/storage/class/cdrom/cdrom.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cdrom.rc 26227 2007-04-01 16:29:16Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"CD-ROM Class Driver\0"
diff --git a/reactos/drivers/storage/class/disk/disk.rc b/reactos/drivers/storage/class/disk/disk.rc
index cce8f8d7b80..1c6a54694a4 100644
--- a/reactos/drivers/storage/class/disk/disk.rc
+++ b/reactos/drivers/storage/class/disk/disk.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: disk.rc 21397 2006-03-27 07:38:43Z peterw $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Disk Class Driver\0"
diff --git a/reactos/drivers/storage/class/include/class2.h b/reactos/drivers/storage/class/include/class2.h
index 48aa271c2e8..e02c8fb5940 100644
--- a/reactos/drivers/storage/class/include/class2.h
+++ b/reactos/drivers/storage/class/include/class2.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: class2.h 49129 2010-10-12 20:17:55Z pschweitzer $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
diff --git a/reactos/drivers/storage/floppy/floppy.rc b/reactos/drivers/storage/floppy/floppy.rc
index 307ebb3b629..60658cddd61 100644
--- a/reactos/drivers/storage/floppy/floppy.rc
+++ b/reactos/drivers/storage/floppy/floppy.rc
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: floppy.rc 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  *  ReactOS Floppy Driver
  *  Copyright (C) 2004, Vizzini (vizzini@plasmic.com)
diff --git a/reactos/drivers/storage/ide/atapi/atapi.rc b/reactos/drivers/storage/ide/atapi/atapi.rc
index 94e9860bbcd..ed082789741 100644
--- a/reactos/drivers/storage/ide/atapi/atapi.rc
+++ b/reactos/drivers/storage/ide/atapi/atapi.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: atapi.rc 26238 2007-04-01 19:25:38Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ATAPI IDE Miniport Driver\0"
diff --git a/reactos/hal/halx86/include/halirq.h b/reactos/hal/halx86/include/halirq.h
index ba5f9533d22..0e2ca932cac 100644
--- a/reactos/hal/halx86/include/halirq.h
+++ b/reactos/hal/halx86/include/halirq.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: halirq.h 53677 2011-09-10 21:56:07Z tkreuzer $
  */
 
 #pragma once
diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c
index 6aea485bbc4..0cfa4d2b026 100644
--- a/reactos/hal/halx86/mp/apic.c
+++ b/reactos/hal/halx86/mp/apic.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: apic.c 45565 2010-02-10 23:24:59Z tkreuzer $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS kernel
diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c
index edb910682ac..c202cec1c01 100644
--- a/reactos/hal/halx86/mp/halinit_mp.c
+++ b/reactos/hal/halx86/mp/halinit_mp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: halinit_mp.c 53675 2011-09-10 18:58:01Z tkreuzer $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
diff --git a/reactos/hal/halx86/mp/ipi_mp.c b/reactos/hal/halx86/mp/ipi_mp.c
index c9bbb0e7dee..025914058ec 100644
--- a/reactos/hal/halx86/mp/ipi_mp.c
+++ b/reactos/hal/halx86/mp/ipi_mp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ipi_mp.c 45020 2010-01-09 22:43:16Z ekohl $
  *
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS kernel
diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c
index 0627e90041e..0f612c1bb55 100644
--- a/reactos/hal/halx86/mp/processor_mp.c
+++ b/reactos/hal/halx86/mp/processor_mp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: processor_mp.c 47674 2010-06-07 20:37:19Z sir_richard $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
diff --git a/reactos/hal/halx86/up/halinit_up.c b/reactos/hal/halx86/up/halinit_up.c
index f9be15fe6ce..8318ec0bb66 100644
--- a/reactos/hal/halx86/up/halinit_up.c
+++ b/reactos/hal/halx86/up/halinit_up.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: halinit_up.c 53675 2011-09-10 18:58:01Z tkreuzer $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
diff --git a/reactos/hal/halx86/xbox/halinit_xbox.c b/reactos/hal/halx86/xbox/halinit_xbox.c
index 6a7e7d71269..39d2cb6c397 100644
--- a/reactos/hal/halx86/xbox/halinit_xbox.c
+++ b/reactos/hal/halx86/xbox/halinit_xbox.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: halinit_xbox.c 53675 2011-09-10 18:58:01Z tkreuzer $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
diff --git a/reactos/hal/halx86/xbox/halxbox.h b/reactos/hal/halx86/xbox/halxbox.h
index bbe9d5a1463..d0704368c17 100644
--- a/reactos/hal/halx86/xbox/halxbox.h
+++ b/reactos/hal/halx86/xbox/halxbox.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: halxbox.h 56228 2012-03-25 16:57:10Z sginsberg $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         Xbox HAL
diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c
index bab0a530bde..2d8e8c01489 100644
--- a/reactos/hal/halx86/xbox/part_xbox.c
+++ b/reactos/hal/halx86/xbox/part_xbox.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: part_xbox.c 43124 2009-09-23 20:59:08Z hpoussin $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
diff --git a/reactos/include/reactos/libs/epsapi/epsapi.h b/reactos/include/reactos/libs/epsapi/epsapi.h
index aa81ad9ae0b..52295d47f99 100644
--- a/reactos/include/reactos/libs/epsapi/epsapi.h
+++ b/reactos/include/reactos/libs/epsapi/epsapi.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: epsapi.h 21880 2006-05-10 17:47:44Z ion $
 */
 /*
  * epsapi.h
diff --git a/reactos/include/reactos/libs/syssetup/syssetup.h b/reactos/include/reactos/libs/syssetup/syssetup.h
index 3313bb239a0..3db55c473bb 100644
--- a/reactos/include/reactos/libs/syssetup/syssetup.h
+++ b/reactos/include/reactos/libs/syssetup/syssetup.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: syssetup.h 45020 2010-01-09 22:43:16Z ekohl $
 */
 /*
  * syssetup.h
diff --git a/reactos/include/reactos/subsys/lsass/lsass.h b/reactos/include/reactos/subsys/lsass/lsass.h
index 5eb709acdf9..fc2bb2ca707 100644
--- a/reactos/include/reactos/subsys/lsass/lsass.h
+++ b/reactos/include/reactos/subsys/lsass/lsass.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lsass.h 58304 2013-02-10 12:09:21Z ekohl $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/include/reactos/subsys/sm/helper.h b/reactos/include/reactos/subsys/sm/helper.h
index 22464cc3f60..abbfd09b567 100644
--- a/reactos/include/reactos/subsys/sm/helper.h
+++ b/reactos/include/reactos/subsys/sm/helper.h
@@ -5,7 +5,7 @@
 #include <sm/api.h>
 #endif
 
-/* $Id$ */
+/* $Id: helper.h 37769 2008-11-30 13:46:35Z sginsberg $ */
 
 /* smlib/connect.c */
 NTSTATUS WINAPI
diff --git a/reactos/include/reactos/subsys/sm/ns.h b/reactos/include/reactos/subsys/sm/ns.h
index 56279a9222c..a0247209e3b 100644
--- a/reactos/include/reactos/subsys/sm/ns.h
+++ b/reactos/include/reactos/subsys/sm/ns.h
@@ -1,7 +1,7 @@
 #if !defined(INCLUDE_SM_NS_H)
 #define INCLUDE_SM_NS_H
 
-/* $Id$ */
+/* $Id: ns.h 15729 2005-06-02 13:17:37Z ea $ */
 
 #define SM_REGISTRY_ROOT_NAME	     L"\\Session Manager"
 #define SM_REGISTRY_SUBSYSTEMS_NAME  L"SubSystems"
diff --git a/reactos/include/reactos/winlogon.h b/reactos/include/reactos/winlogon.h
index 4c00b674e81..14bb549fb13 100644
--- a/reactos/include/reactos/winlogon.h
+++ b/reactos/include/reactos/winlogon.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: winlogon.h 50813 2011-02-18 20:16:43Z gadamopoulos $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS kernel
diff --git a/reactos/lib/3rdparty/adns/README.html b/reactos/lib/3rdparty/adns/README.html
index 760c2780411..a35b96e398b 100644
--- a/reactos/lib/3rdparty/adns/README.html
+++ b/reactos/lib/3rdparty/adns/README.html
@@ -16,7 +16,7 @@ library and utilities.</strong>
 <!--  Please ensure that all links continine to be correct        -->
 <!--  both for www.gnu.org and chiark.                            -->
 <!--                                                              -->
-<!--  $Id$        -->   
+<!--  $Id: README.html 21334 2006-03-18 18:25:48Z peterw $        -->   
 
 <p>
 
diff --git a/reactos/lib/3rdparty/freetype/README.ROS b/reactos/lib/3rdparty/freetype/README.ROS
index d33a314c5a1..5d4eb6334cc 100644
--- a/reactos/lib/3rdparty/freetype/README.ROS
+++ b/reactos/lib/3rdparty/freetype/README.ROS
@@ -67,4 +67,4 @@ file, so it is obvious to everyone which FreeType version we're using.
 After testing, you can commit the new/changed files to CVS. ALthough files
 config.mk and freetype.def are generated, they should be included in CVS.
 
-$Id$
+$Id: README.ROS 25663 2007-01-31 06:11:48Z greatlrd $
diff --git a/reactos/lib/epsapi/enum/drivers.c b/reactos/lib/epsapi/enum/drivers.c
index 961628da76e..52af504ff3a 100644
--- a/reactos/lib/epsapi/enum/drivers.c
+++ b/reactos/lib/epsapi/enum/drivers.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: drivers.c 52985 2011-07-28 16:21:48Z akhaldi $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
diff --git a/reactos/lib/epsapi/enum/modules.c b/reactos/lib/epsapi/enum/modules.c
index f5a3d73d479..f017af963dc 100644
--- a/reactos/lib/epsapi/enum/modules.c
+++ b/reactos/lib/epsapi/enum/modules.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: modules.c 52985 2011-07-28 16:21:48Z akhaldi $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
diff --git a/reactos/lib/epsapi/enum/processes.c b/reactos/lib/epsapi/enum/processes.c
index 3d772d0b5d1..e1588cd94ea 100644
--- a/reactos/lib/epsapi/enum/processes.c
+++ b/reactos/lib/epsapi/enum/processes.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: processes.c 52985 2011-07-28 16:21:48Z akhaldi $
 */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
diff --git a/reactos/lib/sdk/crt/except/i386/chkstk_asm.s b/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
index 58879f18d0f..56c1507b301 100644
--- a/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
+++ b/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: chkstk_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
diff --git a/reactos/lib/sdk/crt/math/adjust.c b/reactos/lib/sdk/crt/math/adjust.c
index f27c82511de..907def473c4 100644
--- a/reactos/lib/sdk/crt/math/adjust.c
+++ b/reactos/lib/sdk/crt/math/adjust.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: adjust.c 22022 2006-05-24 20:50:55Z greatlrd $
  *
  */
 
diff --git a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
index 40cd3dc8cef..95d9d55998b 100644
--- a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: memchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
diff --git a/reactos/lib/sdk/crt/mem/i386/memset_asm.s b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
index 81430472f4a..949c2ef0a9f 100644
--- a/reactos/lib/sdk/crt/mem/i386/memset_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $Id: memset_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/mem/memccpy.c b/reactos/lib/sdk/crt/mem/memccpy.c
index c760b85021e..d8a02156139 100644
--- a/reactos/lib/sdk/crt/mem/memccpy.c
+++ b/reactos/lib/sdk/crt/mem/memccpy.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: memccpy.c 30288 2007-11-09 11:22:29Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/mem/memchr.c b/reactos/lib/sdk/crt/mem/memchr.c
index 9a9ce8af3fc..a0261d4fcc5 100644
--- a/reactos/lib/sdk/crt/mem/memchr.c
+++ b/reactos/lib/sdk/crt/mem/memchr.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: memchr.c 30266 2007-11-08 10:54:42Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/mem/memcmp.c b/reactos/lib/sdk/crt/mem/memcmp.c
index b9b4334260f..959402650ad 100644
--- a/reactos/lib/sdk/crt/mem/memcmp.c
+++ b/reactos/lib/sdk/crt/mem/memcmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: memcmp.c 50647 2011-02-10 11:35:05Z tkreuzer $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/mem/memset.c b/reactos/lib/sdk/crt/mem/memset.c
index 692c09dc620..09bb66a7894 100644
--- a/reactos/lib/sdk/crt/mem/memset.c
+++ b/reactos/lib/sdk/crt/mem/memset.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: memset.c 30266 2007-11-08 10:54:42Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/setjmp/i386/setjmp.s b/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
index 95c4aac27a3..470b67914fb 100644
--- a/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
+++ b/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: setjmp.s 49836 2010-11-28 09:53:22Z tkreuzer $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
diff --git a/reactos/lib/sdk/crt/stdlib/makepath.c b/reactos/lib/sdk/crt/stdlib/makepath.c
index c048fb80c42..43c16b9f9b9 100644
--- a/reactos/lib/sdk/crt/stdlib/makepath.c
+++ b/reactos/lib/sdk/crt/stdlib/makepath.c
@@ -11,7 +11,7 @@
  *
  */
 
-/* $Id$
+/* $Id: makepath.c 53713 2011-09-15 17:11:53Z tkreuzer $
  */
 #include <precomp.h>
 #include <stdlib.h>
diff --git a/reactos/lib/sdk/crt/stdlib/wmakpath.c b/reactos/lib/sdk/crt/stdlib/wmakpath.c
index 16ad4e3f844..2da0c92cd71 100644
--- a/reactos/lib/sdk/crt/stdlib/wmakpath.c
+++ b/reactos/lib/sdk/crt/stdlib/wmakpath.c
@@ -11,7 +11,7 @@
  *
  */
 
-/* $Id$
+/* $Id: wmakpath.c 53713 2011-09-15 17:11:53Z tkreuzer $
  */
 #include <precomp.h>
 
diff --git a/reactos/lib/sdk/crt/string/i386/strcat_asm.s b/reactos/lib/sdk/crt/string/i386/strcat_asm.s
index 6f7b8052d23..183035e272e 100644
--- a/reactos/lib/sdk/crt/string/i386/strcat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcat_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcscat.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strchr_asm.s b/reactos/lib/sdk/crt/string/i386/strchr_asm.s
index f8085f25485..4d4dcb1a65e 100644
--- a/reactos/lib/sdk/crt/string/i386/strchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strchr_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcschr.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strcmp_asm.s b/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
index 8618f17c076..1a57d43dad3 100644
--- a/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcscmp.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strcpy_asm.s b/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
index 168d2921ba8..a9387e47f23 100644
--- a/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcscpy.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strlen_asm.s b/reactos/lib/sdk/crt/string/i386/strlen_asm.s
index 66a8ba27299..6715afed07d 100644
--- a/reactos/lib/sdk/crt/string/i386/strlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strlen_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcslen.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strncat_asm.s b/reactos/lib/sdk/crt/string/i386/strncat_asm.s
index d7fefe417a7..1ed59d89e70 100644
--- a/reactos/lib/sdk/crt/string/i386/strncat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncat_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcsncat.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strncmp_asm.s b/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
index d4db767c207..fa1b0455331 100644
--- a/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcsncmp.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strncpy_asm.s b/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
index 584dbb8cce5..eda19d058af 100644
--- a/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcsncpy.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strnlen_asm.s b/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
index 5c1f8dfccf7..30983971dc1 100644
--- a/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strnlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcsnlen.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/strrchr_asm.s b/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
index c94f29ec0d7..8d6ddb5de3d 100644
--- a/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strrchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #include "tcsrchr.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/tchar.h b/reactos/lib/sdk/crt/string/i386/tchar.h
index 10df6b92308..6b2a40ab2e1 100644
--- a/reactos/lib/sdk/crt/string/i386/tchar.h
+++ b/reactos/lib/sdk/crt/string/i386/tchar.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tchar.h 53439 2011-08-25 09:34:26Z tkreuzer $
  */
 
 #ifndef __TCHAR_INC_S__
diff --git a/reactos/lib/sdk/crt/string/i386/wcscat_asm.s b/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
index b833d0ddab3..d8edb2bd438 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcschr_asm.s b/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
index 8fc6c360baf..c0733a5f14b 100644
--- a/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcschr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s b/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
index b4f5425beba..167e0dc9bd7 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s b/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
index 78b6fe2a6d2..6468a10919d 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcslen_asm.s b/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
index 5d4bfe054aa..02a24b61be7 100644
--- a/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcslen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
index d28bbc3e3a4..caa864bf10a 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
index 5ae53efa7c9..7f3878ef979 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
index b4591cfdb10..d97e0114744 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s b/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
index 39349927757..48827ef4c74 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsnlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s b/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
index a845ee53203..c38b8e320ef 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsrchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/strcat.c b/reactos/lib/sdk/crt/string/strcat.c
index 59aee1a90fd..698ccbf9133 100644
--- a/reactos/lib/sdk/crt/string/strcat.c
+++ b/reactos/lib/sdk/crt/string/strcat.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcat.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strchr.c b/reactos/lib/sdk/crt/string/strchr.c
index e504e4bcd90..eb4e77a55b0 100644
--- a/reactos/lib/sdk/crt/string/strchr.c
+++ b/reactos/lib/sdk/crt/string/strchr.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strchr.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _XINT int
diff --git a/reactos/lib/sdk/crt/string/strcmp.c b/reactos/lib/sdk/crt/string/strcmp.c
index df8e1408196..cf89b07b691 100644
--- a/reactos/lib/sdk/crt/string/strcmp.c
+++ b/reactos/lib/sdk/crt/string/strcmp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcmp.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strcpy.c b/reactos/lib/sdk/crt/string/strcpy.c
index 9f09b15be97..d5c98627a16 100644
--- a/reactos/lib/sdk/crt/string/strcpy.c
+++ b/reactos/lib/sdk/crt/string/strcpy.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcpy.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strcspn.c b/reactos/lib/sdk/crt/string/strcspn.c
index 5b507456d0e..2cb7a556374 100644
--- a/reactos/lib/sdk/crt/string/strcspn.c
+++ b/reactos/lib/sdk/crt/string/strcspn.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strcspn.c 30291 2007-11-09 12:20:16Z fireball $
  */
 
 #define _x(_X_) (_X_)
diff --git a/reactos/lib/sdk/crt/string/strlen.c b/reactos/lib/sdk/crt/string/strlen.c
index 7dd8d68c170..2df72aa277e 100644
--- a/reactos/lib/sdk/crt/string/strlen.c
+++ b/reactos/lib/sdk/crt/string/strlen.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strlen.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strncat.c b/reactos/lib/sdk/crt/string/strncat.c
index b2390f55da6..b076851377c 100644
--- a/reactos/lib/sdk/crt/string/strncat.c
+++ b/reactos/lib/sdk/crt/string/strncat.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncat.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strncmp.c b/reactos/lib/sdk/crt/string/strncmp.c
index 383782206d6..b1dd599a5de 100644
--- a/reactos/lib/sdk/crt/string/strncmp.c
+++ b/reactos/lib/sdk/crt/string/strncmp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncmp.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strncpy.c b/reactos/lib/sdk/crt/string/strncpy.c
index c172eb7cc4d..b00a3de214d 100644
--- a/reactos/lib/sdk/crt/string/strncpy.c
+++ b/reactos/lib/sdk/crt/string/strncpy.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strncpy.c 30283 2007-11-08 21:06:20Z fireball $
  */
 #include <string.h>
 #include "tcsncpy.h"
diff --git a/reactos/lib/sdk/crt/string/strnlen.c b/reactos/lib/sdk/crt/string/strnlen.c
index 269c4953561..5228b498cea 100644
--- a/reactos/lib/sdk/crt/string/strnlen.c
+++ b/reactos/lib/sdk/crt/string/strnlen.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strnlen.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strrchr.c b/reactos/lib/sdk/crt/string/strrchr.c
index 152561537c8..7ba3657216d 100644
--- a/reactos/lib/sdk/crt/string/strrchr.c
+++ b/reactos/lib/sdk/crt/string/strrchr.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strrchr.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _XINT int
diff --git a/reactos/lib/sdk/crt/string/strspn.c b/reactos/lib/sdk/crt/string/strspn.c
index a4c4109239c..20f8dfe91c0 100644
--- a/reactos/lib/sdk/crt/string/strspn.c
+++ b/reactos/lib/sdk/crt/string/strspn.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strspn.c 30291 2007-11-09 12:20:16Z fireball $
  */
 
 #define _x(_X_) (!(_X_))
diff --git a/reactos/lib/sdk/crt/string/strxspn.h b/reactos/lib/sdk/crt/string/strxspn.h
index e253927318b..98e3a9c65b3 100644
--- a/reactos/lib/sdk/crt/string/strxspn.h
+++ b/reactos/lib/sdk/crt/string/strxspn.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: strxspn.h 30291 2007-11-09 12:20:16Z fireball $
  */
 
 #include <limits.h>
diff --git a/reactos/lib/sdk/crt/string/tcscat.h b/reactos/lib/sdk/crt/string/tcscat.h
index 72a17f7b8e6..d9d0ba3fa17 100644
--- a/reactos/lib/sdk/crt/string/tcscat.h
+++ b/reactos/lib/sdk/crt/string/tcscat.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcscat.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcschr.h b/reactos/lib/sdk/crt/string/tcschr.h
index 8c5e1ff6448..b9db9045ff3 100644
--- a/reactos/lib/sdk/crt/string/tcschr.h
+++ b/reactos/lib/sdk/crt/string/tcschr.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcschr.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcscmp.h b/reactos/lib/sdk/crt/string/tcscmp.h
index f94af94d2b0..73c44fa52a9 100644
--- a/reactos/lib/sdk/crt/string/tcscmp.h
+++ b/reactos/lib/sdk/crt/string/tcscmp.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcscmp.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcscpy.h b/reactos/lib/sdk/crt/string/tcscpy.h
index ae2855710a0..38443b004c1 100644
--- a/reactos/lib/sdk/crt/string/tcscpy.h
+++ b/reactos/lib/sdk/crt/string/tcscpy.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcscpy.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcslen.h b/reactos/lib/sdk/crt/string/tcslen.h
index 918fc0626d7..fe64c252ada 100644
--- a/reactos/lib/sdk/crt/string/tcslen.h
+++ b/reactos/lib/sdk/crt/string/tcslen.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcslen.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <stddef.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncat.h b/reactos/lib/sdk/crt/string/tcsncat.h
index 146de33e8f8..597d00cada5 100644
--- a/reactos/lib/sdk/crt/string/tcsncat.h
+++ b/reactos/lib/sdk/crt/string/tcsncat.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcsncat.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <stddef.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncmp.h b/reactos/lib/sdk/crt/string/tcsncmp.h
index 420dc22ec1d..b57f2352918 100644
--- a/reactos/lib/sdk/crt/string/tcsncmp.h
+++ b/reactos/lib/sdk/crt/string/tcsncmp.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcsncmp.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <stddef.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncpy.h b/reactos/lib/sdk/crt/string/tcsncpy.h
index c8f9ab47dd0..d0a88898c2a 100644
--- a/reactos/lib/sdk/crt/string/tcsncpy.h
+++ b/reactos/lib/sdk/crt/string/tcsncpy.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcsncpy.h 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #include <stddef.h>
diff --git a/reactos/lib/sdk/crt/string/tcsnlen.h b/reactos/lib/sdk/crt/string/tcsnlen.h
index 17d8476266e..1b0fb98c6ff 100644
--- a/reactos/lib/sdk/crt/string/tcsnlen.h
+++ b/reactos/lib/sdk/crt/string/tcsnlen.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcsnlen.h 38052 2008-12-13 21:28:05Z tkreuzer $
  */
 
 #include <stddef.h>
diff --git a/reactos/lib/sdk/crt/string/tcsrchr.h b/reactos/lib/sdk/crt/string/tcsrchr.h
index 354003273db..eacf4b0e5d3 100644
--- a/reactos/lib/sdk/crt/string/tcsrchr.h
+++ b/reactos/lib/sdk/crt/string/tcsrchr.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tcsrchr.h 41916 2009-07-12 10:40:39Z ros-arm-bringup $
  */
 
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcscat.c b/reactos/lib/sdk/crt/string/wcscat.c
index adf0e1c7919..1705625b39b 100644
--- a/reactos/lib/sdk/crt/string/wcscat.c
+++ b/reactos/lib/sdk/crt/string/wcscat.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscat.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcschr.c b/reactos/lib/sdk/crt/string/wcschr.c
index 20c852aaad9..2ea1977afd4 100644
--- a/reactos/lib/sdk/crt/string/wcschr.c
+++ b/reactos/lib/sdk/crt/string/wcschr.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcschr.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcscmp.c b/reactos/lib/sdk/crt/string/wcscmp.c
index dc2ca0d9d34..a8edb3ba1ea 100644
--- a/reactos/lib/sdk/crt/string/wcscmp.c
+++ b/reactos/lib/sdk/crt/string/wcscmp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscmp.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcscpy.c b/reactos/lib/sdk/crt/string/wcscpy.c
index 283d6ab6eb8..c1d359f7295 100644
--- a/reactos/lib/sdk/crt/string/wcscpy.c
+++ b/reactos/lib/sdk/crt/string/wcscpy.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcscpy.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcslen.c b/reactos/lib/sdk/crt/string/wcslen.c
index 768c52afd7b..de5487e7ec3 100644
--- a/reactos/lib/sdk/crt/string/wcslen.c
+++ b/reactos/lib/sdk/crt/string/wcslen.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcslen.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcsncat.c b/reactos/lib/sdk/crt/string/wcsncat.c
index c2ec3af009a..3a0d24282dd 100644
--- a/reactos/lib/sdk/crt/string/wcsncat.c
+++ b/reactos/lib/sdk/crt/string/wcsncat.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncat.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcsncmp.c b/reactos/lib/sdk/crt/string/wcsncmp.c
index 13059cc957f..0ec0af173ff 100644
--- a/reactos/lib/sdk/crt/string/wcsncmp.c
+++ b/reactos/lib/sdk/crt/string/wcsncmp.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncmp.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcsncpy.c b/reactos/lib/sdk/crt/string/wcsncpy.c
index 90a93ab24dd..1eb892e2731 100644
--- a/reactos/lib/sdk/crt/string/wcsncpy.c
+++ b/reactos/lib/sdk/crt/string/wcsncpy.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsncpy.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcsnlen.c b/reactos/lib/sdk/crt/string/wcsnlen.c
index 445a4aab299..0eca5cb003e 100644
--- a/reactos/lib/sdk/crt/string/wcsnlen.c
+++ b/reactos/lib/sdk/crt/string/wcsnlen.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsnlen.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/wcsrchr.c b/reactos/lib/sdk/crt/string/wcsrchr.c
index 0bd83205150..6e44965b310 100644
--- a/reactos/lib/sdk/crt/string/wcsrchr.c
+++ b/reactos/lib/sdk/crt/string/wcsrchr.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wcsrchr.c 30283 2007-11-08 21:06:20Z fireball $
  */
 
 #define _UNICODE
diff --git a/reactos/lib/sdk/crt/string/witow.c b/reactos/lib/sdk/crt/string/witow.c
index d2cb3ecb947..335b1dd6c55 100644
--- a/reactos/lib/sdk/crt/string/witow.c
+++ b/reactos/lib/sdk/crt/string/witow.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: witow.c 54651 2011-12-14 22:09:24Z spetreolle $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
diff --git a/reactos/lib/smlib/compses.c b/reactos/lib/smlib/compses.c
index f3a90ec4d37..176d2296fb8 100644
--- a/reactos/lib/smlib/compses.c
+++ b/reactos/lib/smlib/compses.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: compses.c 37763 2008-11-30 11:42:05Z sginsberg $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/lib/smlib/connect.c b/reactos/lib/smlib/connect.c
index 5e58f13f8c0..c0d68a1986d 100644
--- a/reactos/lib/smlib/connect.c
+++ b/reactos/lib/smlib/connect.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: connect.c 37763 2008-11-30 11:42:05Z sginsberg $
  *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS system libraries
diff --git a/reactos/lib/smlib/execpgm.c b/reactos/lib/smlib/execpgm.c
index 169f5e7ef49..6ab07e6c401 100644
--- a/reactos/lib/smlib/execpgm.c
+++ b/reactos/lib/smlib/execpgm.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: execpgm.c 37763 2008-11-30 11:42:05Z sginsberg $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/lib/smlib/lookupss.c b/reactos/lib/smlib/lookupss.c
index e1e892f93ab..50a8c62a6bb 100644
--- a/reactos/lib/smlib/lookupss.c
+++ b/reactos/lib/smlib/lookupss.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lookupss.c 58237 2013-01-27 00:07:58Z hbelusca $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c
index 5e135b35b3c..11b14ba291e 100644
--- a/reactos/subsystems/ntvdm/ntvdm.c
+++ b/reactos/subsystems/ntvdm/ntvdm.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ntvdm.c 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
diff --git a/reactos/subsystems/ntvdm/ntvdm.rc b/reactos/subsystems/ntvdm/ntvdm.rc
index 5888a623107..52030f99b8e 100644
--- a/reactos/subsystems/ntvdm/ntvdm.rc
+++ b/reactos/subsystems/ntvdm/ntvdm.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ntvdm.rc 27460 2007-07-08 10:19:12Z cfinck $ */
 
 #include <windows.h>
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Virtual DOS Machine\0"
diff --git a/reactos/subsystems/win/basesrv/basesrv.def b/reactos/subsystems/win/basesrv/basesrv.def
index ae74aeaf3b6..1a140b2f71c 100644
--- a/reactos/subsystems/win/basesrv/basesrv.def
+++ b/reactos/subsystems/win/basesrv/basesrv.def
@@ -1,4 +1,4 @@
-; $Id$
+; $Id: basesrv.def 21947 2006-05-20 10:49:56Z fireball $
 LIBRARY basesrv.dll
 EXPORTS
 BaseSetProcessCreateNotify@4
diff --git a/reactos/subsystems/win/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c
index 93dcffa8fa9..06d11661849 100644
--- a/reactos/subsystems/win/basesrv/init.c
+++ b/reactos/subsystems/win/basesrv/init.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: init.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * init.c - ReactOS/Win32 base enviroment subsystem server
  *
diff --git a/reactos/subsystems/win/basesrv/main.c b/reactos/subsystems/win/basesrv/main.c
index 3a72567c7fa..48fb97b3053 100644
--- a/reactos/subsystems/win/basesrv/main.c
+++ b/reactos/subsystems/win/basesrv/main.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: main.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * dllmain.c - ReactOS/Win32 base enviroment subsystem server
  *
diff --git a/reactos/subsystems/win/basesrv/server.c b/reactos/subsystems/win/basesrv/server.c
index f5d0e924e58..34ac5978d55 100644
--- a/reactos/subsystems/win/basesrv/server.c
+++ b/reactos/subsystems/win/basesrv/server.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * server.c - ReactOS/Win32 base enviroment subsystem server
  *
diff --git a/reactos/tools/cdmake/cdmake.c b/reactos/tools/cdmake/cdmake.c
index 64d79fa608d..558d67f653b 100644
--- a/reactos/tools/cdmake/cdmake.c
+++ b/reactos/tools/cdmake/cdmake.c
@@ -22,7 +22,7 @@
  * convert long filename to iso9660 file name by Magnus Olsen
  * magnus@greatlord.com
  *
- * $Id$
+ * $Id: cdmake.c 58431 2013-03-05 08:07:21Z tkreuzer $
  */
 
 /* According to his website, this file was released into the public domain by Phillip J. Erdelsky */
diff --git a/reactos/tools/cdmake/llmosrt.c b/reactos/tools/cdmake/llmosrt.c
index ef2e1794b79..7085d9a5731 100644
--- a/reactos/tools/cdmake/llmosrt.c
+++ b/reactos/tools/cdmake/llmosrt.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: llmosrt.c 21352 2006-03-19 18:18:15Z peterw $ */
 /* A Linked-List Memory Sort
    by Philip J. Erdelsky
    pje@acm.org
diff --git a/reactos/tools/ms2ps/ms2ps.cpp b/reactos/tools/ms2ps/ms2ps.cpp
index cb61cb97666..e683805beac 100644
--- a/reactos/tools/ms2ps/ms2ps.cpp
+++ b/reactos/tools/ms2ps/ms2ps.cpp
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id$
+/* $Id: ms2ps.cpp 43790 2009-10-27 10:34:16Z dgorbachev $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS seh conversion tool
  * FILE:            tools/ms2ps/ms2ps.cpp
diff --git a/reactos/tools/rgenstat/llmosrt.c b/reactos/tools/rgenstat/llmosrt.c
index ef2e1794b79..fb1a9380cda 100644
--- a/reactos/tools/rgenstat/llmosrt.c
+++ b/reactos/tools/rgenstat/llmosrt.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: llmosrt.c 51374 2011-04-17 09:50:07Z mkupfer $ */
 /* A Linked-List Memory Sort
    by Philip J. Erdelsky
    pje@acm.org
diff --git a/reactos/win32ss/gdi/gdi32/main/dllmain.c b/reactos/win32ss/gdi/gdi32/main/dllmain.c
index 22c80c3e2ca..75aa812a886 100644
--- a/reactos/win32ss/gdi/gdi32/main/dllmain.c
+++ b/reactos/win32ss/gdi/gdi32/main/dllmain.c
@@ -2,8 +2,8 @@
  * dllmain.c
  *
  * $Revision: 1.11 $
- * $Author$
- * $Date$
+ * $Author: akhaldi $
+ * $Date: 2013-01-25 00:00:42 +0100 (ven. 25 janv. 2013) $
  *
  */
 
diff --git a/reactos/win32ss/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
index 4f5dc8daf53..0541b6eed73 100644
--- a/reactos/win32ss/user/ntuser/csr.h
+++ b/reactos/win32ss/user/ntuser/csr.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: csr.h 56311 2012-04-01 20:42:43Z akhaldi $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
diff --git a/reactos/win32ss/user/ntuser/vis.h b/reactos/win32ss/user/ntuser/vis.h
index 768b29dd6c0..71cb1aa1c48 100644
--- a/reactos/win32ss/user/ntuser/vis.h
+++ b/reactos/win32ss/user/ntuser/vis.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: vis.h 56311 2012-04-01 20:42:43Z akhaldi $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
diff --git a/reactos/win32ss/user/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
index 0527532c449..97832b26d07 100644
--- a/reactos/win32ss/user/user32/include/regcontrol.h
+++ b/reactos/win32ss/user/user32/include/regcontrol.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: regcontrol.h 50357 2011-01-11 18:47:16Z gadamopoulos $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS User32
diff --git a/reactos/win32ss/user/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c
index 27ba3ed7561..8eecc10ce48 100644
--- a/reactos/win32ss/user/user32/misc/desktop.c
+++ b/reactos/win32ss/user/user32/misc/desktop.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: desktop.c 57236 2012-09-04 05:37:13Z jimtabor $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
diff --git a/reactos/win32ss/user/user32/misc/object.c b/reactos/win32ss/user/user32/misc/object.c
index a40eef27c83..d86a0750e38 100644
--- a/reactos/win32ss/user/user32/misc/object.c
+++ b/reactos/win32ss/user/user32/misc/object.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: object.c 57652 2012-10-30 16:50:11Z gadamopoulos $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
diff --git a/reactos/win32ss/user/user32/misc/timer.c b/reactos/win32ss/user/user32/misc/timer.c
index 42c64d56dad..7ea609b6e02 100644
--- a/reactos/win32ss/user/user32/misc/timer.c
+++ b/reactos/win32ss/user/user32/misc/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: timer.c 53436 2011-08-25 08:51:26Z gadamopoulos $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
diff --git a/reactos/win32ss/user/user32/misc/winsta.c b/reactos/win32ss/user/user32/misc/winsta.c
index b38732ddf07..e4f6c82a5b9 100644
--- a/reactos/win32ss/user/user32/misc/winsta.c
+++ b/reactos/win32ss/user/user32/misc/winsta.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: winsta.c 51082 2011-03-17 13:19:18Z gadamopoulos $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
diff --git a/reactos/win32ss/user/user32/windows/accel.c b/reactos/win32ss/user/user32/windows/accel.c
index dde48b497fb..435abb084bc 100644
--- a/reactos/win32ss/user/user32/windows/accel.c
+++ b/reactos/win32ss/user/user32/windows/accel.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: accel.c 53436 2011-08-25 08:51:26Z gadamopoulos $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
diff --git a/reactos/win32ss/user/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
index 2befd871142..06b55e56872 100644
--- a/reactos/win32ss/user/user32/windows/caret.c
+++ b/reactos/win32ss/user/user32/windows/caret.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: caret.c 54199 2011-10-19 16:17:32Z rharabien $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/caret.c
diff --git a/reactos/win32ss/user/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
index 01d4bafbd1a..14604152038 100644
--- a/reactos/win32ss/user/user32/windows/clipboard.c
+++ b/reactos/win32ss/user/user32/windows/clipboard.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: clipboard.c 53657 2011-09-09 15:24:14Z rharabien $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/clipboard.c
diff --git a/reactos/win32ss/user/user32/windows/dc.c b/reactos/win32ss/user/user32/windows/dc.c
index 8815c9b9566..37d12284880 100644
--- a/reactos/win32ss/user/user32/windows/dc.c
+++ b/reactos/win32ss/user/user32/windows/dc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: dc.c 53436 2011-08-25 08:51:26Z gadamopoulos $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
diff --git a/reactos/win32ss/user/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c
index 468718c2b1e..0e7a1b58527 100644
--- a/reactos/win32ss/user/user32/windows/font.c
+++ b/reactos/win32ss/user/user32/windows/font.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: font.c 48387 2010-07-31 22:36:22Z fireball $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
diff --git a/reactos/win32ss/user/user32/windows/rect.c b/reactos/win32ss/user/user32/windows/rect.c
index f52ef8ad06a..f6547645c78 100644
--- a/reactos/win32ss/user/user32/windows/rect.c
+++ b/reactos/win32ss/user/user32/windows/rect.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: rect.c 37763 2008-11-30 11:42:05Z sginsberg $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
diff --git a/reactos/win32ss/user/user32/windows/text.c b/reactos/win32ss/user/user32/windows/text.c
index b8c32f9ad87..dfb645b3839 100644
--- a/reactos/win32ss/user/user32/windows/text.c
+++ b/reactos/win32ss/user/user32/windows/text.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: text.c 37776 2008-11-30 19:28:11Z hyperion $
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
diff --git a/reactos/win32ss/user/win32csr/conio.h b/reactos/win32ss/user/win32csr/conio.h
index d6f89b1bb79..7a35d7647d1 100644
--- a/reactos/win32ss/user/win32csr/conio.h
+++ b/reactos/win32ss/user/win32csr/conio.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: conio.h 55617 2012-02-15 20:29:08Z ion $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/desktopbg.h b/reactos/win32ss/user/win32csr/desktopbg.h
index 737c2d12586..006ac2102b1 100644
--- a/reactos/win32ss/user/win32csr/desktopbg.h
+++ b/reactos/win32ss/user/win32csr/desktopbg.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: desktopbg.h 47315 2010-05-23 00:51:29Z jmorlan $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/exitros.c b/reactos/win32ss/user/win32csr/exitros.c
index c0008ac40bc..0e24d56a171 100644
--- a/reactos/win32ss/user/win32csr/exitros.c
+++ b/reactos/win32ss/user/win32csr/exitros.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: exitros.c 58411 2013-03-02 22:22:56Z gadamopoulos $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSRSS subsystem
diff --git a/reactos/win32ss/user/win32csr/guiconsole.c b/reactos/win32ss/user/win32csr/guiconsole.c
index 6a2c4c29114..af978bb4f99 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.c
+++ b/reactos/win32ss/user/win32csr/guiconsole.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: guiconsole.c 57326 2012-09-18 21:45:00Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/guiconsole.h b/reactos/win32ss/user/win32csr/guiconsole.h
index b9560d19ba2..94220f1f01d 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.h
+++ b/reactos/win32ss/user/win32csr/guiconsole.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: guiconsole.h 57326 2012-09-18 21:45:00Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/handle.c b/reactos/win32ss/user/win32csr/handle.c
index 1b3201d5c19..f8b004ecc7e 100644
--- a/reactos/win32ss/user/win32csr/handle.c
+++ b/reactos/win32ss/user/win32csr/handle.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: handle.c 56955 2012-07-23 20:25:11Z tfaber $
  *
  * reactos/subsys/csrss/api/handle.c
  *
diff --git a/reactos/win32ss/user/win32csr/resource.h b/reactos/win32ss/user/win32csr/resource.h
index 10688212562..4f505bc68ee 100644
--- a/reactos/win32ss/user/win32csr/resource.h
+++ b/reactos/win32ss/user/win32csr/resource.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 subsystem
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.c b/reactos/win32ss/user/win32csr/tuiconsole.c
index e767d48c202..5f773a47204 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.c
+++ b/reactos/win32ss/user/win32csr/tuiconsole.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tuiconsole.c 47693 2010-06-08 06:38:14Z jmorlan $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.h b/reactos/win32ss/user/win32csr/tuiconsole.h
index 9dac3e78367..9a2cedf0ca9 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.h
+++ b/reactos/win32ss/user/win32csr/tuiconsole.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tuiconsole.h 21947 2006-05-20 10:49:56Z fireball $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/win32csr/win32csr.h b/reactos/win32ss/user/win32csr/win32csr.h
index 053642496d8..6ee85dc2b27 100644
--- a/reactos/win32ss/user/win32csr/win32csr.h
+++ b/reactos/win32ss/user/win32csr/win32csr.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: win32csr.h 58214 2013-01-24 23:00:42Z akhaldi $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
diff --git a/reactos/win32ss/user/winsrv/dllmain.c b/reactos/win32ss/user/winsrv/dllmain.c
index 88fdb9b4efd..5f790bdff77 100644
--- a/reactos/win32ss/user/winsrv/dllmain.c
+++ b/reactos/win32ss/user/winsrv/dllmain.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dllmain.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * dllmain.c - ReactOS/Win32 Console+User Enviroment Subsystem Server
  *
diff --git a/reactos/win32ss/user/winsrv/init.c b/reactos/win32ss/user/winsrv/init.c
index 05402478357..6a284f446bd 100644
--- a/reactos/win32ss/user/winsrv/init.c
+++ b/reactos/win32ss/user/winsrv/init.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: init.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  * 
diff --git a/reactos/win32ss/user/winsrv/server.c b/reactos/win32ss/user/winsrv/server.c
index 8e0063e4170..22b768e17e5 100644
--- a/reactos/win32ss/user/winsrv/server.c
+++ b/reactos/win32ss/user/winsrv/server.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
  *
  * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  *
diff --git a/reactos/win32ss/user/winsrv/winsrv.def b/reactos/win32ss/user/winsrv/winsrv.def
index 90684149e7d..4c002090d73 100644
--- a/reactos/win32ss/user/winsrv/winsrv.def
+++ b/reactos/win32ss/user/winsrv/winsrv.def
@@ -1,4 +1,4 @@
-; $Id$
+; $Id: winsrv.def 21947 2006-05-20 10:49:56Z fireball $
 LIBRARY winsrv.dll
 EXPORTS
 ConServerDllInitialization@8
diff --git a/reactos/win32ss/win32k.rc b/reactos/win32ss/win32k.rc
index 351f18ada2e..090dca89fcb 100644
--- a/reactos/win32ss/win32k.rc
+++ b/reactos/win32ss/win32k.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: win32k.rc 56311 2012-04-01 20:42:43Z akhaldi $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 GDI KM subsystem\0"

From 57ddcaf0fac53e0cf2ccb8104188595970262721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 00:00:01 +0000
Subject: [PATCH 24/61] Remove ALL the unneeded "author date id revision" svn
 properties.

svn path=/trunk/; revision=58490
---
 rosapps/applications/cmdutils/mode/mode.rc                      | 2 +-
 rosapps/applications/cmdutils/sort/sort.rc                      | 2 +-
 rosapps/applications/cmdutils/tee/tee.rc                        | 2 +-
 rosapps/applications/cmdutils/touch/touch.rc                    | 2 +-
 rosapps/applications/cmdutils/y/y.rc                            | 2 +-
 rosapps/applications/devutils/gdb2/gdb2.cpp                     | 2 +-
 rosapps/applications/devutils/genguid/genguid.rc                | 2 +-
 rosapps/applications/net/dhcpd/dhcpd.rc                         | 2 +-
 rosapps/applications/net/dhcpd/mkinstalldirs                    | 2 +-
 rosapps/applications/net/ncftp/ncftp.rc                         | 2 +-
 rosapps/applications/net/ncftp/ncftp/getline.c                  | 2 +-
 rosapps/applications/net/niclist/niclist.c                      | 2 +-
 rosapps/applications/net/niclist/niclist.rc                     | 2 +-
 rosapps/applications/net/roshttpd/common/roshttpd.rc            | 2 +-
 rosapps/applications/net/tditest/tditest.rc                     | 2 +-
 rosapps/applications/notevil/notevil.c                          | 2 +-
 rosapps/applications/notevil/notevil.rc                         | 2 +-
 rosapps/applications/notevil/readme.txt                         | 2 +-
 rosapps/applications/sysutils/chkdsk/chkdsk.c                   | 2 +-
 rosapps/applications/sysutils/chkdsk/chkdsk.rc                  | 2 +-
 rosapps/applications/sysutils/chklib/chklib.c                   | 2 +-
 rosapps/applications/sysutils/chklib/chklib.rc                  | 2 +-
 rosapps/applications/sysutils/config.h                          | 2 +-
 rosapps/applications/sysutils/ctm/ctm.rc                        | 2 +-
 rosapps/applications/sysutils/lsdd/lsdd.c                       | 2 +-
 rosapps/applications/sysutils/lsdd/lsdd.rc                      | 2 +-
 rosapps/applications/sysutils/pedump/pedump.c                   | 2 +-
 rosapps/applications/sysutils/pedump/pedump.rc                  | 2 +-
 rosapps/applications/sysutils/regexpl/ArgumentParser.cpp        | 2 +-
 rosapps/applications/sysutils/regexpl/ArgumentParser.h          | 2 +-
 rosapps/applications/sysutils/regexpl/Completion.cpp            | 2 +-
 rosapps/applications/sysutils/regexpl/Completion.h              | 2 +-
 rosapps/applications/sysutils/regexpl/Console.cpp               | 2 +-
 rosapps/applications/sysutils/regexpl/Console.h                 | 2 +-
 rosapps/applications/sysutils/regexpl/Pattern.cpp               | 2 +-
 rosapps/applications/sysutils/regexpl/Pattern.h                 | 2 +-
 rosapps/applications/sysutils/regexpl/Prompt.cpp                | 2 +-
 rosapps/applications/sysutils/regexpl/README                    | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryExplorer.h        | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryKey.cpp           | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryKey.h             | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryTree.cpp          | 2 +-
 rosapps/applications/sysutils/regexpl/RegistryTree.h            | 2 +-
 rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp    | 2 +-
 rosapps/applications/sysutils/regexpl/SecurityDescriptor.h      | 2 +-
 rosapps/applications/sysutils/regexpl/Settings.cpp              | 2 +-
 rosapps/applications/sysutils/regexpl/Settings.h                | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommand.cpp          | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommand.h            | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h   | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp   | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandConnect.h     | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDACL.h        | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h        | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h   | 2 +-
 .../applications/sysutils/regexpl/ShellCommandDeleteValue.cpp   | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp       | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandDir.h         | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandExit.h        | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandHelp.h        | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp    | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp     | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandOwner.h       | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp      | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandSACL.h        | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp  | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h    | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp     | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandValue.h       | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp   | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandVersion.h     | 2 +-
 .../applications/sysutils/regexpl/ShellCommandsLinkedList.cpp   | 2 +-
 rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h | 2 +-
 rosapps/applications/sysutils/regexpl/TextHistory.cpp           | 2 +-
 rosapps/applications/sysutils/regexpl/TextHistory.h             | 2 +-
 rosapps/applications/sysutils/regexpl/ph.h                      | 2 +-
 rosapps/applications/sysutils/regexpl/regexpl.rc                | 2 +-
 rosapps/applications/sysutils/tlist/tlist.rc                    | 2 +-
 rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c     | 2 +-
 rosapps/applications/sysutils/utils/objdir/objdir.c             | 2 +-
 rosapps/applications/sysutils/utils/pice/module/pice.rc         | 2 +-
 rosapps/applications/sysutils/utils/ps/ps.c.toolhelp            | 2 +-
 rosapps/applications/sysutils/utils/sdkparse/test.h             | 2 +-
 rosapps/applications/sysutils/utils/tickcount/tickcount.c       | 2 +-
 rosapps/applications/sysutils/win32err.h                        | 2 +-
 rosapps/applications/sysutils/wmain.c                           | 2 +-
 rosapps/demos/maze/Makefile                                     | 2 +-
 rosapps/lib/win32err/win32err.c                                 | 2 +-
 rosapps/templates/mdi/mdi.rc                                    | 2 +-
 rosapps/templates/template/template.c                           | 2 +-
 99 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/rosapps/applications/cmdutils/mode/mode.rc b/rosapps/applications/cmdutils/mode/mode.rc
index 76b8c0598b9..29e28a5b939 100644
--- a/rosapps/applications/cmdutils/mode/mode.rc
+++ b/rosapps/applications/cmdutils/mode/mode.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mode.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS mode utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"mode\0"
diff --git a/rosapps/applications/cmdutils/sort/sort.rc b/rosapps/applications/cmdutils/sort/sort.rc
index bf386abc250..22e3c4d11f1 100644
--- a/rosapps/applications/cmdutils/sort/sort.rc
+++ b/rosapps/applications/cmdutils/sort/sort.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sort.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
 #define REACTOS_STR_INTERNAL_NAME	"sort\0"
diff --git a/rosapps/applications/cmdutils/tee/tee.rc b/rosapps/applications/cmdutils/tee/tee.rc
index b4eb63f407e..949f1335d82 100644
--- a/rosapps/applications/cmdutils/tee/tee.rc
+++ b/rosapps/applications/cmdutils/tee/tee.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tee.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 tee command\0"
 #define REACTOS_STR_INTERNAL_NAME	"tee\0"
diff --git a/rosapps/applications/cmdutils/touch/touch.rc b/rosapps/applications/cmdutils/touch/touch.rc
index 572a38aa007..a2368954127 100644
--- a/rosapps/applications/cmdutils/touch/touch.rc
+++ b/rosapps/applications/cmdutils/touch/touch.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: touch.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Touch utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"touch\0"
diff --git a/rosapps/applications/cmdutils/y/y.rc b/rosapps/applications/cmdutils/y/y.rc
index 157a2177aad..75f701a964c 100644
--- a/rosapps/applications/cmdutils/y/y.rc
+++ b/rosapps/applications/cmdutils/y/y.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: y.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 y command\0"
 #define REACTOS_STR_INTERNAL_NAME	"y\0"
diff --git a/rosapps/applications/devutils/gdb2/gdb2.cpp b/rosapps/applications/devutils/gdb2/gdb2.cpp
index a70ad4b828a..73738faf3de 100644
--- a/rosapps/applications/devutils/gdb2/gdb2.cpp
+++ b/rosapps/applications/devutils/gdb2/gdb2.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: gdb2.cpp 42968 2009-08-30 15:35:14Z sginsberg $
  *
  * gdb2 - gdb output splitter
  *
diff --git a/rosapps/applications/devutils/genguid/genguid.rc b/rosapps/applications/devutils/genguid/genguid.rc
index 22c85183ec4..d50dc5bbd6e 100644
--- a/rosapps/applications/devutils/genguid/genguid.rc
+++ b/rosapps/applications/devutils/genguid/genguid.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: genguid.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"GUID Generator\0"
 #define REACTOS_STR_INTERNAL_NAME	"genguid\0"
diff --git a/rosapps/applications/net/dhcpd/dhcpd.rc b/rosapps/applications/net/dhcpd/dhcpd.rc
index 69b439b3884..ee0106ca19c 100644
--- a/rosapps/applications/net/dhcpd/dhcpd.rc
+++ b/rosapps/applications/net/dhcpd/dhcpd.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: dhcpd.rc 21499 2006-04-07 10:16:12Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"DHCP server service\0"
 #define REACTOS_STR_INTERNAL_NAME	"dhcpd\0"
diff --git a/rosapps/applications/net/dhcpd/mkinstalldirs b/rosapps/applications/net/dhcpd/mkinstalldirs
index 6b3b5fc5d4d..3f0eb1de1d1 100644
--- a/rosapps/applications/net/dhcpd/mkinstalldirs
+++ b/rosapps/applications/net/dhcpd/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id$
+# $Id: mkinstalldirs 21499 2006-04-07 10:16:12Z tretiakov $
 
 errstatus=0
 
diff --git a/rosapps/applications/net/ncftp/ncftp.rc b/rosapps/applications/net/ncftp/ncftp.rc
index 08a94307838..ea762f5e23e 100644
--- a/rosapps/applications/net/ncftp/ncftp.rc
+++ b/rosapps/applications/net/ncftp/ncftp.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ncftp.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Ncftp for Win32\0"
 #define REACTOS_STR_INTERNAL_NAME	"ncftp\0"
diff --git a/rosapps/applications/net/ncftp/ncftp/getline.c b/rosapps/applications/net/ncftp/ncftp/getline.c
index c26299dd4fb..fc1fa8b8eae 100644
--- a/rosapps/applications/net/ncftp/ncftp/getline.c
+++ b/rosapps/applications/net/ncftp/ncftp/getline.c
@@ -1,4 +1,4 @@
-/* Based on: "$Id$"; */
+/* Based on: "$Id: getline.c 44107 2009-11-11 18:19:42Z fireball $"; */
 static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris Thewalt";
 
 /*
diff --git a/rosapps/applications/net/niclist/niclist.c b/rosapps/applications/net/niclist/niclist.c
index ca4880d24fc..6d731b2282a 100644
--- a/rosapps/applications/net/niclist/niclist.c
+++ b/rosapps/applications/net/niclist/niclist.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: niclist.c 17609 2005-09-02 21:13:10Z hpoussin $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS packet driver interface list utility
diff --git a/rosapps/applications/net/niclist/niclist.rc b/rosapps/applications/net/niclist/niclist.rc
index 18f971f57d1..c0d898c865f 100644
--- a/rosapps/applications/net/niclist/niclist.rc
+++ b/rosapps/applications/net/niclist/niclist.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: niclist.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS packet driver niclist\0"
 #define REACTOS_STR_INTERNAL_NAME	"niclist\0"
diff --git a/rosapps/applications/net/roshttpd/common/roshttpd.rc b/rosapps/applications/net/roshttpd/common/roshttpd.rc
index b11ae969203..29e0657fc8d 100644
--- a/rosapps/applications/net/roshttpd/common/roshttpd.rc
+++ b/rosapps/applications/net/roshttpd/common/roshttpd.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: roshttpd.rc 21491 2006-04-07 10:10:34Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Win32 Server\0"
 #define REACTOS_STR_INTERNAL_NAME	"roshttpd\0"
diff --git a/rosapps/applications/net/tditest/tditest.rc b/rosapps/applications/net/tditest/tditest.rc
index 1c529d8e9f3..051792effe3 100644
--- a/rosapps/applications/net/tditest/tditest.rc
+++ b/rosapps/applications/net/tditest/tditest.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tditest.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TDI test driver\0"
diff --git a/rosapps/applications/notevil/notevil.c b/rosapps/applications/notevil/notevil.c
index 6723c09d7d4..d1c58f571f9 100644
--- a/rosapps/applications/notevil/notevil.c
+++ b/rosapps/applications/notevil/notevil.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: notevil.c 17609 2005-09-02 21:13:10Z hpoussin $
  *
  * notevil.c
  *
diff --git a/rosapps/applications/notevil/notevil.rc b/rosapps/applications/notevil/notevil.rc
index de51dfc38d0..ffa3e2e5323 100644
--- a/rosapps/applications/notevil/notevil.rc
+++ b/rosapps/applications/notevil/notevil.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: notevil.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Coders Console Parade\0"
 #define REACTOS_STR_INTERNAL_NAME	"notevil\0"
diff --git a/rosapps/applications/notevil/readme.txt b/rosapps/applications/notevil/readme.txt
index b12d11b2247..6d5da996d89 100644
--- a/rosapps/applications/notevil/readme.txt
+++ b/rosapps/applications/notevil/readme.txt
@@ -1,4 +1,4 @@
-$Id$
+$Id: readme.txt 34303 2008-07-05 11:46:22Z fireball $
 
 ReactOS Coders Console Parade
 -----------------------------
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
index 4aff89f572a..06ae34038e4 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.c
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c
@@ -1,6 +1,6 @@
 //======================================================================
 //
-// $Id$
+// $Id: chkdsk.c 37749 2008-11-29 21:23:45Z sginsberg $
 //
 // Chkdskx
 //
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.rc b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
index dc1127106eb..431fb393c44 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.rc
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: chkdsk.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Disk Checking Utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"chkdsk\0"
diff --git a/rosapps/applications/sysutils/chklib/chklib.c b/rosapps/applications/sysutils/chklib/chklib.c
index d2501f2b65e..39dfdabe8f9 100644
--- a/rosapps/applications/sysutils/chklib/chklib.c
+++ b/rosapps/applications/sysutils/chklib/chklib.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: chklib.c 42932 2009-08-25 00:31:45Z gschneider $
  *
  * chklib.c
  *
diff --git a/rosapps/applications/sysutils/chklib/chklib.rc b/rosapps/applications/sysutils/chklib/chklib.rc
index 6655eed1570..a7c8b775a33 100644
--- a/rosapps/applications/sysutils/chklib/chklib.rc
+++ b/rosapps/applications/sysutils/chklib/chklib.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: chklib.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to check a dynamic library for a symbol\0"
 #define REACTOS_STR_INTERNAL_NAME	"chklib\0"
diff --git a/rosapps/applications/sysutils/config.h b/rosapps/applications/sysutils/config.h
index 21f87dc03e4..e596c2dd14c 100644
--- a/rosapps/applications/sysutils/config.h
+++ b/rosapps/applications/sysutils/config.h
@@ -1,6 +1,6 @@
 #ifndef _INC_CONFIG_H
 #define _INC_CONFIG_H
-/* $Id$ */
+/* $Id: config.h 15091 2005-05-07 21:24:31Z sedwards $ */
 #define FMIFS_IMPORT_DLL
 #define REACTOS_NO_SECURITY_SS
 #endif /* ndef _INC_CONFIG_H */
diff --git a/rosapps/applications/sysutils/ctm/ctm.rc b/rosapps/applications/sysutils/ctm/ctm.rc
index 58b17f8ba46..996a99208c3 100644
--- a/rosapps/applications/sysutils/ctm/ctm.rc
+++ b/rosapps/applications/sysutils/ctm/ctm.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ctm.rc 35880 2008-09-02 14:00:30Z dreimer $ */
 
 #include <windows.h>
 #include "resource.h"
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c
index ac3173fa1d4..2acf5664c0d 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.c
+++ b/rosapps/applications/sysutils/lsdd/lsdd.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lsdd.c 37749 2008-11-29 21:23:45Z sginsberg $
  *
  * FILE  : lsdd.c
  * AUTHOR: Emanuele ALIBERTI
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.rc b/rosapps/applications/sysutils/lsdd/lsdd.rc
index a5a810afe67..25f53548a29 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.rc
+++ b/rosapps/applications/sysutils/lsdd/lsdd.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: lsdd.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0"
 #define REACTOS_STR_INTERNAL_NAME	"lsdd\0"
diff --git a/rosapps/applications/sysutils/pedump/pedump.c b/rosapps/applications/sysutils/pedump/pedump.c
index 95f99c9ea66..1aa9a9606b1 100644
--- a/rosapps/applications/sysutils/pedump/pedump.c
+++ b/rosapps/applications/sysutils/pedump/pedump.c
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: pedump.c 54033 2011-10-06 20:45:06Z pschweitzer $
 //
 // This program was written by Sang Cho, assistant professor at
 //                                       the department of
diff --git a/rosapps/applications/sysutils/pedump/pedump.rc b/rosapps/applications/sysutils/pedump/pedump.rc
index f051b7559aa..8d07de6f61c 100644
--- a/rosapps/applications/sysutils/pedump/pedump.rc
+++ b/rosapps/applications/sysutils/pedump/pedump.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pedump.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to dump a PE image file.\0"
 #define REACTOS_STR_INTERNAL_NAME	"pedump\0"
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
index 0c96eadcbd5..a2e4aac3111 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ArgumentParser.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.h b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
index c6e1c7c99c6..3f28994b584 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.h
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ArgumentParser.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ArgumentParser.h: interface for the CArgumentParser class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/Completion.cpp b/rosapps/applications/sysutils/regexpl/Completion.cpp
index 3f325dc8cff..6bcabc81770 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.cpp
+++ b/rosapps/applications/sysutils/regexpl/Completion.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: Completion.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/Completion.h b/rosapps/applications/sysutils/regexpl/Completion.h
index 10c92e17ce7..583dc9931b4 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.h
+++ b/rosapps/applications/sysutils/regexpl/Completion.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: Completion.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // Completion.h - declaration for completion related functions
 
diff --git a/rosapps/applications/sysutils/regexpl/Console.cpp b/rosapps/applications/sysutils/regexpl/Console.cpp
index 708f665c577..f6d1a6cbe15 100644
--- a/rosapps/applications/sysutils/regexpl/Console.cpp
+++ b/rosapps/applications/sysutils/regexpl/Console.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: Console.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/Console.h b/rosapps/applications/sysutils/regexpl/Console.h
index 6bca160841b..09671071421 100644
--- a/rosapps/applications/sysutils/regexpl/Console.h
+++ b/rosapps/applications/sysutils/regexpl/Console.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: Console.h 42968 2009-08-30 15:35:14Z sginsberg $ */
 
 // Console.h: interface for the CConsole class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.cpp b/rosapps/applications/sysutils/regexpl/Pattern.cpp
index 036dfbe78d5..361b927e043 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.cpp
+++ b/rosapps/applications/sysutils/regexpl/Pattern.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: Pattern.cpp 29689 2007-10-19 23:05:02Z dreimer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.h b/rosapps/applications/sysutils/regexpl/Pattern.h
index 35dcabb7b14..6093593585a 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.h
+++ b/rosapps/applications/sysutils/regexpl/Pattern.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: Pattern.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // Pattern.h: decalration for pattern functions
 
diff --git a/rosapps/applications/sysutils/regexpl/Prompt.cpp b/rosapps/applications/sysutils/regexpl/Prompt.cpp
index 47c193c11f7..6404dc479fd 100644
--- a/rosapps/applications/sysutils/regexpl/Prompt.cpp
+++ b/rosapps/applications/sysutils/regexpl/Prompt.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: Prompt.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/README b/rosapps/applications/sysutils/regexpl/README
index da3828339af..93ebe0f76bd 100644
--- a/rosapps/applications/sysutils/regexpl/README
+++ b/rosapps/applications/sysutils/regexpl/README
@@ -1,5 +1,5 @@
 -*- Mode: Text -*-
-$Id$
+$Id: README 34303 2008-07-05 11:46:22Z fireball $
 
 Registry Explorer is console mode tool for reading/writing ReactOS
 registry. Currently, access is provided only by means of interactive
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
index 654825e3acf..b5fcf812f22 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: RegistryExplorer.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
index 3449b6ad59a..7969c40bec0 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: RegistryExplorer.h 12802 2005-01-04 21:36:26Z narnaoud $ */
 
 #ifndef _REGISTRY_EXPLORER_H__INCLUDED
 #define _REGISTRY_EXPLORER_H__INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
index 01d91bcfddf..7a86ad42ec6 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: RegistryKey.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.h b/rosapps/applications/sysutils/regexpl/RegistryKey.h
index 9491b011862..219479a44bd 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: RegistryKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // RegistryKey.h: interface for the CRegistryKey class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
index a54f79df394..2dff0b61f16 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: RegistryTree.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.h b/rosapps/applications/sysutils/regexpl/RegistryTree.h
index c92447cc210..2051ee9087f 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: RegistryTree.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // RegistryTree.h: interface for the CRegistryTree class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
index a6aca7b5b31..6319c81defd 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: SecurityDescriptor.cpp 12813 2005-01-05 02:21:05Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
index a213ed5ea76..dcc01d5fe8c 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: SecurityDescriptor.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // SecurityDescriptor.h: interface for the CSecurityDescriptor class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/Settings.cpp b/rosapps/applications/sysutils/regexpl/Settings.cpp
index 3949bde56c3..259cac084f2 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.cpp
+++ b/rosapps/applications/sysutils/regexpl/Settings.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: Settings.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/Settings.h b/rosapps/applications/sysutils/regexpl/Settings.h
index 4a4c88a8299..d1a077348a5 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.h
+++ b/rosapps/applications/sysutils/regexpl/Settings.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: Settings.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 #ifndef OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
 #define OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
index 26586a45fb1..fec114ac95d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommand.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.h b/rosapps/applications/sysutils/regexpl/ShellCommand.h
index 77ec7ba2f1d..7757518bed7 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommand.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommand.h: interface for the CShellCommand class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
index 198b6f592e1..a42333677b1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandChangeKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
index f325a2ce67e..fa589de8b99 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandChangeKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandChangeKey.h: interface for the CShellCommandChangeKey class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
index 32a92c33465..1af0d2e2ad7 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandConnect.cpp 29689 2007-10-19 23:05:02Z dreimer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
index d4e18fedc2a..60205a17f23 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandConnect.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandConnect.h: interface for the CShellCommandConnect class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
index 805ba9e89e3..4b011ff3ac3 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandDACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
index 1184285ae6a..82cb14256d2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandDACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandDACL.h: interface for the CShellCommandDACL class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
index 4977124444b..93269411362 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandDOKA.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
index a249f6c0084..1360eefcf5f 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandDOKA.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandDOKA.h: interface for the CShellCommandDOKA class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
index 04397e557bd..e2d91ff2b6d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandDeleteKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
index 275e8139a16..dc9a1818905 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandDeleteKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandDeleteKey.h: interface for the CShellCommandDeleteKey class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
index 8eeccc9d99f..5ab2d52d357 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandDeleteValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
index b1d8ad97362..caf75bc3114 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandDeleteValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandDeleteValue.h: interface for the CShellCommandDeleteValue class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
index ca1a8812061..194bf690557 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandDir.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
index 5bd8c98f9a2..76ae4b5fe70 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandDir.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandDir.h: interface for the CShellCommandDir class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
index 13c2b559d2e..6ea49306d47 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandExit.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
index 99852662b8f..619e89b3ec1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandExit.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandExit.h: interface for the CShellCommandExit class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
index 58b9894e87c..1f9ff9ade0f 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandHelp.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
index 31d95d792ca..ba138949cd8 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandHelp.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandHelp.h: interface for the CShellCommandHelp class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
index 0e50cb76299..11e1ebe73c2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandNewKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
index 7a330e0bf94..a7b26b706b9 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandNewKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandNewKey.h: interface for the CShellCommandNewKey class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
index c8a8bcb32d7..1850a60ff12 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandOwner.cpp 38906 2009-01-18 18:40:02Z sginsberg $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
index 1d304a23b4b..ce7204d23a3 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandOwner.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandOwner.h: interface for the CShellCommandOwner class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
index 0ff8c693187..fd0da7c02d9 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandSACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
index 7e99e39e7b9..637ea3660a5 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandSACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandSACL.h: interface for the CShellCommandSACL class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
index 191b422b0fb..3650440b53c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandSetValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
index 30ff1c11111..957c166bbd9 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandSetValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandSetValue.h: interface for the CShellCommandSetValue class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
index aa765133346..1fab0055a20 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
index dc24d94f046..c62ca5242eb 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandValue.h: interface for the CShellCommandValue class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
index 301d1290f64..dea1e8b94c0 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandVersion.cpp 12803 2005-01-04 21:40:25Z narnaoud $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
index d92b74ef6cc..68827f076ca 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandVersion.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandVersion.h: interface for the CShellCommandVersion class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
index 1623a872638..70d06ccba7d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ShellCommandsLinkedList.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
index a7b03a432ff..2937e4f6410 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ShellCommandsLinkedList.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // ShellCommandsLinkedList.h: interface for the CShellCommandsLinkedList class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.cpp b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
index 1f2c7249da9..a6162580229 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.cpp
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: TextHistory.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
  *
  * regexpl - Console Registry Explorer
  *
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.h b/rosapps/applications/sysutils/regexpl/TextHistory.h
index a58cd6bf885..9d3fe26a4ce 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.h
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: TextHistory.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 // TextHistory.h: interface for the CTextHistory class.
 //
diff --git a/rosapps/applications/sysutils/regexpl/ph.h b/rosapps/applications/sysutils/regexpl/ph.h
index 187b62ca589..a926ae71edb 100644
--- a/rosapps/applications/sysutils/regexpl/ph.h
+++ b/rosapps/applications/sysutils/regexpl/ph.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ph.h 54378 2011-11-14 22:14:52Z jimtabor $ */
 
 // ph.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
diff --git a/rosapps/applications/sysutils/regexpl/regexpl.rc b/rosapps/applications/sysutils/regexpl/regexpl.rc
index 19eaf8ee4be..5af5933a15a 100644
--- a/rosapps/applications/sysutils/regexpl/regexpl.rc
+++ b/rosapps/applications/sysutils/regexpl/regexpl.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: regexpl.rc 12803 2005-01-04 21:40:25Z narnaoud $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Console Registry Explorer\0"
 #define REACTOS_STR_INTERNAL_NAME	"regexpl\0"
diff --git a/rosapps/applications/sysutils/tlist/tlist.rc b/rosapps/applications/sysutils/tlist/tlist.rc
index 7a24a0f2d92..e7ab799091d 100644
--- a/rosapps/applications/sysutils/tlist/tlist.rc
+++ b/rosapps/applications/sysutils/tlist/tlist.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tlist.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 T(ask)List\0"
 #define REACTOS_STR_INTERNAL_NAME	"tlist\0"
diff --git a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
index 54ac4c258bc..ca9c6cd4634 100644
--- a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
+++ b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: nts2w32err.c 24501 2006-10-13 10:56:52Z janderwald $
  *
  * Convert NTSTATUS codes to Win32 error codes: run it
  * on a NT box AND on a ROS box, then diff the results.
diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.c b/rosapps/applications/sysutils/utils/objdir/objdir.c
index 851ce33cc1f..d78b1ae7703 100644
--- a/rosapps/applications/sysutils/utils/objdir/objdir.c
+++ b/rosapps/applications/sysutils/utils/objdir/objdir.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: objdir.c 37749 2008-11-29 21:23:45Z sginsberg $
  *
  * DESCRIPTION: Object Manager Simple Explorer
  * PROGRAMMER:  David Welch
diff --git a/rosapps/applications/sysutils/utils/pice/module/pice.rc b/rosapps/applications/sysutils/utils/pice/module/pice.rc
index b5fd480136e..7bdca960f4c 100644
--- a/rosapps/applications/sysutils/utils/pice/module/pice.rc
+++ b/rosapps/applications/sysutils/utils/pice/module/pice.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pice.rc 21687 2006-04-21 16:36:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PICE Debugger\0"
diff --git a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
index 544343a7301..cdc6b7476aa 100644
--- a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
+++ b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ps.c.toolhelp 21303 2006-03-12 00:41:06Z jimtabor $
  *
  *  ReactOS ps - process list console viewer
  *
diff --git a/rosapps/applications/sysutils/utils/sdkparse/test.h b/rosapps/applications/sysutils/utils/sdkparse/test.h
index 189570bd1ef..e71062c5d46 100644
--- a/rosapps/applications/sysutils/utils/sdkparse/test.h
+++ b/rosapps/applications/sysutils/utils/sdkparse/test.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: test.h 22385 2006-06-17 16:45:48Z gedmurphy $
 */
 /*
  * test.h
diff --git a/rosapps/applications/sysutils/utils/tickcount/tickcount.c b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
index 24177ff3107..7c56a141a48 100644
--- a/rosapps/applications/sysutils/utils/tickcount/tickcount.c
+++ b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: tickcount.c 22417 2006-06-19 13:55:51Z gedmurphy $
 */
 /*
  tickcount -- Display the kernel tick count (or any tick count passed as an
diff --git a/rosapps/applications/sysutils/win32err.h b/rosapps/applications/sysutils/win32err.h
index 3c4c54cd9aa..eb13191c99f 100644
--- a/rosapps/applications/sysutils/win32err.h
+++ b/rosapps/applications/sysutils/win32err.h
@@ -1,6 +1,6 @@
 #ifndef _INC_WIN32ERR_H
 #define _INC_WIN32ERR_H
-/* $Id$ */
+/* $Id: win32err.h 14516 2005-04-05 19:19:44Z sedwards $ */
 VOID
 PrintWin32Error(
 	PWCHAR	Message,
diff --git a/rosapps/applications/sysutils/wmain.c b/rosapps/applications/sysutils/wmain.c
index 02e68df1602..0fd1af97898 100644
--- a/rosapps/applications/sysutils/wmain.c
+++ b/rosapps/applications/sysutils/wmain.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: wmain.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  * Entry point for programs that use wmain()
  */
diff --git a/rosapps/demos/maze/Makefile b/rosapps/demos/maze/Makefile
index 8440ae0bc8d..3d33c473931 100644
--- a/rosapps/demos/maze/Makefile
+++ b/rosapps/demos/maze/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile 43236 2009-09-30 13:32:05Z sginsberg $
 
 PATH_TO_TOP = ../../../reactos
 
diff --git a/rosapps/lib/win32err/win32err.c b/rosapps/lib/win32err/win32err.c
index e0349db66db..ff3d8227f25 100644
--- a/rosapps/lib/win32err/win32err.c
+++ b/rosapps/lib/win32err/win32err.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: win32err.c 16861 2005-07-29 13:46:03Z ea $
  *
  * win32err.c
  *
diff --git a/rosapps/templates/mdi/mdi.rc b/rosapps/templates/mdi/mdi.rc
index 27c63e1887c..63c862c2763 100644
--- a/rosapps/templates/mdi/mdi.rc
+++ b/rosapps/templates/mdi/mdi.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mdi.rc 31932 2008-01-21 21:29:59Z dreimer $ */
 
 #include <windows.h>
 
diff --git a/rosapps/templates/template/template.c b/rosapps/templates/template/template.c
index f34c91b99ec..5789e109df6 100644
--- a/rosapps/templates/template/template.c
+++ b/rosapps/templates/template/template.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/* $Id: template.c 37749 2008-11-29 21:23:45Z sginsberg $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel

From 084bdac39442abd4cdaf96934a1a17ad58000af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 00:02:41 +0000
Subject: [PATCH 25/61] Remove ALL the unneeded "author date id revision" svn
 properties.

svn path=/trunk/; revision=58491
---
 rostests/drivers/csqtest/csqtest.rc  | 2 +-
 rostests/tests/alive/alive.c         | 2 +-
 rostests/tests/capclock/capclock.c   | 2 +-
 rostests/tests/capclock/capclock.rc  | 2 +-
 rostests/tests/count/count.c         | 2 +-
 rostests/tests/fiber/fiber.c         | 2 +-
 rostests/tests/lpctst/conport.c      | 2 +-
 rostests/tests/lpctst/creport.c      | 2 +-
 rostests/tests/lpctst/dumpinfo.c     | 2 +-
 rostests/tests/lpctst/lpcclt.c       | 2 +-
 rostests/tests/lpctst/lpcsrv.c       | 2 +-
 rostests/tests/noexecute/noexecute.c | 2 +-
 rostests/tests/regdump/regcmds.c     | 2 +-
 rostests/tests/regdump/regdump.c     | 2 +-
 rostests/tests/sectest/sectest.c     | 2 +-
 rostests/tests/shm/shmsrv.c          | 2 +-
 rostests/tests/thread/thread.c       | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/rostests/drivers/csqtest/csqtest.rc b/rostests/drivers/csqtest/csqtest.rc
index b0f70095537..212c6f893af 100644
--- a/rostests/drivers/csqtest/csqtest.rc
+++ b/rostests/drivers/csqtest/csqtest.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: csqtest.rc 21842 2006-05-07 19:16:11Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"CSQ Test\0"
diff --git a/rostests/tests/alive/alive.c b/rostests/tests/alive/alive.c
index 5c99760069d..4c7c9e1a278 100644
--- a/rostests/tests/alive/alive.c
+++ b/rostests/tests/alive/alive.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: alive.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  */
 #include <windows.h>
diff --git a/rostests/tests/capclock/capclock.c b/rostests/tests/capclock/capclock.c
index 5ea9d33cf45..47a738b4167 100644
--- a/rostests/tests/capclock/capclock.c
+++ b/rostests/tests/capclock/capclock.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: capclock.c 47551 2010-06-03 20:08:26Z tkreuzer $
  *
  * DESCRIPTION: Simple Win32 Caption Clock
  * PROJECT    : ReactOS (test applications)
diff --git a/rostests/tests/capclock/capclock.rc b/rostests/tests/capclock/capclock.rc
index e046542ec50..6706f1bd30b 100644
--- a/rostests/tests/capclock/capclock.rc
+++ b/rostests/tests/capclock/capclock.rc
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: capclock.rc 19235 2005-11-14 23:44:15Z sedwards $ */
 
 #include <windows.h>
 
diff --git a/rostests/tests/count/count.c b/rostests/tests/count/count.c
index f1295691e7f..81bcfba3991 100644
--- a/rostests/tests/count/count.c
+++ b/rostests/tests/count/count.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: count.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  */
 #include <stdio.h>
diff --git a/rostests/tests/fiber/fiber.c b/rostests/tests/fiber/fiber.c
index 9aee0ec543e..13ff4425e5e 100644
--- a/rostests/tests/fiber/fiber.c
+++ b/rostests/tests/fiber/fiber.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: fiber.c 15091 2005-05-07 21:24:31Z sedwards $
 */
 
 #include <assert.h>
diff --git a/rostests/tests/lpctst/conport.c b/rostests/tests/lpctst/conport.c
index cfe7523bafe..ea9109c6f48 100644
--- a/rostests/tests/lpctst/conport.c
+++ b/rostests/tests/lpctst/conport.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: conport.c 37750 2008-11-29 21:37:54Z sginsberg $
  *
  * reactos/apps/lpc/conport.c
  *
diff --git a/rostests/tests/lpctst/creport.c b/rostests/tests/lpctst/creport.c
index 352a29571f9..4a8f2bdf057 100644
--- a/rostests/tests/lpctst/creport.c
+++ b/rostests/tests/lpctst/creport.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: creport.c 37750 2008-11-29 21:37:54Z sginsberg $
  *
  * reactos/apps/lpc/creport.c
  *
diff --git a/rostests/tests/lpctst/dumpinfo.c b/rostests/tests/lpctst/dumpinfo.c
index 0e7f2af9870..81a848657c2 100644
--- a/rostests/tests/lpctst/dumpinfo.c
+++ b/rostests/tests/lpctst/dumpinfo.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: dumpinfo.c 37750 2008-11-29 21:37:54Z sginsberg $
  *
  * reactos/apps/lpc/dumpinfo.c
  *
diff --git a/rostests/tests/lpctst/lpcclt.c b/rostests/tests/lpctst/lpcclt.c
index ecf102d4ece..662771374eb 100644
--- a/rostests/tests/lpctst/lpcclt.c
+++ b/rostests/tests/lpctst/lpcclt.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lpcclt.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  * DESCRIPTION: Simple LPC Client
  * PROGRAMMER:  David Welch
diff --git a/rostests/tests/lpctst/lpcsrv.c b/rostests/tests/lpctst/lpcsrv.c
index 6af9a2057c8..99f94362e48 100644
--- a/rostests/tests/lpctst/lpcsrv.c
+++ b/rostests/tests/lpctst/lpcsrv.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: lpcsrv.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  * DESCRIPTION: Simple LPC Server
  * PROGRAMMER:  David Welch
diff --git a/rostests/tests/noexecute/noexecute.c b/rostests/tests/noexecute/noexecute.c
index 8cc997795e3..72da087f278 100644
--- a/rostests/tests/noexecute/noexecute.c
+++ b/rostests/tests/noexecute/noexecute.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: noexecute.c 19171 2005-11-12 08:40:47Z sedwards $
  */
 
 #include <stdio.h>
diff --git a/rostests/tests/regdump/regcmds.c b/rostests/tests/regdump/regcmds.c
index 13ea7a12646..b2d03625967 100644
--- a/rostests/tests/regdump/regcmds.c
+++ b/rostests/tests/regdump/regcmds.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: regcmds.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  *  ReactOS regedit
  *
diff --git a/rostests/tests/regdump/regdump.c b/rostests/tests/regdump/regdump.c
index d13395893c3..0c48706040c 100644
--- a/rostests/tests/regdump/regdump.c
+++ b/rostests/tests/regdump/regdump.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: regdump.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  *  ReactOS regedit
  *
diff --git a/rostests/tests/sectest/sectest.c b/rostests/tests/sectest/sectest.c
index afb9d3bea20..5bf30d33276 100644
--- a/rostests/tests/sectest/sectest.c
+++ b/rostests/tests/sectest/sectest.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sectest.c 19171 2005-11-12 08:40:47Z sedwards $ */
 #define UNICODE
 #define _UNICODE
 #include <windows.h>
diff --git a/rostests/tests/shm/shmsrv.c b/rostests/tests/shm/shmsrv.c
index 79527ea231d..1979a47b000 100644
--- a/rostests/tests/shm/shmsrv.c
+++ b/rostests/tests/shm/shmsrv.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: shmsrv.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  * FILE  : reactos/apps/shm/shmsrv.c
  * AUTHOR: David Welch
diff --git a/rostests/tests/thread/thread.c b/rostests/tests/thread/thread.c
index d9062645be7..888682b4ce5 100644
--- a/rostests/tests/thread/thread.c
+++ b/rostests/tests/thread/thread.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: thread.c 15091 2005-05-07 21:24:31Z sedwards $
  *
  *
  *

From 6462517d32dcd0011754f3e34fe65261c49c6b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 00:39:31 +0000
Subject: [PATCH 26/61] Remove the unneeded $Id$ blabla from the source code.

svn path=/trunk/; revision=58492
---
 .../apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def     | 1 -
 rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def  | 1 -
 rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def      | 1 -
 rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def  | 1 -
 rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def  | 1 -
 rostests/drivers/csqtest/csqtest.rc                        | 2 --
 rostests/drivers/memtest/memtest.rc                        | 2 --
 rostests/tests/alive/alive.c                               | 3 ---
 rostests/tests/capclock/capclock.c                         | 3 +--
 rostests/tests/capclock/capclock.rc                        | 2 --
 rostests/tests/count/count.c                               | 3 ---
 rostests/tests/fiber/fiber.c                               | 3 ---
 rostests/tests/lpctst/conport.c                            | 3 +--
 rostests/tests/lpctst/creport.c                            | 3 +--
 rostests/tests/lpctst/dumpinfo.c                           | 3 +--
 rostests/tests/lpctst/lpcclt.c                             | 3 +--
 rostests/tests/lpctst/lpcsrv.c                             | 3 +--
 rostests/tests/noexecute/noexecute.c                       | 4 ----
 rostests/tests/regdump/regcmds.c                           | 3 +--
 rostests/tests/regdump/regdump.c                           | 3 +--
 rostests/tests/sectest/sectest.c                           | 1 -
 rostests/tests/shm/shmsrv.c                                | 3 +--
 rostests/tests/thread/thread.c                             | 7 -------
 23 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def
index b590c508295..2d49073abc2 100644
--- a/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def
+++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def
@@ -1,4 +1,3 @@
-; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $
 ;
 ; ReactOS Operating System
 ;
diff --git a/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def b/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def
index ab461784fd4..ccd918bb2ba 100644
--- a/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def
+++ b/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def
@@ -1,4 +1,3 @@
-; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $
 ;
 ; ReactOS Operating System
 ;
diff --git a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def
index 490e9d3588b..c506d71ea98 100644
--- a/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def
+++ b/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def
@@ -1,4 +1,3 @@
-; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $
 ;
 ; ReactOS Operating System
 ;
diff --git a/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def b/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def
index ccf98a7ed26..8add31ef204 100644
--- a/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def
+++ b/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.def
@@ -1,4 +1,3 @@
-; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $
 ;
 ; ReactOS Operating System
 ;
diff --git a/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def b/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def
index 2dfd2ebce1f..420aa6f4903 100644
--- a/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def
+++ b/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def
@@ -1,4 +1,3 @@
-; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $
 ;
 ; ReactOS Operating System
 ;
diff --git a/rostests/drivers/csqtest/csqtest.rc b/rostests/drivers/csqtest/csqtest.rc
index 212c6f893af..f38f4efc449 100644
--- a/rostests/drivers/csqtest/csqtest.rc
+++ b/rostests/drivers/csqtest/csqtest.rc
@@ -1,5 +1,3 @@
-/* $Id: csqtest.rc 21842 2006-05-07 19:16:11Z ion $ */
-
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"CSQ Test\0"
 #define REACTOS_STR_INTERNAL_NAME	"csqtest\0"
diff --git a/rostests/drivers/memtest/memtest.rc b/rostests/drivers/memtest/memtest.rc
index ab1afb56063..80f7b5aa112 100644
--- a/rostests/drivers/memtest/memtest.rc
+++ b/rostests/drivers/memtest/memtest.rc
@@ -1,5 +1,3 @@
-/* $Id: csqtest.rc 21842 2006-05-07 19:16:11Z ion $ */
-
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Memory Manager Information and Testing\0"
 #define REACTOS_STR_INTERNAL_NAME	"memtest\0"
diff --git a/rostests/tests/alive/alive.c b/rostests/tests/alive/alive.c
index 4c7c9e1a278..324e21460a8 100644
--- a/rostests/tests/alive/alive.c
+++ b/rostests/tests/alive/alive.c
@@ -1,6 +1,3 @@
-/* $Id: alive.c 15091 2005-05-07 21:24:31Z sedwards $
- *
- */
 #include <windows.h>
 #include <stdlib.h>
 
diff --git a/rostests/tests/capclock/capclock.c b/rostests/tests/capclock/capclock.c
index 47a738b4167..c33853d0280 100644
--- a/rostests/tests/capclock/capclock.c
+++ b/rostests/tests/capclock/capclock.c
@@ -1,5 +1,4 @@
-/* $Id: capclock.c 47551 2010-06-03 20:08:26Z tkreuzer $
- *
+/*
  * DESCRIPTION: Simple Win32 Caption Clock
  * PROJECT    : ReactOS (test applications)
  * AUTHOR     : Emanuele Aliberti
diff --git a/rostests/tests/capclock/capclock.rc b/rostests/tests/capclock/capclock.rc
index 6706f1bd30b..4a57da258cc 100644
--- a/rostests/tests/capclock/capclock.rc
+++ b/rostests/tests/capclock/capclock.rc
@@ -1,5 +1,3 @@
-/* $Id: capclock.rc 19235 2005-11-14 23:44:15Z sedwards $ */
-
 #include <windows.h>
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 Caption Clock\0"
diff --git a/rostests/tests/count/count.c b/rostests/tests/count/count.c
index 81bcfba3991..49dc665f15d 100644
--- a/rostests/tests/count/count.c
+++ b/rostests/tests/count/count.c
@@ -1,6 +1,3 @@
-/* $Id: count.c 15091 2005-05-07 21:24:31Z sedwards $
- *
- */
 #include <stdio.h>
 
 int n = 0;
diff --git a/rostests/tests/fiber/fiber.c b/rostests/tests/fiber/fiber.c
index 13ff4425e5e..6f6c2b5bec7 100644
--- a/rostests/tests/fiber/fiber.c
+++ b/rostests/tests/fiber/fiber.c
@@ -1,6 +1,3 @@
-/* $Id: fiber.c 15091 2005-05-07 21:24:31Z sedwards $
-*/
-
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/rostests/tests/lpctst/conport.c b/rostests/tests/lpctst/conport.c
index ea9109c6f48..367752ec9b7 100644
--- a/rostests/tests/lpctst/conport.c
+++ b/rostests/tests/lpctst/conport.c
@@ -1,5 +1,4 @@
-/* $Id: conport.c 37750 2008-11-29 21:37:54Z sginsberg $
- *
+/*
  * reactos/apps/lpc/conport.c
  *
  * To be run in a real WNT 4.0 system with
diff --git a/rostests/tests/lpctst/creport.c b/rostests/tests/lpctst/creport.c
index 4a8f2bdf057..620f4eee5d8 100644
--- a/rostests/tests/lpctst/creport.c
+++ b/rostests/tests/lpctst/creport.c
@@ -1,5 +1,4 @@
-/* $Id: creport.c 37750 2008-11-29 21:37:54Z sginsberg $
- *
+/*
  * reactos/apps/lpc/creport.c
  *
  * To be run in a real WNT 4.0 system to
diff --git a/rostests/tests/lpctst/dumpinfo.c b/rostests/tests/lpctst/dumpinfo.c
index 81a848657c2..fdce5dbd55a 100644
--- a/rostests/tests/lpctst/dumpinfo.c
+++ b/rostests/tests/lpctst/dumpinfo.c
@@ -1,5 +1,4 @@
-/* $Id: dumpinfo.c 37750 2008-11-29 21:37:54Z sginsberg $
- *
+/*
  * reactos/apps/lpc/dumpinfo.c
  *
  * ReactOS Operating System
diff --git a/rostests/tests/lpctst/lpcclt.c b/rostests/tests/lpctst/lpcclt.c
index 662771374eb..1f3a67596f0 100644
--- a/rostests/tests/lpctst/lpcclt.c
+++ b/rostests/tests/lpctst/lpcclt.c
@@ -1,5 +1,4 @@
-/* $Id: lpcclt.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  * DESCRIPTION: Simple LPC Client
  * PROGRAMMER:  David Welch
  */
diff --git a/rostests/tests/lpctst/lpcsrv.c b/rostests/tests/lpctst/lpcsrv.c
index 99f94362e48..bd447763856 100644
--- a/rostests/tests/lpctst/lpcsrv.c
+++ b/rostests/tests/lpctst/lpcsrv.c
@@ -1,5 +1,4 @@
-/* $Id: lpcsrv.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  * DESCRIPTION: Simple LPC Server
  * PROGRAMMER:  David Welch
  */
diff --git a/rostests/tests/noexecute/noexecute.c b/rostests/tests/noexecute/noexecute.c
index 72da087f278..1fb7c8924eb 100644
--- a/rostests/tests/noexecute/noexecute.c
+++ b/rostests/tests/noexecute/noexecute.c
@@ -1,7 +1,3 @@
-/*
- * $Id: noexecute.c 19171 2005-11-12 08:40:47Z sedwards $
- */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/rostests/tests/regdump/regcmds.c b/rostests/tests/regdump/regcmds.c
index b2d03625967..7cd87431d35 100644
--- a/rostests/tests/regdump/regcmds.c
+++ b/rostests/tests/regdump/regcmds.c
@@ -1,5 +1,4 @@
-/* $Id: regcmds.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  *  ReactOS regedit
  *
  *  regcmds.c
diff --git a/rostests/tests/regdump/regdump.c b/rostests/tests/regdump/regdump.c
index 0c48706040c..d0d8598437b 100644
--- a/rostests/tests/regdump/regdump.c
+++ b/rostests/tests/regdump/regdump.c
@@ -1,5 +1,4 @@
-/* $Id: regdump.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  *  ReactOS regedit
  *
  *  regdump.c
diff --git a/rostests/tests/sectest/sectest.c b/rostests/tests/sectest/sectest.c
index 5bf30d33276..d98d831d12c 100644
--- a/rostests/tests/sectest/sectest.c
+++ b/rostests/tests/sectest/sectest.c
@@ -1,4 +1,3 @@
-/* $Id: sectest.c 19171 2005-11-12 08:40:47Z sedwards $ */
 #define UNICODE
 #define _UNICODE
 #include <windows.h>
diff --git a/rostests/tests/shm/shmsrv.c b/rostests/tests/shm/shmsrv.c
index 1979a47b000..46b70307a02 100644
--- a/rostests/tests/shm/shmsrv.c
+++ b/rostests/tests/shm/shmsrv.c
@@ -1,5 +1,4 @@
-/* $Id: shmsrv.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  * FILE  : reactos/apps/shm/shmsrv.c
  * AUTHOR: David Welch
  */
diff --git a/rostests/tests/thread/thread.c b/rostests/tests/thread/thread.c
index 888682b4ce5..d09b94a0c82 100644
--- a/rostests/tests/thread/thread.c
+++ b/rostests/tests/thread/thread.c
@@ -1,10 +1,3 @@
-/* $Id: thread.c 15091 2005-05-07 21:24:31Z sedwards $
- *
- *
- *
- *
- */
-
 #include <stdio.h>
 #include <windows.h>
 #include <stdlib.h>

From 66a44527fd6329ba39cbb3e9e4dba38523908346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 01:14:18 +0000
Subject: [PATCH 27/61] Remove the unneeded $Id$ blabla from the source code.

svn path=/trunk/; revision=58493
---
 rosapps/applications/cmdutils/mode/mode.rc                   | 1 -
 rosapps/applications/cmdutils/sort/sort.rc                   | 1 -
 rosapps/applications/cmdutils/tee/tee.rc                     | 1 -
 rosapps/applications/cmdutils/touch/touch.rc                 | 1 -
 rosapps/applications/cmdutils/y/y.rc                         | 1 -
 rosapps/applications/devutils/gdb2/gdb2.cpp                  | 3 +--
 rosapps/applications/devutils/genguid/genguid.rc             | 1 -
 rosapps/applications/net/dhcpd/dhcpd.rc                      | 1 -
 rosapps/applications/net/dhcpd/mkinstalldirs                 | 2 --
 rosapps/applications/net/ncftp/ncftp.rc                      | 1 -
 rosapps/applications/net/ncftp/ncftp/getline.c               | 5 ++---
 rosapps/applications/net/netreg/netreg.rc                    | 1 -
 rosapps/applications/net/niclist/niclist.c                   | 3 +--
 rosapps/applications/net/niclist/niclist.rc                  | 1 -
 rosapps/applications/net/roshttpd/common/roshttpd.rc         | 1 -
 rosapps/applications/net/tditest/tditest.rc                  | 1 -
 rosapps/applications/notevil/notevil.c                       | 3 +--
 rosapps/applications/notevil/notevil.rc                      | 1 -
 rosapps/applications/notevil/readme.txt                      | 1 -
 rosapps/applications/sysutils/chkdsk/chkdsk.c                | 2 --
 rosapps/applications/sysutils/chkdsk/chkdsk.rc               | 1 -
 rosapps/applications/sysutils/chklib/chklib.c                | 3 +--
 rosapps/applications/sysutils/chklib/chklib.rc               | 1 -
 rosapps/applications/sysutils/config.h                       | 2 +-
 rosapps/applications/sysutils/ctm/ctm.rc                     | 1 -
 rosapps/applications/sysutils/kill/kill.rc                   | 1 -
 rosapps/applications/sysutils/logevent/logevent.c            | 3 +--
 rosapps/applications/sysutils/lsdd/lsdd.c                    | 3 +--
 rosapps/applications/sysutils/lsdd/lsdd.rc                   | 1 -
 rosapps/applications/sysutils/mkdosfs/getopt.c               | 1 -
 rosapps/applications/sysutils/pedump/pedump.c                | 1 -
 rosapps/applications/sysutils/pedump/pedump.rc               | 1 -
 rosapps/applications/sysutils/regexpl/ArgumentParser.cpp     | 3 +--
 rosapps/applications/sysutils/regexpl/ArgumentParser.h       | 3 +--
 rosapps/applications/sysutils/regexpl/Completion.cpp         | 3 +--
 rosapps/applications/sysutils/regexpl/Completion.h           | 3 +--
 rosapps/applications/sysutils/regexpl/Console.cpp            | 3 +--
 rosapps/applications/sysutils/regexpl/Console.h              | 3 +--
 rosapps/applications/sysutils/regexpl/Pattern.cpp            | 3 +--
 rosapps/applications/sysutils/regexpl/Pattern.h              | 3 +--
 rosapps/applications/sysutils/regexpl/Prompt.cpp             | 3 +--
 rosapps/applications/sysutils/regexpl/README                 | 2 --
 rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/RegistryExplorer.h     | 1 -
 rosapps/applications/sysutils/regexpl/RegistryKey.cpp        | 3 +--
 rosapps/applications/sysutils/regexpl/RegistryKey.h          | 3 +--
 rosapps/applications/sysutils/regexpl/RegistryTree.cpp       | 3 +--
 rosapps/applications/sysutils/regexpl/RegistryTree.h         | 3 +--
 rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp | 3 +--
 rosapps/applications/sysutils/regexpl/SecurityDescriptor.h   | 3 +--
 rosapps/applications/sysutils/regexpl/Settings.cpp           | 3 +--
 rosapps/applications/sysutils/regexpl/Settings.h             | 1 -
 rosapps/applications/sysutils/regexpl/ShellCommand.cpp       | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommand.h         | 3 +--
 .../applications/sysutils/regexpl/ShellCommandChangeKey.cpp  | 3 +--
 .../applications/sysutils/regexpl/ShellCommandChangeKey.h    | 3 +--
 .../applications/sysutils/regexpl/ShellCommandConnect.cpp    | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandConnect.h  | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDACL.h     | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h     | 3 +--
 .../applications/sysutils/regexpl/ShellCommandDeleteKey.cpp  | 3 +--
 .../applications/sysutils/regexpl/ShellCommandDeleteKey.h    | 3 +--
 .../sysutils/regexpl/ShellCommandDeleteValue.cpp             | 3 +--
 .../applications/sysutils/regexpl/ShellCommandDeleteValue.h  | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp    | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandDir.h      | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandExit.h     | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandHelp.h     | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp  | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandOwner.h    | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandSACL.h     | 3 +--
 .../applications/sysutils/regexpl/ShellCommandSetValue.cpp   | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp  | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandValue.h    | 3 +--
 .../applications/sysutils/regexpl/ShellCommandVersion.cpp    | 3 +--
 rosapps/applications/sysutils/regexpl/ShellCommandVersion.h  | 3 +--
 .../sysutils/regexpl/ShellCommandsLinkedList.cpp             | 3 +--
 .../applications/sysutils/regexpl/ShellCommandsLinkedList.h  | 3 +--
 rosapps/applications/sysutils/regexpl/TextHistory.cpp        | 3 +--
 rosapps/applications/sysutils/regexpl/TextHistory.h          | 3 +--
 rosapps/applications/sysutils/regexpl/ph.h                   | 3 +--
 rosapps/applications/sysutils/regexpl/regexpl.rc             | 1 -
 rosapps/applications/sysutils/tlist/tlist.rc                 | 1 -
 rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c  | 3 +--
 rosapps/applications/sysutils/utils/objdir/objdir.c          | 3 +--
 rosapps/applications/sysutils/utils/pice/module/pice.rc      | 1 -
 rosapps/applications/sysutils/utils/ps/ps.c.toolhelp         | 3 +--
 rosapps/applications/sysutils/utils/sdkparse/test.h          | 2 --
 rosapps/applications/sysutils/utils/tickcount/tickcount.c    | 2 --
 rosapps/applications/sysutils/win32err.h                     | 2 +-
 rosapps/applications/sysutils/wmain.c                        | 3 +--
 rosapps/demos/maze/Makefile                                  | 1 -
 rosapps/lib/win32err/win32err.c                              | 3 +--
 rosapps/templates/mdi/mdi.rc                                 | 1 -
 rosapps/templates/template/template.c                        | 3 +--
 103 files changed, 70 insertions(+), 176 deletions(-)

diff --git a/rosapps/applications/cmdutils/mode/mode.rc b/rosapps/applications/cmdutils/mode/mode.rc
index 29e28a5b939..44ca8c4d32c 100644
--- a/rosapps/applications/cmdutils/mode/mode.rc
+++ b/rosapps/applications/cmdutils/mode/mode.rc
@@ -1,4 +1,3 @@
-/* $Id: mode.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS mode utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"mode\0"
diff --git a/rosapps/applications/cmdutils/sort/sort.rc b/rosapps/applications/cmdutils/sort/sort.rc
index 22e3c4d11f1..e3418a39524 100644
--- a/rosapps/applications/cmdutils/sort/sort.rc
+++ b/rosapps/applications/cmdutils/sort/sort.rc
@@ -1,4 +1,3 @@
-/* $Id: sort.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
 #define REACTOS_STR_INTERNAL_NAME	"sort\0"
diff --git a/rosapps/applications/cmdutils/tee/tee.rc b/rosapps/applications/cmdutils/tee/tee.rc
index 949f1335d82..2ed9b99f99c 100644
--- a/rosapps/applications/cmdutils/tee/tee.rc
+++ b/rosapps/applications/cmdutils/tee/tee.rc
@@ -1,4 +1,3 @@
-/* $Id: tee.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 tee command\0"
 #define REACTOS_STR_INTERNAL_NAME	"tee\0"
diff --git a/rosapps/applications/cmdutils/touch/touch.rc b/rosapps/applications/cmdutils/touch/touch.rc
index a2368954127..d4e19216cd0 100644
--- a/rosapps/applications/cmdutils/touch/touch.rc
+++ b/rosapps/applications/cmdutils/touch/touch.rc
@@ -1,4 +1,3 @@
-/* $Id: touch.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Touch utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"touch\0"
diff --git a/rosapps/applications/cmdutils/y/y.rc b/rosapps/applications/cmdutils/y/y.rc
index 75f701a964c..d6d2c456e0c 100644
--- a/rosapps/applications/cmdutils/y/y.rc
+++ b/rosapps/applications/cmdutils/y/y.rc
@@ -1,4 +1,3 @@
-/* $Id: y.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 y command\0"
 #define REACTOS_STR_INTERNAL_NAME	"y\0"
diff --git a/rosapps/applications/devutils/gdb2/gdb2.cpp b/rosapps/applications/devutils/gdb2/gdb2.cpp
index 73738faf3de..e6cee05358f 100644
--- a/rosapps/applications/devutils/gdb2/gdb2.cpp
+++ b/rosapps/applications/devutils/gdb2/gdb2.cpp
@@ -1,5 +1,4 @@
-/* $Id: gdb2.cpp 42968 2009-08-30 15:35:14Z sginsberg $
- *
+/*
  * gdb2 - gdb output splitter
  *
  * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
diff --git a/rosapps/applications/devutils/genguid/genguid.rc b/rosapps/applications/devutils/genguid/genguid.rc
index d50dc5bbd6e..c27773ca379 100644
--- a/rosapps/applications/devutils/genguid/genguid.rc
+++ b/rosapps/applications/devutils/genguid/genguid.rc
@@ -1,4 +1,3 @@
-/* $Id: genguid.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"GUID Generator\0"
 #define REACTOS_STR_INTERNAL_NAME	"genguid\0"
diff --git a/rosapps/applications/net/dhcpd/dhcpd.rc b/rosapps/applications/net/dhcpd/dhcpd.rc
index ee0106ca19c..b7058f50b6f 100644
--- a/rosapps/applications/net/dhcpd/dhcpd.rc
+++ b/rosapps/applications/net/dhcpd/dhcpd.rc
@@ -1,4 +1,3 @@
-/* $Id: dhcpd.rc 21499 2006-04-07 10:16:12Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"DHCP server service\0"
 #define REACTOS_STR_INTERNAL_NAME	"dhcpd\0"
diff --git a/rosapps/applications/net/dhcpd/mkinstalldirs b/rosapps/applications/net/dhcpd/mkinstalldirs
index 3f0eb1de1d1..5e17cd39fb7 100644
--- a/rosapps/applications/net/dhcpd/mkinstalldirs
+++ b/rosapps/applications/net/dhcpd/mkinstalldirs
@@ -4,8 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs 21499 2006-04-07 10:16:12Z tretiakov $
-
 errstatus=0
 
 for file
diff --git a/rosapps/applications/net/ncftp/ncftp.rc b/rosapps/applications/net/ncftp/ncftp.rc
index ea762f5e23e..026d1733115 100644
--- a/rosapps/applications/net/ncftp/ncftp.rc
+++ b/rosapps/applications/net/ncftp/ncftp.rc
@@ -1,4 +1,3 @@
-/* $Id: ncftp.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Ncftp for Win32\0"
 #define REACTOS_STR_INTERNAL_NAME	"ncftp\0"
diff --git a/rosapps/applications/net/ncftp/ncftp/getline.c b/rosapps/applications/net/ncftp/ncftp/getline.c
index fc1fa8b8eae..c4cc0e3a60c 100644
--- a/rosapps/applications/net/ncftp/ncftp/getline.c
+++ b/rosapps/applications/net/ncftp/ncftp/getline.c
@@ -1,6 +1,3 @@
-/* Based on: "$Id: getline.c 44107 2009-11-11 18:19:42Z fireball $"; */
-static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris Thewalt";
-
 /*
  * Copyright (C) 1991, 1992, 1993 by Chris Thewalt (thewalt@ce.berkeley.edu)
  *
@@ -21,6 +18,8 @@ static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris
  * Note:  This version has been updated by Mike Gleason <mgleason@ncftp.com>
  */
 
+static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris Thewalt";
+
 #if defined(WIN32) || defined(_WINDOWS)
 #	include <windows.h>
 #	include <sys/types.h>
diff --git a/rosapps/applications/net/netreg/netreg.rc b/rosapps/applications/net/netreg/netreg.rc
index 81f82f79fdf..5b657305159 100644
--- a/rosapps/applications/net/netreg/netreg.rc
+++ b/rosapps/applications/net/netreg/netreg.rc
@@ -1,4 +1,3 @@
-/* $Id: niclist.rc 11299 2004-10-16 22:30:19Z gvg $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Registry Browser\0"
 #define REACTOS_STR_INTERNAL_NAME	"netreg\0"
diff --git a/rosapps/applications/net/niclist/niclist.c b/rosapps/applications/net/niclist/niclist.c
index 6d731b2282a..d4eec53cb46 100644
--- a/rosapps/applications/net/niclist/niclist.c
+++ b/rosapps/applications/net/niclist/niclist.c
@@ -1,5 +1,4 @@
-/* $Id: niclist.c 17609 2005-09-02 21:13:10Z hpoussin $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS packet driver interface list utility
  * FILE:        apps/net/niclist/niclist.c
diff --git a/rosapps/applications/net/niclist/niclist.rc b/rosapps/applications/net/niclist/niclist.rc
index c0d898c865f..7a5ed532f5c 100644
--- a/rosapps/applications/net/niclist/niclist.rc
+++ b/rosapps/applications/net/niclist/niclist.rc
@@ -1,4 +1,3 @@
-/* $Id: niclist.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS packet driver niclist\0"
 #define REACTOS_STR_INTERNAL_NAME	"niclist\0"
diff --git a/rosapps/applications/net/roshttpd/common/roshttpd.rc b/rosapps/applications/net/roshttpd/common/roshttpd.rc
index 29e0657fc8d..0b29ee1d69e 100644
--- a/rosapps/applications/net/roshttpd/common/roshttpd.rc
+++ b/rosapps/applications/net/roshttpd/common/roshttpd.rc
@@ -1,4 +1,3 @@
-/* $Id: roshttpd.rc 21491 2006-04-07 10:10:34Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Win32 Server\0"
 #define REACTOS_STR_INTERNAL_NAME	"roshttpd\0"
diff --git a/rosapps/applications/net/tditest/tditest.rc b/rosapps/applications/net/tditest/tditest.rc
index 051792effe3..6ce7f76def0 100644
--- a/rosapps/applications/net/tditest/tditest.rc
+++ b/rosapps/applications/net/tditest/tditest.rc
@@ -1,4 +1,3 @@
-/* $Id: tditest.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TDI test driver\0"
diff --git a/rosapps/applications/notevil/notevil.c b/rosapps/applications/notevil/notevil.c
index d1c58f571f9..0cd86bee188 100644
--- a/rosapps/applications/notevil/notevil.c
+++ b/rosapps/applications/notevil/notevil.c
@@ -1,5 +1,4 @@
-/* $Id: notevil.c 17609 2005-09-02 21:13:10Z hpoussin $
- *
+/*
  * notevil.c
  *
  * --------------------------------------------------------------------
diff --git a/rosapps/applications/notevil/notevil.rc b/rosapps/applications/notevil/notevil.rc
index ffa3e2e5323..ef07d1847dd 100644
--- a/rosapps/applications/notevil/notevil.rc
+++ b/rosapps/applications/notevil/notevil.rc
@@ -1,4 +1,3 @@
-/* $Id: notevil.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Coders Console Parade\0"
 #define REACTOS_STR_INTERNAL_NAME	"notevil\0"
diff --git a/rosapps/applications/notevil/readme.txt b/rosapps/applications/notevil/readme.txt
index 6d5da996d89..2fcb417b86f 100644
--- a/rosapps/applications/notevil/readme.txt
+++ b/rosapps/applications/notevil/readme.txt
@@ -1,4 +1,3 @@
-$Id: readme.txt 34303 2008-07-05 11:46:22Z fireball $
 
 ReactOS Coders Console Parade
 -----------------------------
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
index 06ae34038e4..c81a2045a11 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.c
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c
@@ -1,7 +1,5 @@
 //======================================================================
 //
-// $Id: chkdsk.c 37749 2008-11-29 21:23:45Z sginsberg $
-//
 // Chkdskx
 //
 // Copyright (c) 1998 Mark Russinovich
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.rc b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
index 431fb393c44..d28775e6b83 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.rc
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
@@ -1,4 +1,3 @@
-/* $Id: chkdsk.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Disk Checking Utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"chkdsk\0"
diff --git a/rosapps/applications/sysutils/chklib/chklib.c b/rosapps/applications/sysutils/chklib/chklib.c
index 39dfdabe8f9..f5d25f4c7e5 100644
--- a/rosapps/applications/sysutils/chklib/chklib.c
+++ b/rosapps/applications/sysutils/chklib/chklib.c
@@ -1,5 +1,4 @@
-/* $Id: chklib.c 42932 2009-08-25 00:31:45Z gschneider $
- *
+/*
  * chklib.c
  *
  * Copyright (C) 1998, 1999 Emanuele Aliberti.
diff --git a/rosapps/applications/sysutils/chklib/chklib.rc b/rosapps/applications/sysutils/chklib/chklib.rc
index a7c8b775a33..6659e633a8b 100644
--- a/rosapps/applications/sysutils/chklib/chklib.rc
+++ b/rosapps/applications/sysutils/chklib/chklib.rc
@@ -1,4 +1,3 @@
-/* $Id: chklib.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to check a dynamic library for a symbol\0"
 #define REACTOS_STR_INTERNAL_NAME	"chklib\0"
diff --git a/rosapps/applications/sysutils/config.h b/rosapps/applications/sysutils/config.h
index e596c2dd14c..fe8bfaa5d9e 100644
--- a/rosapps/applications/sysutils/config.h
+++ b/rosapps/applications/sysutils/config.h
@@ -1,6 +1,6 @@
+
 #ifndef _INC_CONFIG_H
 #define _INC_CONFIG_H
-/* $Id: config.h 15091 2005-05-07 21:24:31Z sedwards $ */
 #define FMIFS_IMPORT_DLL
 #define REACTOS_NO_SECURITY_SS
 #endif /* ndef _INC_CONFIG_H */
diff --git a/rosapps/applications/sysutils/ctm/ctm.rc b/rosapps/applications/sysutils/ctm/ctm.rc
index 996a99208c3..a78a3c15d3b 100644
--- a/rosapps/applications/sysutils/ctm/ctm.rc
+++ b/rosapps/applications/sysutils/ctm/ctm.rc
@@ -1,4 +1,3 @@
-/* $Id: ctm.rc 35880 2008-09-02 14:00:30Z dreimer $ */
 
 #include <windows.h>
 #include "resource.h"
diff --git a/rosapps/applications/sysutils/kill/kill.rc b/rosapps/applications/sysutils/kill/kill.rc
index dae8bfffb34..44dc2eac886 100644
--- a/rosapps/applications/sysutils/kill/kill.rc
+++ b/rosapps/applications/sysutils/kill/kill.rc
@@ -1,4 +1,3 @@
-/* $Id: $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 Kill Process Utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"kill\0"
diff --git a/rosapps/applications/sysutils/logevent/logevent.c b/rosapps/applications/sysutils/logevent/logevent.c
index 3651a206338..a3231069afe 100644
--- a/rosapps/applications/sysutils/logevent/logevent.c
+++ b/rosapps/applications/sysutils/logevent/logevent.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hostname.c 21664 2006-04-19 20:14:03Z gedmurphy $
- *
+/*
  * COPYRIGHT : See COPYING in the top level directory
  * PROJECT   : Event Logging Utility
  * FILE      : logevent.c
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c
index 2acf5664c0d..91e0aa37519 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.c
+++ b/rosapps/applications/sysutils/lsdd/lsdd.c
@@ -1,5 +1,4 @@
-/* $Id: lsdd.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * FILE  : lsdd.c
  * AUTHOR: Emanuele ALIBERTI
  * DATE  : 2000-08-04
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.rc b/rosapps/applications/sysutils/lsdd/lsdd.rc
index 25f53548a29..f9b84138f7e 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.rc
+++ b/rosapps/applications/sysutils/lsdd/lsdd.rc
@@ -1,4 +1,3 @@
-/* $Id: lsdd.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0"
 #define REACTOS_STR_INTERNAL_NAME	"lsdd\0"
diff --git a/rosapps/applications/sysutils/mkdosfs/getopt.c b/rosapps/applications/sysutils/mkdosfs/getopt.c
index 0783623e9cb..11b0d98dda9 100644
--- a/rosapps/applications/sysutils/mkdosfs/getopt.c
+++ b/rosapps/applications/sysutils/mkdosfs/getopt.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * This is an unpublished work copyright (c) 1998 HELIOS Software GmbH
  * 30827 Garbsen, Germany
  */
diff --git a/rosapps/applications/sysutils/pedump/pedump.c b/rosapps/applications/sysutils/pedump/pedump.c
index 1aa9a9606b1..88706cf0c8b 100644
--- a/rosapps/applications/sysutils/pedump/pedump.c
+++ b/rosapps/applications/sysutils/pedump/pedump.c
@@ -1,4 +1,3 @@
-// $Id: pedump.c 54033 2011-10-06 20:45:06Z pschweitzer $
 //
 // This program was written by Sang Cho, assistant professor at
 //                                       the department of
diff --git a/rosapps/applications/sysutils/pedump/pedump.rc b/rosapps/applications/sysutils/pedump/pedump.rc
index 8d07de6f61c..371a9d9f2cf 100644
--- a/rosapps/applications/sysutils/pedump/pedump.rc
+++ b/rosapps/applications/sysutils/pedump/pedump.rc
@@ -1,4 +1,3 @@
-/* $Id: pedump.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to dump a PE image file.\0"
 #define REACTOS_STR_INTERNAL_NAME	"pedump\0"
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
index a2e4aac3111..c472f9dfcc7 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
@@ -1,5 +1,4 @@
-/* $Id: ArgumentParser.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.h b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
index 3f28994b584..97ea5472212 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.h
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
@@ -1,5 +1,4 @@
-/* $Id: ArgumentParser.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ArgumentParser.h: interface for the CArgumentParser class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Completion.cpp b/rosapps/applications/sysutils/regexpl/Completion.cpp
index 6bcabc81770..8d0e388d54f 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.cpp
+++ b/rosapps/applications/sysutils/regexpl/Completion.cpp
@@ -1,5 +1,4 @@
-/* $Id: Completion.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Completion.h b/rosapps/applications/sysutils/regexpl/Completion.h
index 583dc9931b4..8df3026591e 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.h
+++ b/rosapps/applications/sysutils/regexpl/Completion.h
@@ -1,5 +1,4 @@
-/* $Id: Completion.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // Completion.h - declaration for completion related functions
 
 #if !defined(COMLPETION_H__INCLUDED_)
diff --git a/rosapps/applications/sysutils/regexpl/Console.cpp b/rosapps/applications/sysutils/regexpl/Console.cpp
index f6d1a6cbe15..0f61aa0d50d 100644
--- a/rosapps/applications/sysutils/regexpl/Console.cpp
+++ b/rosapps/applications/sysutils/regexpl/Console.cpp
@@ -1,5 +1,4 @@
-/* $Id: Console.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Console.h b/rosapps/applications/sysutils/regexpl/Console.h
index 09671071421..44cd5123159 100644
--- a/rosapps/applications/sysutils/regexpl/Console.h
+++ b/rosapps/applications/sysutils/regexpl/Console.h
@@ -1,5 +1,4 @@
-/* $Id: Console.h 42968 2009-08-30 15:35:14Z sginsberg $ */
-
+//
 // Console.h: interface for the CConsole class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.cpp b/rosapps/applications/sysutils/regexpl/Pattern.cpp
index 361b927e043..55d4d300e96 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.cpp
+++ b/rosapps/applications/sysutils/regexpl/Pattern.cpp
@@ -1,5 +1,4 @@
-/* $Id: Pattern.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.h b/rosapps/applications/sysutils/regexpl/Pattern.h
index 6093593585a..11ab87f590f 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.h
+++ b/rosapps/applications/sysutils/regexpl/Pattern.h
@@ -1,5 +1,4 @@
-/* $Id: Pattern.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // Pattern.h: decalration for pattern functions
 
 #if !defined(PATTERN_H__INCLUDED_)
diff --git a/rosapps/applications/sysutils/regexpl/Prompt.cpp b/rosapps/applications/sysutils/regexpl/Prompt.cpp
index 6404dc479fd..6a9a56955e9 100644
--- a/rosapps/applications/sysutils/regexpl/Prompt.cpp
+++ b/rosapps/applications/sysutils/regexpl/Prompt.cpp
@@ -1,5 +1,4 @@
-/* $Id: Prompt.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/README b/rosapps/applications/sysutils/regexpl/README
index 93ebe0f76bd..40a22214e84 100644
--- a/rosapps/applications/sysutils/regexpl/README
+++ b/rosapps/applications/sysutils/regexpl/README
@@ -1,5 +1,3 @@
--*- Mode: Text -*-
-$Id: README 34303 2008-07-05 11:46:22Z fireball $
 
 Registry Explorer is console mode tool for reading/writing ReactOS
 registry. Currently, access is provided only by means of interactive
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
index b5fcf812f22..83b1cbca1e2 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryExplorer.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
index 7969c40bec0..446d9f0985c 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
@@ -1,4 +1,3 @@
-/* $Id: RegistryExplorer.h 12802 2005-01-04 21:36:26Z narnaoud $ */
 
 #ifndef _REGISTRY_EXPLORER_H__INCLUDED
 #define _REGISTRY_EXPLORER_H__INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
index 7a86ad42ec6..d3d6ec83483 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryKey.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.h b/rosapps/applications/sysutils/regexpl/RegistryKey.h
index 219479a44bd..6244c7671cc 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.h
@@ -1,5 +1,4 @@
-/* $Id: RegistryKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // RegistryKey.h: interface for the CRegistryKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
index 2dff0b61f16..694e59a72ff 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryTree.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.h b/rosapps/applications/sysutils/regexpl/RegistryTree.h
index 2051ee9087f..72beed77d79 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.h
@@ -1,5 +1,4 @@
-/* $Id: RegistryTree.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // RegistryTree.h: interface for the CRegistryTree class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
index 6319c81defd..9f55314359f 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
@@ -1,5 +1,4 @@
-/* $Id: SecurityDescriptor.cpp 12813 2005-01-05 02:21:05Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
index dcc01d5fe8c..72b934ed3ba 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
@@ -1,5 +1,4 @@
-/* $Id: SecurityDescriptor.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // SecurityDescriptor.h: interface for the CSecurityDescriptor class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Settings.cpp b/rosapps/applications/sysutils/regexpl/Settings.cpp
index 259cac084f2..e3129b341ec 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.cpp
+++ b/rosapps/applications/sysutils/regexpl/Settings.cpp
@@ -1,5 +1,4 @@
-/* $Id: Settings.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Settings.h b/rosapps/applications/sysutils/regexpl/Settings.h
index d1a077348a5..e029ac45f3c 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.h
+++ b/rosapps/applications/sysutils/regexpl/Settings.h
@@ -1,4 +1,3 @@
-/* $Id: Settings.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 #ifndef OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
 #define OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
index fec114ac95d..eff5311a141 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommand.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.h b/rosapps/applications/sysutils/regexpl/ShellCommand.h
index 7757518bed7..2eb836d7aed 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommand.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommand.h: interface for the CShellCommand class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
index a42333677b1..aedefc440f4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandChangeKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
index fa589de8b99..f6ffb9d55e1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandChangeKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandChangeKey.h: interface for the CShellCommandChangeKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
index 1af0d2e2ad7..a331c3c192d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandConnect.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
index 60205a17f23..7eb6265b93e 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandConnect.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandConnect.h: interface for the CShellCommandConnect class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
index 4b011ff3ac3..d0c6e9f220a 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
index 82cb14256d2..5dd1441e7b0 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDACL.h: interface for the CShellCommandDACL class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
index 93269411362..b589fc7d00d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDOKA.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
index 1360eefcf5f..0efeecb8ca2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDOKA.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDOKA.h: interface for the CShellCommandDOKA class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
index e2d91ff2b6d..0583af8337d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
index dc9a1818905..498932b3486 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDeleteKey.h: interface for the CShellCommandDeleteKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
index 5ab2d52d357..1da0ef7e60c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
index caf75bc3114..3c14a372825 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDeleteValue.h: interface for the CShellCommandDeleteValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
index 194bf690557..85a63d4cc13 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDir.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
index 76ae4b5fe70..e74532b935d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDir.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDir.h: interface for the CShellCommandDir class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
index 6ea49306d47..211d08d7a5c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandExit.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
index 619e89b3ec1..85fa6c2a21d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandExit.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandExit.h: interface for the CShellCommandExit class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
index 1f9ff9ade0f..519fdec0988 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandHelp.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
index ba138949cd8..1afe38977f3 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandHelp.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandHelp.h: interface for the CShellCommandHelp class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
index 11e1ebe73c2..1bd313d3fb6 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandNewKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
index a7b26b706b9..f94e67fc72c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandNewKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandNewKey.h: interface for the CShellCommandNewKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
index 1850a60ff12..ef9a55557a8 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandOwner.cpp 38906 2009-01-18 18:40:02Z sginsberg $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
index ce7204d23a3..9268ee0f1c1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandOwner.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandOwner.h: interface for the CShellCommandOwner class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
index fd0da7c02d9..cf6eb11a267 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
index 637ea3660a5..bcc8536135c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandSACL.h: interface for the CShellCommandSACL class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
index 3650440b53c..b0dfaea2b49 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSetValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
index 957c166bbd9..060293b81a4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSetValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandSetValue.h: interface for the CShellCommandSetValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
index 1fab0055a20..7db957414e2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
index c62ca5242eb..d0c70a0b7a4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandValue.h: interface for the CShellCommandValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
index dea1e8b94c0..2944242707a 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandVersion.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
index 68827f076ca..1a92dd603b5 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandVersion.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandVersion.h: interface for the CShellCommandVersion class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
index 70d06ccba7d..07435eba4d6 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandsLinkedList.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
index 2937e4f6410..f85d54586fd 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandsLinkedList.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandsLinkedList.h: interface for the CShellCommandsLinkedList class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.cpp b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
index a6162580229..6e2cb2d1ad2 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.cpp
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
@@ -1,5 +1,4 @@
-/* $Id: TextHistory.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.h b/rosapps/applications/sysutils/regexpl/TextHistory.h
index 9d3fe26a4ce..5c3d7936e77 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.h
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.h
@@ -1,5 +1,4 @@
-/* $Id: TextHistory.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // TextHistory.h: interface for the CTextHistory class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ph.h b/rosapps/applications/sysutils/regexpl/ph.h
index a926ae71edb..5c3732a52bb 100644
--- a/rosapps/applications/sysutils/regexpl/ph.h
+++ b/rosapps/applications/sysutils/regexpl/ph.h
@@ -1,5 +1,4 @@
-/* $Id: ph.h 54378 2011-11-14 22:14:52Z jimtabor $ */
-
+//
 // ph.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
 //      are changed infrequently
diff --git a/rosapps/applications/sysutils/regexpl/regexpl.rc b/rosapps/applications/sysutils/regexpl/regexpl.rc
index 5af5933a15a..ebfbfa83266 100644
--- a/rosapps/applications/sysutils/regexpl/regexpl.rc
+++ b/rosapps/applications/sysutils/regexpl/regexpl.rc
@@ -1,4 +1,3 @@
-/* $Id: regexpl.rc 12803 2005-01-04 21:40:25Z narnaoud $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Console Registry Explorer\0"
 #define REACTOS_STR_INTERNAL_NAME	"regexpl\0"
diff --git a/rosapps/applications/sysutils/tlist/tlist.rc b/rosapps/applications/sysutils/tlist/tlist.rc
index e7ab799091d..b69688cf5fa 100644
--- a/rosapps/applications/sysutils/tlist/tlist.rc
+++ b/rosapps/applications/sysutils/tlist/tlist.rc
@@ -1,4 +1,3 @@
-/* $Id: tlist.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 T(ask)List\0"
 #define REACTOS_STR_INTERNAL_NAME	"tlist\0"
diff --git a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
index ca9c6cd4634..1a5343a93be 100644
--- a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
+++ b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
@@ -1,5 +1,4 @@
-/* $Id: nts2w32err.c 24501 2006-10-13 10:56:52Z janderwald $
- *
+/*
  * Convert NTSTATUS codes to Win32 error codes: run it
  * on a NT box AND on a ROS box, then diff the results.
  *
diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.c b/rosapps/applications/sysutils/utils/objdir/objdir.c
index d78b1ae7703..cd6c099fc29 100644
--- a/rosapps/applications/sysutils/utils/objdir/objdir.c
+++ b/rosapps/applications/sysutils/utils/objdir/objdir.c
@@ -1,5 +1,4 @@
-/* $Id: objdir.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * DESCRIPTION: Object Manager Simple Explorer
  * PROGRAMMER:  David Welch
  * REVISIONS
diff --git a/rosapps/applications/sysutils/utils/pice/module/pice.rc b/rosapps/applications/sysutils/utils/pice/module/pice.rc
index 7bdca960f4c..bdf4b166f82 100644
--- a/rosapps/applications/sysutils/utils/pice/module/pice.rc
+++ b/rosapps/applications/sysutils/utils/pice/module/pice.rc
@@ -1,4 +1,3 @@
-/* $Id: pice.rc 21687 2006-04-21 16:36:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PICE Debugger\0"
diff --git a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
index cdc6b7476aa..46192cad142 100644
--- a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
+++ b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
@@ -1,5 +1,4 @@
-/* $Id: ps.c.toolhelp 21303 2006-03-12 00:41:06Z jimtabor $
- *
+/*
  *  ReactOS ps - process list console viewer
  *
  *  ps.c
diff --git a/rosapps/applications/sysutils/utils/sdkparse/test.h b/rosapps/applications/sysutils/utils/sdkparse/test.h
index e71062c5d46..5b20f27d3a2 100644
--- a/rosapps/applications/sysutils/utils/sdkparse/test.h
+++ b/rosapps/applications/sysutils/utils/sdkparse/test.h
@@ -1,5 +1,3 @@
-/* $Id: test.h 22385 2006-06-17 16:45:48Z gedmurphy $
-*/
 /*
  * test.h
  *
diff --git a/rosapps/applications/sysutils/utils/tickcount/tickcount.c b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
index 7c56a141a48..2f7e2cc9d31 100644
--- a/rosapps/applications/sysutils/utils/tickcount/tickcount.c
+++ b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
@@ -1,5 +1,3 @@
-/* $Id: tickcount.c 22417 2006-06-19 13:55:51Z gedmurphy $
-*/
 /*
  tickcount -- Display the kernel tick count (or any tick count passed as an
  argument or as input) in human-readable format
diff --git a/rosapps/applications/sysutils/win32err.h b/rosapps/applications/sysutils/win32err.h
index eb13191c99f..38455c786f8 100644
--- a/rosapps/applications/sysutils/win32err.h
+++ b/rosapps/applications/sysutils/win32err.h
@@ -1,6 +1,6 @@
 #ifndef _INC_WIN32ERR_H
 #define _INC_WIN32ERR_H
-/* $Id: win32err.h 14516 2005-04-05 19:19:44Z sedwards $ */
+
 VOID
 PrintWin32Error(
 	PWCHAR	Message,
diff --git a/rosapps/applications/sysutils/wmain.c b/rosapps/applications/sysutils/wmain.c
index 0fd1af97898..2bc7bb26bd8 100644
--- a/rosapps/applications/sysutils/wmain.c
+++ b/rosapps/applications/sysutils/wmain.c
@@ -1,5 +1,4 @@
-/* $Id: wmain.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  * Entry point for programs that use wmain()
  */
 #include <stdio.h>
diff --git a/rosapps/demos/maze/Makefile b/rosapps/demos/maze/Makefile
index 3d33c473931..ade1431fcd6 100644
--- a/rosapps/demos/maze/Makefile
+++ b/rosapps/demos/maze/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile 43236 2009-09-30 13:32:05Z sginsberg $
 
 PATH_TO_TOP = ../../../reactos
 
diff --git a/rosapps/lib/win32err/win32err.c b/rosapps/lib/win32err/win32err.c
index ff3d8227f25..c68a20f3582 100644
--- a/rosapps/lib/win32err/win32err.c
+++ b/rosapps/lib/win32err/win32err.c
@@ -1,5 +1,4 @@
-/* $Id: win32err.c 16861 2005-07-29 13:46:03Z ea $
- *
+/*
  * win32err.c
  *
  * Copyright (c) 1998 Mark Russinovich
diff --git a/rosapps/templates/mdi/mdi.rc b/rosapps/templates/mdi/mdi.rc
index 63c862c2763..8a598cf7889 100644
--- a/rosapps/templates/mdi/mdi.rc
+++ b/rosapps/templates/mdi/mdi.rc
@@ -1,4 +1,3 @@
-/* $Id: mdi.rc 31932 2008-01-21 21:29:59Z dreimer $ */
 
 #include <windows.h>
 
diff --git a/rosapps/templates/template/template.c b/rosapps/templates/template/template.c
index 5789e109df6..75fbf7fbc13 100644
--- a/rosapps/templates/template/template.c
+++ b/rosapps/templates/template/template.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: template.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/template/template.c

From 284994e8976bc19369919630f6b2d9710c66c082 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 14 Mar 2013 12:54:51 +0000
Subject: [PATCH 28/61] [CRT] * Annotate conio.h.

svn path=/trunk/; revision=58494
---
 reactos/include/crt/conio.h | 424 +++++++++++++++++++++++++++++++-----
 1 file changed, 373 insertions(+), 51 deletions(-)

diff --git a/reactos/include/crt/conio.h b/reactos/include/crt/conio.h
index 74fbbac7524..74dcf45ae00 100644
--- a/reactos/include/crt/conio.h
+++ b/reactos/include/crt/conio.h
@@ -15,27 +15,158 @@
 extern "C" {
 #endif
 
-  _CRTIMP char * __cdecl _cgets(char *_Buffer);
-  _CRTIMP int __cdecl _cprintf(const char *_Format,...);
-  _CRTIMP int __cdecl _cputs(const char *_Str);
-  _CRT_INSECURE_DEPRECATE(_cscanf_s) _CRTIMP int __cdecl _cscanf(const char *_Format,...);
-  _CRT_INSECURE_DEPRECATE(_cscanf_s_l) _CRTIMP int __cdecl _cscanf_l(const char *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _getch(void);
-  _CRTIMP int __cdecl _getche(void);
-  _CRTIMP int __cdecl _vcprintf(const char *_Format,va_list _ArgList);
-  _CRTIMP int __cdecl _cprintf_p(const char *_Format,...);
-  _CRTIMP int __cdecl _vcprintf_p(const char *_Format,va_list _ArgList);
-  _CRTIMP int __cdecl _cprintf_l(const char *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _vcprintf_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
-  _CRTIMP int __cdecl _cprintf_p_l(const char *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _vcprintf_p_l(const char *_Format,_locale_t _Locale,va_list _ArgList);
-  _CRTIMP int __cdecl _kbhit(void);
-  _CRTIMP int __cdecl _putch(int _Ch);
-  _CRTIMP int __cdecl _ungetch(int _Ch);
-  _CRTIMP int __cdecl _getch_nolock(void);
-  _CRTIMP int __cdecl _getche_nolock(void);
-  _CRTIMP int __cdecl _putch_nolock(int _Ch);
-  _CRTIMP int __cdecl _ungetch_nolock(int _Ch);
+  _CRTIMP
+  char*
+  __cdecl
+  _cgets(
+    _Pre_notnull_ _Post_z_ char *_Buffer);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cprintf(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cputs(
+    _In_z_ const char *_Str);
+
+  _Check_return_opt_
+  _CRT_INSECURE_DEPRECATE(_cscanf_s)
+  _CRTIMP
+  int
+  __cdecl
+  _cscanf(
+    _In_z_ _Scanf_format_string_ const char *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRT_INSECURE_DEPRECATE(_cscanf_s_l)
+  _CRTIMP
+  int
+  __cdecl
+  _cscanf_l(
+    _In_z_ _Scanf_format_string_ const char *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _getch(void);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _getche(void);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcprintf(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    va_list _ArgList);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cprintf_p(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcprintf_p(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    va_list _ArgList);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cprintf_l(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcprintf_l(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    _In_opt_ _locale_t _Locale,
+    va_list _ArgList);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cprintf_p_l(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcprintf_p_l(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    _In_opt_ _locale_t _Locale,
+    va_list _ArgList);
+
+  _CRTIMP
+  int
+  __cdecl
+  _kbhit(void);
+
+  _CRTIMP
+  int
+  __cdecl
+  _putch(
+    _In_ int _Ch);
+
+  _CRTIMP
+  int
+  __cdecl
+  _ungetch(
+    _In_ int _Ch);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _getch_nolock(void);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _getche_nolock(void);
+
+  _CRTIMP
+  int
+  __cdecl
+  _putch_nolock(
+    _In_ int _Ch);
+
+  _CRTIMP
+  int
+  __cdecl
+  _ungetch_nolock(
+    _In_ int _Ch);
 
 #if defined(_X86_) && !defined(__x86_64)
   int __cdecl _inp(unsigned short);
@@ -54,26 +185,153 @@ extern "C" {
 #define WEOF (wint_t)(0xFFFF)
 #endif
 
-  _CRTIMP wchar_t *_cgetws(wchar_t *_Buffer);
-  _CRTIMP wint_t __cdecl _getwch(void);
-  _CRTIMP wint_t __cdecl _getwche(void);
-  _CRTIMP wint_t __cdecl _putwch(wchar_t _WCh);
-  _CRTIMP wint_t __cdecl _ungetwch(wint_t _WCh);
-  _CRTIMP int __cdecl _cputws(const wchar_t *_String);
-  _CRTIMP int __cdecl _cwprintf(const wchar_t *_Format,...);
-  _CRT_INSECURE_DEPRECATE(_cwscanf_s) _CRTIMP int __cdecl _cwscanf(const wchar_t *_Format,...);
-  _CRT_INSECURE_DEPRECATE(_cwscanf_s_l) _CRTIMP int __cdecl _cwscanf_l(const wchar_t *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _vcwprintf(const wchar_t *_Format,va_list _ArgList);
-  _CRTIMP int __cdecl _cwprintf_p(const wchar_t *_Format,...);
-  _CRTIMP int __cdecl _vcwprintf_p(const wchar_t *_Format,va_list _ArgList);
-  _CRTIMP int __cdecl _cwprintf_l(const wchar_t *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _vcwprintf_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList);
-  _CRTIMP int __cdecl _cwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,...);
-  _CRTIMP int __cdecl _vcwprintf_p_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList);
-  _CRTIMP wint_t __cdecl _putwch_nolock(wchar_t _WCh);
-  _CRTIMP wint_t __cdecl _getwch_nolock(void);
-  _CRTIMP wint_t __cdecl _getwche_nolock(void);
-  _CRTIMP wint_t __cdecl _ungetwch_nolock(wint_t _WCh);
+  _CRTIMP
+  wchar_t*
+  _cgetws(
+    _Pre_notnull_ _Post_z_ wchar_t *_Buffer);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _getwch(void);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _getwche(void);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _putwch(
+    wchar_t _WCh);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _ungetwch(
+    wint_t _WCh);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cputws(
+    _In_z_ const wchar_t *_String);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cwprintf(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRT_INSECURE_DEPRECATE(_cwscanf_s)
+  _CRTIMP
+  int
+  __cdecl
+  _cwscanf(
+    _In_z_ _Scanf_format_string_ const wchar_t *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRT_INSECURE_DEPRECATE(_cwscanf_s_l)
+  _CRTIMP
+  int
+  __cdecl
+  _cwscanf_l(
+    _In_z_ _Scanf_format_string_ const wchar_t *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcwprintf(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    va_list _ArgList);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _cwprintf_p(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _vcwprintf_p(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    va_list _ArgList);
+
+  _CRTIMP
+  int
+  __cdecl
+  _cwprintf_l(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _CRTIMP
+  int
+  __cdecl
+  _vcwprintf_l(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    _In_opt_ _locale_t _Locale,
+    va_list _ArgList);
+
+  _CRTIMP
+  int
+  __cdecl
+  _cwprintf_p_l(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    _In_opt_ _locale_t _Locale,
+    ...);
+
+  _CRTIMP
+  int
+  __cdecl
+  _vcwprintf_p_l(
+    _In_z_ _Printf_format_string_ const wchar_t *_Format,
+    _In_opt_ _locale_t _Locale,
+    va_list _ArgList);
+
+  _Check_return_opt_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _putwch_nolock(
+    wchar_t _WCh);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _getwch_nolock(void);
+
+  _Check_return_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _getwche_nolock(void);
+
+  _Check_return_opt_
+  _CRTIMP
+  wint_t
+  __cdecl
+  _ungetwch_nolock(
+    wint_t _WCh);
+
 #endif /* _WCONIO_DEFINED */
 
 #ifndef _MT
@@ -83,16 +341,79 @@ extern "C" {
 #define _ungetwch() _ungetwch_nolock()
 #endif
 
-#ifndef	NO_OLDNAMES
-  _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer);
-  _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...);
-  _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str);
-  _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...);
-  _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void);
-  _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void);
-  _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void);
-  _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch);
-  _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch);
+#ifndef NO_OLDNAMES
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_cgets)
+  _CRT_INSECURE_DEPRECATE(_cgets_s)
+  _CRTIMP
+  char*
+  __cdecl
+  cgets(
+    _Out_writes_z_(_Inexpressible_(*_Buffer + 2)) char *_Buffer);
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_cprintf)
+  _CRTIMP
+  int
+  __cdecl
+  cprintf(
+    _In_z_ _Printf_format_string_ const char *_Format,
+    ...);
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_cputs)
+  _CRTIMP
+  int
+  __cdecl
+  cputs(
+    _In_z_ const char *_Str);
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_cscanf)
+  _CRTIMP
+  int
+  __cdecl
+  cscanf(
+    _In_z_ _Scanf_format_string_ const char *_Format,
+    ...);
+
+  _Check_return_
+  _CRT_NONSTDC_DEPRECATE(_getch)
+  _CRTIMP
+  int
+  __cdecl
+  getch(void);
+
+  _Check_return_
+  _CRT_NONSTDC_DEPRECATE(_getche)
+  _CRTIMP
+  int
+  __cdecl
+  getche(void);
+
+  _Check_return_
+  _CRT_NONSTDC_DEPRECATE(_kbhit)
+  _CRTIMP
+  int
+  __cdecl
+  kbhit(void);
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_putch)
+  _CRTIMP
+  int
+  __cdecl
+  putch(
+    int _Ch);
+
+  _Check_return_opt_
+  _CRT_NONSTDC_DEPRECATE(_ungetch)
+  _CRTIMP
+  int
+  __cdecl
+  ungetch(
+    int _Ch);
 
 #if (defined(_X86_) && !defined(__x86_64))
   _CRT_NONSTDC_DEPRECATE(_inp) _CRTIMP int __cdecl inp(unsigned short);
@@ -100,6 +421,7 @@ extern "C" {
   _CRT_NONSTDC_DEPRECATE(_outp) _CRTIMP int __cdecl outp(unsigned short,int);
   _CRT_NONSTDC_DEPRECATE(_outpw) _CRTIMP unsigned short __cdecl outpw(unsigned short,unsigned short);
 #endif
+
 #endif /* !NO_OLDNAMES */
 
 #ifdef __cplusplus

From 8783a188c93ecfd6fba4bd7307f3c2ca2138855a Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 14 Mar 2013 16:51:39 +0000
Subject: [PATCH 29/61] [EVENTLOG] * Fix some format specifiers.

svn path=/trunk/; revision=58495
---
 reactos/base/services/eventlog/eventlog.c | 50 +++++++++++------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/reactos/base/services/eventlog/eventlog.c b/reactos/base/services/eventlog/eventlog.c
index 288dcf65286..881594d5e76 100644
--- a/reactos/base/services/eventlog/eventlog.c
+++ b/reactos/base/services/eventlog/eventlog.c
@@ -101,7 +101,7 @@ ServiceControlHandler(DWORD dwControl,
             return ERROR_SUCCESS;
 
         default :
-            DPRINT1("  Control %lu received\n");
+            DPRINT1("  Control %lu received\n", dwControl);
             return ERROR_CALL_NOT_IMPLEMENTED;
     }
 }
@@ -293,7 +293,7 @@ PLOGFILE LoadLogFile(HKEY hKey, WCHAR * LogName)
                              &ValueLen);
     if (Result != ERROR_SUCCESS)
     {
-        DPRINT1("RegQueryValueEx failed: %d\n", GetLastError());
+        DPRINT1("RegQueryValueEx failed: %lu\n", GetLastError());
         HeapFree(MyHeap, 0, Buf);
         return NULL;
     }
@@ -491,17 +491,17 @@ VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, DWORD * pEventTime)
 
 VOID PRINT_HEADER(PEVENTLOGHEADER header)
 {
-    DPRINT("HeaderSize = %d\n", header->HeaderSize);
+    DPRINT("HeaderSize = %lu\n", header->HeaderSize);
     DPRINT("Signature = 0x%x\n", header->Signature);
-    DPRINT("MajorVersion = %d\n", header->MajorVersion);
-    DPRINT("MinorVersion = %d\n", header->MinorVersion);
-    DPRINT("StartOffset = %d\n", header->StartOffset);
+    DPRINT("MajorVersion = %lu\n", header->MajorVersion);
+    DPRINT("MinorVersion = %lu\n", header->MinorVersion);
+    DPRINT("StartOffset = %lu\n", header->StartOffset);
     DPRINT("EndOffset = 0x%x\n", header->EndOffset);
-    DPRINT("CurrentRecordNumber = %d\n", header->CurrentRecordNumber);
-    DPRINT("OldestRecordNumber = %d\n", header->OldestRecordNumber);
+    DPRINT("CurrentRecordNumber = %lu\n", header->CurrentRecordNumber);
+    DPRINT("OldestRecordNumber = %lu\n", header->OldestRecordNumber);
     DPRINT("MaxSize = 0x%x\n", header->MaxSize);
     DPRINT("Retention = 0x%x\n", header->Retention);
-    DPRINT("EndHeaderSize = %d\n", header->EndHeaderSize);
+    DPRINT("EndHeaderSize = %lu\n", header->EndHeaderSize);
     DPRINT("Flags: ");
     if (header->Flags & ELF_LOGFILE_HEADER_DIRTY)  DPRINT("ELF_LOGFILE_HEADER_DIRTY");
     if (header->Flags & ELF_LOGFILE_HEADER_WRAP)  DPRINT("| ELF_LOGFILE_HEADER_WRAP ");
@@ -516,21 +516,21 @@ VOID PRINT_RECORD(PEVENTLOGRECORD pRec)
     WCHAR *str;
     SYSTEMTIME time;
 
-    DPRINT("Length = %d\n", pRec->Length);
+    DPRINT("Length = %lu\n", pRec->Length);
     DPRINT("Reserved = 0x%x\n", pRec->Reserved);
-    DPRINT("RecordNumber = %d\n", pRec->RecordNumber);
+    DPRINT("RecordNumber = %lu\n", pRec->RecordNumber);
 
     EventTimeToSystemTime(pRec->TimeGenerated, &time);
-    DPRINT("TimeGenerated = %d.%d.%d %d:%d:%d\n",
+    DPRINT("TimeGenerated = %hu.%hu.%hu %hu:%hu:%hu\n",
            time.wDay, time.wMonth, time.wYear,
            time.wHour, time.wMinute, time.wSecond);
 
     EventTimeToSystemTime(pRec->TimeWritten, &time);
-    DPRINT("TimeWritten = %d.%d.%d %d:%d:%d\n",
+    DPRINT("TimeWritten = %hu.%hu.%hu %hu:%hu:%hu\n",
            time.wDay, time.wMonth, time.wYear,
            time.wHour, time.wMinute, time.wSecond);
 
-    DPRINT("EventID = %d\n", pRec->EventID);
+    DPRINT("EventID = %lu\n", pRec->EventID);
 
     switch (pRec->EventType)
     {
@@ -550,18 +550,18 @@ VOID PRINT_RECORD(PEVENTLOGRECORD pRec)
             DPRINT("EventType = EVENTLOG_AUDIT_FAILURE\n");
             break;
         default:
-            DPRINT("EventType = %d\n", pRec->EventType);
+            DPRINT("EventType = %hu\n", pRec->EventType);
     }
 
-    DPRINT("NumStrings = %d\n", pRec->NumStrings);
-    DPRINT("EventCategory = %d\n", pRec->EventCategory);
+    DPRINT("NumStrings = %hu\n", pRec->NumStrings);
+    DPRINT("EventCategory = %hu\n", pRec->EventCategory);
     DPRINT("ReservedFlags = 0x%x\n", pRec->ReservedFlags);
-    DPRINT("ClosingRecordNumber = %d\n", pRec->ClosingRecordNumber);
-    DPRINT("StringOffset = %d\n", pRec->StringOffset);
-    DPRINT("UserSidLength = %d\n", pRec->UserSidLength);
-    DPRINT("UserSidOffset = %d\n", pRec->UserSidOffset);
-    DPRINT("DataLength = %d\n", pRec->DataLength);
-    DPRINT("DataOffset = %d\n", pRec->DataOffset);
+    DPRINT("ClosingRecordNumber = %lu\n", pRec->ClosingRecordNumber);
+    DPRINT("StringOffset = %lu\n", pRec->StringOffset);
+    DPRINT("UserSidLength = %lu\n", pRec->UserSidLength);
+    DPRINT("UserSidOffset = %lu\n", pRec->UserSidOffset);
+    DPRINT("DataLength = %lu\n", pRec->DataLength);
+    DPRINT("DataOffset = %lu\n", pRec->DataOffset);
 
     DPRINT("SourceName: %S\n", (WCHAR *) (((PBYTE) pRec) + sizeof(EVENTLOGRECORD)));
 
@@ -576,10 +576,10 @@ VOID PRINT_RECORD(PEVENTLOGRECORD pRec)
         str = (WCHAR *) (((PBYTE) pRec) + pRec->StringOffset);
         for (i = 0; i < pRec->NumStrings; i++)
         {
-            DPRINT("[%d] %S\n", i, str);
+            DPRINT("[%u] %S\n", i, str);
             str = str + lstrlenW(str) + 1;
         }
     }
 
-    DPRINT("Length2 = %d\n", *(PDWORD) (((PBYTE) pRec) + pRec->Length - 4));
+    DPRINT("Length2 = %lu\n", *(PDWORD) (((PBYTE) pRec) + pRec->Length - 4));
 }

From e4b7869ead1064b714811f00ecd8c1ba52f6fa4e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 14 Mar 2013 16:53:56 +0000
Subject: [PATCH 30/61] [CRT] * Annotate direct.h.

svn path=/trunk/; revision=58496
---
 reactos/include/crt/direct.h | 180 ++++++++++++++++++++++++++++++-----
 1 file changed, 157 insertions(+), 23 deletions(-)

diff --git a/reactos/include/crt/direct.h b/reactos/include/crt/direct.h
index e9eb50b4072..05041796e80 100644
--- a/reactos/include/crt/direct.h
+++ b/reactos/include/crt/direct.h
@@ -25,40 +25,174 @@ extern "C" {
   };
 #endif
 
-  _CRTIMP char *__cdecl _getcwd(char *_DstBuf,int _SizeInBytes);
-  _CRTIMP char *__cdecl _getdcwd(int _Drive,char *_DstBuf,int _SizeInBytes);
-  char *__cdecl _getdcwd_nolock(int _Drive,char *_DstBuf,int _SizeInBytes);
-  _CRTIMP int __cdecl _chdir(const char *_Path);
-  _CRTIMP int __cdecl _mkdir(const char *_Path);
-  _CRTIMP int __cdecl _rmdir(const char *_Path);
-  _CRTIMP int __cdecl _chdrive(int _Drive);
-  _CRTIMP int __cdecl _getdrive(void);
-  _CRTIMP unsigned long __cdecl _getdrives(void);
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  char*
+  __cdecl
+  _getcwd(
+    _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+    _In_ int _SizeInBytes);
+
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  char*
+  __cdecl
+  _getdcwd(
+    _In_ int _Drive,
+    _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+    _In_ int _SizeInBytes);
+
+  _Check_return_
+  _Ret_opt_z_
+  char*
+  __cdecl
+  _getdcwd_nolock(
+    _In_ int _Drive,
+    _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+    _In_ int _SizeInBytes);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _chdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _mkdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _rmdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _chdrive(
+    _In_ int _Drive);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _getdrive(void);
+
+  _Check_return_
+  _CRTIMP
+  unsigned long
+  __cdecl
+  _getdrives(void);
 
 #ifndef _GETDISKFREE_DEFINED
 #define _GETDISKFREE_DEFINED
-  _CRTIMP unsigned __cdecl _getdiskfree(unsigned _Drive,struct _diskfree_t *_DiskFree);
+  _Check_return_
+  _CRTIMP
+  unsigned
+  __cdecl
+  _getdiskfree(
+    _In_ unsigned _Drive,
+    _Out_ struct _diskfree_t *_DiskFree);
 #endif
 
 #ifndef _WDIRECT_DEFINED
 #define _WDIRECT_DEFINED
-  _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords);
-  _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
-  wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
-  _CRTIMP int __cdecl _wchdir(const wchar_t *_Path);
-  _CRTIMP int __cdecl _wmkdir(const wchar_t *_Path);
-  _CRTIMP int __cdecl _wrmdir(const wchar_t *_Path);
-#endif
 
-#ifndef	NO_OLDNAMES
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  wchar_t*
+  __cdecl
+  _wgetcwd(
+    _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ int _SizeInWords);
+
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  wchar_t*
+  __cdecl
+  _wgetdcwd(
+    _In_ int _Drive,
+    _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ int _SizeInWords);
+
+  _Check_return_
+  _Ret_opt_z_
+  wchar_t*
+  __cdecl
+  _wgetdcwd_nolock(
+    _In_ int _Drive,
+    _Out_writes_opt_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ int _SizeInWords);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wchdir(
+    _In_z_ const wchar_t *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wmkdir(
+    _In_z_ const wchar_t *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wrmdir(
+    _In_z_ const wchar_t *_Path);
+
+#endif /* _WDIRECT_DEFINED */
+
+#ifndef NO_OLDNAMES
 
 #define diskfree_t _diskfree_t
 
-  _CRTIMP char *__cdecl getcwd(char *_DstBuf,int _SizeInBytes);
-  _CRTIMP int __cdecl chdir(const char *_Path);
-  _CRTIMP int __cdecl mkdir(const char *_Path);
-  _CRTIMP int __cdecl rmdir(const char *_Path);
-#endif
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  char*
+  __cdecl
+  getcwd(
+    _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+    _In_ int _SizeInBytes);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  chdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  mkdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  rmdir(
+    _In_z_ const char *_Path);
+
+#endif /* NO_OLDNAMES */
 
 #ifdef __cplusplus
 }

From 1aaf95a11c1406f4af1103745e1c2a1d93c8eede Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 14 Mar 2013 17:47:00 +0000
Subject: [PATCH 31/61] [TASKMGR] * Fix some format specifiers.

svn path=/trunk/; revision=58497
---
 reactos/base/applications/taskmgr/procpage.c | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/reactos/base/applications/taskmgr/procpage.c b/reactos/base/applications/taskmgr/procpage.c
index 99e9af1068b..33ceb8c6e4c 100644
--- a/reactos/base/applications/taskmgr/procpage.c
+++ b/reactos/base/applications/taskmgr/procpage.c
@@ -536,13 +536,13 @@ BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCoun
     if (ColumnDataHints[ColumnIndex] == COLUMN_IMAGENAME)
         PerfDataGetImageName(Index, lpText, nMaxCount);
     if (ColumnDataHints[ColumnIndex] == COLUMN_PID)
-        wsprintfW(lpText, L"%d", PerfDataGetProcessId(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetProcessId(Index));
     if (ColumnDataHints[ColumnIndex] == COLUMN_USERNAME)
         PerfDataGetUserName(Index, lpText, nMaxCount);
     if (ColumnDataHints[ColumnIndex] == COLUMN_SESSIONID)
-        wsprintfW(lpText, L"%d", PerfDataGetSessionId(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetSessionId(Index));
     if (ColumnDataHints[ColumnIndex] == COLUMN_CPUUSAGE)
-        wsprintfW(lpText, L"%02d", PerfDataGetCPUUsage(Index));
+        wsprintfW(lpText, L"%02lu", PerfDataGetCPUUsage(Index));
     if (ColumnDataHints[ColumnIndex] == COLUMN_CPUTIME)
     {
         DWORD dwHours;
@@ -551,74 +551,74 @@ BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCoun
 
         time = PerfDataGetCPUTime(Index);
         gethmsfromlargeint(time, &dwHours, &dwMinutes, &dwSeconds);
-        wsprintfW(lpText, L"%d:%02d:%02d", dwHours, dwMinutes, dwSeconds);
+        wsprintfW(lpText, L"%lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGE)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetWorkingSetSizeBytes(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeBytes(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_PEAKMEMORYUSAGE)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetPeakWorkingSetSizeBytes(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_MEMORYUSAGEDELTA)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetWorkingSetSizeDelta(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetWorkingSetSizeDelta(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTS)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetPageFaultCount(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCount(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEFAULTSDELTA)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetPageFaultCountDelta(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetPageFaultCountDelta(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_VIRTUALMEMORYSIZE)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetVirtualMemorySizeBytes(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetVirtualMemorySizeBytes(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_PAGEDPOOL)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetPagedPoolUsagePages(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetPagedPoolUsagePages(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_NONPAGEDPOOL)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetNonPagedPoolUsagePages(Index) / 1024);
+        wsprintfW(lpText, L"%lu", PerfDataGetNonPagedPoolUsagePages(Index) / 1024);
         CommaSeparateNumberString(lpText, nMaxCount);
         wcscat(lpText, L" K");
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_BASEPRIORITY)
-        wsprintfW(lpText, L"%d", PerfDataGetBasePriority(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetBasePriority(Index));
     if (ColumnDataHints[ColumnIndex] == COLUMN_HANDLECOUNT)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetHandleCount(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetHandleCount(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_THREADCOUNT)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetThreadCount(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetThreadCount(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_USEROBJECTS)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetUSERObjectCount(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetUSERObjectCount(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_GDIOBJECTS)
     {
-        wsprintfW(lpText, L"%d", PerfDataGetGDIObjectCount(Index));
+        wsprintfW(lpText, L"%lu", PerfDataGetGDIObjectCount(Index));
         CommaSeparateNumberString(lpText, nMaxCount);
     }
     if (ColumnDataHints[ColumnIndex] == COLUMN_IOREADS)

From 9c65c1548a1c7f816453fe3f69a49ca244f93403 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 14 Mar 2013 17:54:05 +0000
Subject: [PATCH 32/61] [CRT] * Annotate math.h.

svn path=/trunk/; revision=58498
---
 reactos/include/crt/math.h | 279 ++++++++++++++++++++-----------------
 1 file changed, 152 insertions(+), 127 deletions(-)

diff --git a/reactos/include/crt/math.h b/reactos/include/crt/math.h
index 3b0a5420477..1eaf68a80d4 100644
--- a/reactos/include/crt/math.h
+++ b/reactos/include/crt/math.h
@@ -55,159 +55,182 @@ extern "C" {
 
 #ifndef _CRT_ABS_DEFINED
 #define _CRT_ABS_DEFINED
-  int __cdecl abs(int x);
-  long __cdecl labs(long x);
+  int __cdecl abs(_In_ int x);
+  long __cdecl labs(_In_ long x);
 #endif
-  double __cdecl acos(double x);
-  double __cdecl asin(double x);
-  double __cdecl atan(double x);
-  double __cdecl atan2(double y, double x);
-  double __cdecl cos(double x);
-  double __cdecl cosh(double x);
-  double __cdecl exp(double x);
-  double __cdecl fabs(double x);
-  double __cdecl fmod(double x, double y);
-  double __cdecl log(double x);
-  double __cdecl log10(double x);
-  double __cdecl pow(double x, double y);
-  double __cdecl sin(double x);
-  double __cdecl sinh(double x);
-  double __cdecl sqrt(double x);
-  double __cdecl tan(double x);
-  double __cdecl tanh(double x);
+
+  double __cdecl acos(_In_ double x);
+  double __cdecl asin(_In_ double x);
+  double __cdecl atan(_In_ double x);
+  double __cdecl atan2(_In_ double y, _In_ double x);
+  double __cdecl cos(_In_ double x);
+  double __cdecl cosh(_In_ double x);
+  double __cdecl exp(_In_ double x);
+  double __cdecl fabs(_In_ double x);
+  double __cdecl fmod(_In_ double x, _In_ double y);
+  double __cdecl log(_In_ double x);
+  double __cdecl log10(_In_ double x);
+  double __cdecl pow(_In_ double x, double y);
+  double __cdecl sin(_In_ double x);
+  double __cdecl sinh(_In_ double x);
+  double __cdecl sqrt(_In_ double x);
+  double __cdecl tan(_In_ double x);
+  double __cdecl tanh(_In_ double x);
+
 #ifndef _CRT_MATHERR_DEFINED
 #define _CRT_MATHERR_DEFINED
-  int __cdecl _matherr(struct _exception *except);
+  int __cdecl _matherr(_Inout_ struct _exception *except);
 #endif
 
 #ifndef _CRT_ATOF_DEFINED
 #define _CRT_ATOF_DEFINED
-  _CRTIMP double __cdecl atof(const char *str);
-  _CRTIMP double __cdecl _atof_l(const char *str ,_locale_t locale);
-#endif
+
+  _Check_return_
+  _CRTIMP
+  double
+  __cdecl
+  atof(
+    _In_z_ const char *str);
+
+  _Check_return_
+  _CRTIMP
+  double
+  __cdecl
+  _atof_l(
+    _In_z_ const char *str,
+    _In_opt_ _locale_t locale);
+
+#endif /* _CRT_ATOF_DEFINED */
+
 #ifndef _SIGN_DEFINED
 #define _SIGN_DEFINED
-  _CRTIMP double __cdecl _copysign(double x,double sgn);
-  _CRTIMP double __cdecl _chgsign(double x);
+  _Check_return_ _CRTIMP double __cdecl _copysign(_In_ double x, _In_ double sgn);
+  _Check_return_ _CRTIMP double __cdecl _chgsign(_In_ double x);
 #endif
-  _CRTIMP double __cdecl _cabs(struct _complex a);
-  _CRTIMP double __cdecl ceil(double x);
-  _CRTIMP double __cdecl floor(double x);
-  _CRTIMP double __cdecl frexp(double x, int *y);
-  _CRTIMP double __cdecl _hypot(double x, double y);
-  _CRTIMP double __cdecl _j0(double x);
-  _CRTIMP double __cdecl _j1(double x);
-  _CRTIMP double __cdecl _jn(int x, double y);
-  _CRTIMP double __cdecl ldexp(double x, int y);
-  _CRTIMP double __cdecl modf(double x, double *y);
-  _CRTIMP double __cdecl _y0(double x);
-  _CRTIMP double __cdecl _y1(double x);
-  _CRTIMP double __cdecl _yn(int x, double y);
-  _CRTIMP float __cdecl _hypotf(float x, float y);
+
+  _CRTIMP double __cdecl _cabs(_In_ struct _complex a);
+  _CRTIMP double __cdecl ceil(_In_ double x);
+  _CRTIMP double __cdecl floor(_In_ double x);
+  _CRTIMP double __cdecl frexp(_In_ double x, _Out_ int *y);
+  _CRTIMP double __cdecl _hypot(_In_ double x, _In_ double y);
+  _CRTIMP double __cdecl _j0(_In_ double x);
+  _CRTIMP double __cdecl _j1(_In_ double x);
+  _CRTIMP double __cdecl _jn(_In_ int x, _In_ double y);
+  _CRTIMP double __cdecl ldexp(_In_ double x, _In_ int y);
+  _CRTIMP double __cdecl modf(_In_ double x, _Out_ double *y);
+  _CRTIMP double __cdecl _y0(_In_ double x);
+  _CRTIMP double __cdecl _y1(_In_ double x);
+  _CRTIMP double __cdecl _yn(_In_ int x, _In_ double y);
+  _CRTIMP float __cdecl _hypotf(_In_ float x, _In_ float y);
 
 #if defined(__i386__) || defined(_M_IX86)
-  _CRTIMP int __cdecl _set_SSE2_enable(int flag);
+  _CRTIMP int __cdecl _set_SSE2_enable(_In_ int flag);
 #endif
 
 #if defined(__x86_64) || defined(_M_AMD64)
-  _CRTIMP float __cdecl _copysignf(float x, float sgn);
-  _CRTIMP float __cdecl _chgsignf(float x);
-  _CRTIMP float __cdecl _logbf(float x);
-  _CRTIMP float __cdecl _nextafterf(float x,float y);
-  _CRTIMP int __cdecl _finitef(float x);
-  _CRTIMP int __cdecl _isnanf(float x);
-  _CRTIMP int __cdecl _fpclassf(float x);
+  _CRTIMP float __cdecl _copysignf(_In_ float x, _In_ float sgn);
+  _CRTIMP float __cdecl _chgsignf(_In_ float x);
+  _CRTIMP float __cdecl _logbf(_In_ float x);
+  _CRTIMP float __cdecl _nextafterf(_In_ float x, _In_ float y);
+  _CRTIMP int __cdecl _finitef(_In_ float x);
+  _CRTIMP int __cdecl _isnanf(_In_ float x);
+  _CRTIMP int __cdecl _fpclassf(_In_ float x);
 #endif
 
 #if defined(__ia64__) || defined (_M_IA64)
-  _CRTIMP float __cdecl fabsf(float x);
-  _CRTIMP float __cdecl ldexpf(float x, int y);
-  _CRTIMP long double __cdecl tanl(long double x);
+  _CRTIMP float __cdecl fabsf(_In_ float x);
+  _CRTIMP float __cdecl ldexpf(_In_ float x, _In_ int y);
+  _CRTIMP long double __cdecl tanl(_In_ long double x);
 #else
-  __CRT_INLINE float __cdecl fabsf(float x) { return ((float)fabs((double)x)); }
-  __CRT_INLINE float __cdecl ldexpf(float x, int expn) { return (float)ldexp (x, expn); }
-  __CRT_INLINE long double tanl(long double x) { return (tan((double)x)); }
+  __CRT_INLINE float __cdecl fabsf(_In_ float x) { return ((float)fabs((double)x)); }
+  __CRT_INLINE float __cdecl ldexpf(_In_ float x, _In_ int expn) { return (float)ldexp(x, expn); }
+  __CRT_INLINE long double tanl(_In_ long double x) { return (tan((double)x)); }
 #endif
 
-#if (_WIN32_WINNT >= 0x600) && \
+#if (_WIN32_WINNT >= 0x600) &&                 \
     (defined(__x86_64) || defined(_M_AMD64) || \
      defined (__ia64__) || defined (_M_IA64))
-  _CRTIMP float __cdecl acosf(float x);
-  _CRTIMP float __cdecl asinf(float x);
-  _CRTIMP float __cdecl atanf(float x);
-  _CRTIMP float __cdecl atan2f(float x, float y);
-  _CRTIMP float __cdecl ceilf(float x);
-  _CRTIMP float __cdecl cosf(float x);
-  _CRTIMP float __cdecl coshf(float x);
-  _CRTIMP float __cdecl expf(float x);
-  _CRTIMP float __cdecl floorf(float x);
-  _CRTIMP float __cdecl fmodf(float x, float y);
-  _CRTIMP float __cdecl logf(float x);
-  _CRTIMP float __cdecl log10f(float x);
-  _CRTIMP float __cdecl modff(float x, float *y);
-  _CRTIMP float __cdecl powf(float b, float e);
-  _CRTIMP float __cdecl sinf(float x);
-  _CRTIMP float __cdecl sinhf(float x);
-  _CRTIMP float __cdecl sqrtf(float x);
-  _CRTIMP float __cdecl tanf(float x);
-  _CRTIMP float __cdecl tanhf(float x);
+
+  _CRTIMP float __cdecl acosf(_In_ float x);
+  _CRTIMP float __cdecl asinf(_In_ float x);
+  _CRTIMP float __cdecl atanf(_In_ float x);
+  _CRTIMP float __cdecl atan2f(_In_ float x, _In_ float y);
+  _CRTIMP float __cdecl ceilf(_In_ float x);
+  _CRTIMP float __cdecl cosf(_In_ float x);
+  _CRTIMP float __cdecl coshf(_In_ float x);
+  _CRTIMP float __cdecl expf(_In_ float x);
+  _CRTIMP float __cdecl floorf(_In_ float x);
+  _CRTIMP float __cdecl fmodf(_In_ float x, _In_ float y);
+  _CRTIMP float __cdecl logf(_In_ float x);
+  _CRTIMP float __cdecl log10f(_In_ float x);
+  _CRTIMP float __cdecl modff(_In_ float x, _Out_ float *y);
+  _CRTIMP float __cdecl powf(_In_ float b, _In_ float e);
+  _CRTIMP float __cdecl sinf(_In_ float x);
+  _CRTIMP float __cdecl sinhf(_In_ float x);
+  _CRTIMP float __cdecl sqrtf(_In_ float x);
+  _CRTIMP float __cdecl tanf(_In_ float x);
+  _CRTIMP float __cdecl tanhf(_In_ float x);
+
 #else
-  __CRT_INLINE float acosf(float x) { return ((float)acos((double)x)); }
-  __CRT_INLINE float asinf(float x) { return ((float)asin((double)x)); }
-  __CRT_INLINE float atanf(float x) { return ((float)atan((double)x)); }
-  __CRT_INLINE float atan2f(float x,float y) { return ((float)atan2((double)x,(double)y)); }
-  __CRT_INLINE float ceilf(float x) { return ((float)ceil((double)x)); }
-  __CRT_INLINE float cosf(float x) { return ((float)cos((double)x)); }
-  __CRT_INLINE float coshf(float x) { return ((float)cosh((double)x)); }
-  __CRT_INLINE float expf(float x) { return ((float)exp((double)x)); }
-  __CRT_INLINE float floorf(float x) { return ((float)floor((double)x)); }
-  __CRT_INLINE float fmodf(float x,float y) { return ((float)fmod((double)x,(double)y)); }
-  __CRT_INLINE float logf(float x) { return ((float)log((double)x)); }
-  __CRT_INLINE float log10f(float x) { return ((float)log10((double)x)); }
-  __CRT_INLINE float modff(float x,float *y) {
+
+  __CRT_INLINE float acosf(_In_ float x) { return ((float)acos((double)x)); }
+  __CRT_INLINE float asinf(_In_ float x) { return ((float)asin((double)x)); }
+  __CRT_INLINE float atanf(_In_ float x) { return ((float)atan((double)x)); }
+  __CRT_INLINE float atan2f(_In_ float x, _In_ float y) { return ((float)atan2((double)x,(double)y)); }
+  __CRT_INLINE float ceilf(_In_ float x) { return ((float)ceil((double)x)); }
+  __CRT_INLINE float cosf(_In_ float x) { return ((float)cos((double)x)); }
+  __CRT_INLINE float coshf(_In_ float x) { return ((float)cosh((double)x)); }
+  __CRT_INLINE float expf(_In_ float x) { return ((float)exp((double)x)); }
+  __CRT_INLINE float floorf(_In_ float x) { return ((float)floor((double)x)); }
+  __CRT_INLINE float fmodf(_In_ float x, _In_ float y) { return ((float)fmod((double)x,(double)y)); }
+  __CRT_INLINE float logf(_In_ float x) { return ((float)log((double)x)); }
+  __CRT_INLINE float log10f(_In_ float x) { return ((float)log10((double)x)); }
+  __CRT_INLINE float modff(_In_ float x, _Out_ float *y) {
     double _Di,_Df = modf((double)x,&_Di);
     *y = (float)_Di;
     return ((float)_Df);
   }
-  __CRT_INLINE float powf(float x,float y) { return ((float)pow((double)x,(double)y)); }
-  __CRT_INLINE float sinf(float x) { return ((float)sin((double)x)); }
-  __CRT_INLINE float sinhf(float x) { return ((float)sinh((double)x)); }
-  __CRT_INLINE float sqrtf(float x) { return ((float)sqrt((double)x)); }
-  __CRT_INLINE float tanf(float x) { return ((float)tan((double)x)); }
-  __CRT_INLINE float tanhf(float x) { return ((float)tanh((double)x)); }
+  __CRT_INLINE float powf(_In_ float x, _In_ float y) { return ((float)pow((double)x,(double)y)); }
+  __CRT_INLINE float sinf(_In_ float x) { return ((float)sin((double)x)); }
+  __CRT_INLINE float sinhf(_In_ float x) { return ((float)sinh((double)x)); }
+  __CRT_INLINE float sqrtf(_In_ float x) { return ((float)sqrt((double)x)); }
+  __CRT_INLINE float tanf(_In_ float x) { return ((float)tan((double)x)); }
+  __CRT_INLINE float tanhf(_In_ float x) { return ((float)tanh((double)x)); }
+
 #endif
 
-  __CRT_INLINE long double acosl(long double x) { return (acos((double)x)); }
-  __CRT_INLINE long double asinl(long double x) { return (asin((double)x)); }
-  __CRT_INLINE long double atanl(long double x) { return (atan((double)x)); }
-  __CRT_INLINE long double atan2l(long double y, long double x) { return (atan2((double)y, (double)x)); }
-  __CRT_INLINE long double ceill(long double x) { return (ceil((double)x)); }
-  __CRT_INLINE long double cosl(long double x) { return (cos((double)x)); }
-  __CRT_INLINE long double coshl(long double x) { return (cosh((double)x)); }
-  __CRT_INLINE long double expl(long double x) { return (exp((double)x)); }
-  __CRT_INLINE long double floorl(long double x) { return (floor((double)x)); }
-  __CRT_INLINE long double fmodl(long double x, long double y) { return (fmod((double)x, (double)y)); }
-  __CRT_INLINE long double frexpl(long double x, int *y) { return (frexp((double)x, y)); }
-  __CRT_INLINE long double logl(long double x) { return (log((double)x)); }
-  __CRT_INLINE long double log10l(long double x) { return (log10((double)x)); }
-  __CRT_INLINE long double powl(long double x, long double y) { return (pow((double)x, (double)y)); }
-  __CRT_INLINE long double sinl(long double x) { return (sin((double)x)); }
-  __CRT_INLINE long double sinhl(long double x) { return (sinh((double)x)); }
-  __CRT_INLINE long double sqrtl(long double x) { return (sqrt((double)x)); }
-  __CRT_INLINE long double tanhl(long double x) {return (tanh((double)x)); }
-  __CRT_INLINE long double __cdecl fabsl(long double x) { return fabs((double)x); }
-  __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); }
-  __CRT_INLINE long double _copysignl(long double _Number, long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); }
-  __CRT_INLINE long double _hypotl(long double x,long double y) { return _hypot((double)(x),(double)(y)); }
-  __CRT_INLINE float frexpf(float x, int *y) { return ((float)frexp((double)x,y)); }
-  __CRT_INLINE long double ldexpl(long double x, int y) { return ldexp((double)x, y); }
-  __CRT_INLINE long double modfl(long double x,long double *y) {
+  __CRT_INLINE long double acosl(_In_ long double x) { return (acos((double)x)); }
+  __CRT_INLINE long double asinl(_In_ long double x) { return (asin((double)x)); }
+  __CRT_INLINE long double atanl(_In_ long double x) { return (atan((double)x)); }
+  __CRT_INLINE long double atan2l(_In_ long double y, _In_ long double x) { return (atan2((double)y, (double)x)); }
+  __CRT_INLINE long double ceill(_In_ long double x) { return (ceil((double)x)); }
+  __CRT_INLINE long double cosl(_In_ long double x) { return (cos((double)x)); }
+  __CRT_INLINE long double coshl(_In_ long double x) { return (cosh((double)x)); }
+  __CRT_INLINE long double expl(_In_ long double x) { return (exp((double)x)); }
+  __CRT_INLINE long double floorl(_In_ long double x) { return (floor((double)x)); }
+  __CRT_INLINE long double fmodl(_In_ long double x, _In_ long double y) { return (fmod((double)x, (double)y)); }
+  __CRT_INLINE long double frexpl(_In_ long double x, _Out_ int *y) { return (frexp((double)x, y)); }
+  __CRT_INLINE long double logl(_In_ long double x) { return (log((double)x)); }
+  __CRT_INLINE long double log10l(_In_ long double x) { return (log10((double)x)); }
+  __CRT_INLINE long double powl(_In_ long double x, _In_ long double y) { return (pow((double)x, (double)y)); }
+  __CRT_INLINE long double sinl(_In_ long double x) { return (sin((double)x)); }
+  __CRT_INLINE long double sinhl(_In_ long double x) { return (sinh((double)x)); }
+  __CRT_INLINE long double sqrtl(_In_ long double x) { return (sqrt((double)x)); }
+  __CRT_INLINE long double tanhl(_In_ long double x) {return (tanh((double)x)); }
+  __CRT_INLINE long double __cdecl fabsl(_In_ long double x) { return fabs((double)x); }
+  __CRT_INLINE long double _chgsignl(_In_ long double _Number) { return _chgsign((double)(_Number)); }
+  __CRT_INLINE long double _copysignl(_In_ long double _Number, _In_ long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); }
+  __CRT_INLINE long double _hypotl(_In_ long double x, _In_ long double y) { return _hypot((double)(x),(double)(y)); }
+  __CRT_INLINE float frexpf(_In_ float x, _Out_ int *y) { return ((float)frexp((double)x,y)); }
+  __CRT_INLINE long double ldexpl(_In_ long double x, _In_ int y) { return ldexp((double)x, y); }
+  __CRT_INLINE long double modfl(_In_ long double x, _Out_ long double *y) {
     double _Di,_Df = modf((double)x,&_Di);
     *y = (long double)_Di;
     return (_Df);
   }
 
-#ifndef	NO_OLDNAMES
+#ifndef NO_OLDNAMES
+
 #define DOMAIN _DOMAIN
 #define SING _SING
 #define OVERFLOW _OVERFLOW
@@ -218,15 +241,17 @@ extern "C" {
 #define HUGE _HUGE
   // _CRTIMP double __cdecl cabs(struct _complex x);
   #define cabs _cabs
-  _CRTIMP double __cdecl hypot(double x,double y);
-  _CRTIMP double __cdecl j0(double x);
-  _CRTIMP double __cdecl j1(double x);
-  _CRTIMP double __cdecl jn(int x,double y);
-  _CRTIMP double __cdecl y0(double x);
-  _CRTIMP double __cdecl y1(double x);
-  _CRTIMP double __cdecl yn(int x,double y);
-  __CRT_INLINE float __cdecl hypotf(float x, float y) { return (float) hypot (x, y); }
-#endif
+
+  _CRTIMP double __cdecl hypot(_In_ double x, _In_ double y);
+  _CRTIMP double __cdecl j0(_In_ double x);
+  _CRTIMP double __cdecl j1(_In_ double x);
+  _CRTIMP double __cdecl jn(_In_ int x, _In_ double y);
+  _CRTIMP double __cdecl y0(_In_ double x);
+  _CRTIMP double __cdecl y1(_In_ double x);
+  _CRTIMP double __cdecl yn(_In_ int x, _In_ double y);
+  __CRT_INLINE float __cdecl hypotf(_In_ float x, _In_ float y) { return (float) hypot(x, y); }
+
+#endif /* NO_OLDNAMES */
 
 #ifdef __cplusplus
 }

From f0b30b23606478f83c4ce58ba9e46fea60940858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 20:35:39 +0000
Subject: [PATCH 33/61] [WIN32SS] - Remove the unneeded $Id$ blabla from the
 source code. - Translate some GreatLordish into English.

svn path=/trunk/; revision=58499
---
 reactos/win32ss/drivers/font/ftfd/rosglue.c      | 3 +--
 reactos/win32ss/gdi/gdi32/misc/hacks.c           | 5 ++---
 reactos/win32ss/gdi/gdi32/misc/heap.c            | 1 -
 reactos/win32ss/gdi/gdi32/misc/historic.c        | 5 ++---
 reactos/win32ss/gdi/gdi32/objects/eng.c          | 3 +--
 reactos/win32ss/gdi/gdi32/objects/path.c         | 3 +--
 reactos/win32ss/reactx/dxg/dxg.rc                | 1 -
 reactos/win32ss/reactx/dxgthk/dxgthk.rc          | 1 -
 reactos/win32ss/user/ntuser/csr.h                | 3 +--
 reactos/win32ss/user/ntuser/vis.h                | 3 +--
 reactos/win32ss/user/user32/include/regcontrol.h | 3 +--
 reactos/win32ss/user/user32/misc/desktop.c       | 3 +--
 reactos/win32ss/user/user32/misc/object.c        | 3 +--
 reactos/win32ss/user/user32/misc/timer.c         | 3 +--
 reactos/win32ss/user/user32/misc/winsta.c        | 3 +--
 reactos/win32ss/user/user32/windows/accel.c      | 3 +--
 reactos/win32ss/user/user32/windows/caret.c      | 3 +--
 reactos/win32ss/user/user32/windows/clipboard.c  | 3 +--
 reactos/win32ss/user/user32/windows/dc.c         | 3 +--
 reactos/win32ss/user/user32/windows/font.c       | 3 +--
 reactos/win32ss/user/user32/windows/rect.c       | 3 +--
 reactos/win32ss/user/user32/windows/text.c       | 3 +--
 reactos/win32ss/user/win32csr/alias.c            | 2 +-
 reactos/win32ss/user/win32csr/conio.h            | 3 +--
 reactos/win32ss/user/win32csr/desktopbg.h        | 3 +--
 reactos/win32ss/user/win32csr/exitros.c          | 3 +--
 reactos/win32ss/user/win32csr/guiconsole.c       | 3 +--
 reactos/win32ss/user/win32csr/guiconsole.h       | 3 +--
 reactos/win32ss/user/win32csr/handle.c           | 3 +--
 reactos/win32ss/user/win32csr/resource.h         | 3 +--
 reactos/win32ss/user/win32csr/tuiconsole.c       | 3 +--
 reactos/win32ss/user/win32csr/tuiconsole.h       | 3 +--
 reactos/win32ss/user/win32csr/win32csr.h         | 3 +--
 reactos/win32ss/user/winsrv/dllmain.c            | 3 +--
 reactos/win32ss/user/winsrv/init.c               | 3 +--
 reactos/win32ss/user/winsrv/server.c             | 3 +--
 reactos/win32ss/user/winsrv/winsrv.def           | 2 +-
 reactos/win32ss/win32k.rc                        | 1 -
 38 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/reactos/win32ss/drivers/font/ftfd/rosglue.c b/reactos/win32ss/drivers/font/ftfd/rosglue.c
index 6a8c025a230..5917521ab67 100644
--- a/reactos/win32ss/drivers/font/ftfd/rosglue.c
+++ b/reactos/win32ss/drivers/font/ftfd/rosglue.c
@@ -1,5 +1,4 @@
-/* $Id: rosglue.c 39928 2009-03-10 02:49:45Z tkreuzer $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           FreeType implementation for ReactOS
  * PURPOSE:           Glue functions between FreeType
diff --git a/reactos/win32ss/gdi/gdi32/misc/hacks.c b/reactos/win32ss/gdi/gdi32/misc/hacks.c
index 51e46be49b9..c8ac9987164 100644
--- a/reactos/win32ss/gdi/gdi32/misc/hacks.c
+++ b/reactos/win32ss/gdi/gdi32/misc/hacks.c
@@ -1,12 +1,11 @@
 #include "precomp.h"
 
-/* $Id: stubs.c 28709 2007-08-31 15:09:51Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/hacks.c
  *
  * GDI32.DLL hacks
  *
- * Api that are hacked but we can not do correct implemtions yetm but using own syscall
+ * Apis that are hacked but we cannot write correct implementations yet but we are using our own syscall
  *
  */
 
diff --git a/reactos/win32ss/gdi/gdi32/misc/heap.c b/reactos/win32ss/gdi/gdi32/misc/heap.c
index 83c47473d47..64b4207cfb6 100644
--- a/reactos/win32ss/gdi/gdi32/misc/heap.c
+++ b/reactos/win32ss/gdi/gdi32/misc/heap.c
@@ -15,7 +15,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 /*
- * $Id:
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS GDI32
  * PURPOSE:
diff --git a/reactos/win32ss/gdi/gdi32/misc/historic.c b/reactos/win32ss/gdi/gdi32/misc/historic.c
index c144069ecee..689aecb61f8 100644
--- a/reactos/win32ss/gdi/gdi32/misc/historic.c
+++ b/reactos/win32ss/gdi/gdi32/misc/historic.c
@@ -1,10 +1,9 @@
-/* $Id: stubs.c 28709 2007-08-31 15:09:51Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/historic.c
  *
  * GDI32.DLL Stubs
  *
- * Api that does basic nothing, but is here for backwords compatible with older windows
+ * Apis that do basically nothing, but are here for backwards compatibility with older Windows
  *
  */
 
diff --git a/reactos/win32ss/gdi/gdi32/objects/eng.c b/reactos/win32ss/gdi/gdi32/objects/eng.c
index e13f84c3e3e..b8d3d8e8e8f 100644
--- a/reactos/win32ss/gdi/gdi32/objects/eng.c
+++ b/reactos/win32ss/gdi/gdi32/objects/eng.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 28533 2007-08-24 22:44:36Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/eng.c
  *
  * GDI32.DLL eng part
diff --git a/reactos/win32ss/gdi/gdi32/objects/path.c b/reactos/win32ss/gdi/gdi32/objects/path.c
index db08f05e8c4..50ed87fc93f 100644
--- a/reactos/win32ss/gdi/gdi32/objects/path.c
+++ b/reactos/win32ss/gdi/gdi32/objects/path.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 18897 2005-12-08 23:10:33Z cwittich $
- *
+/*
  * reactos/lib/gdi32/objects/path.c
  *
  * GDI32.DLL Path
diff --git a/reactos/win32ss/reactx/dxg/dxg.rc b/reactos/win32ss/reactx/dxg/dxg.rc
index 9418600f0ba..28671e2b73d 100644
--- a/reactos/win32ss/reactx/dxg/dxg.rc
+++ b/reactos/win32ss/reactx/dxg/dxg.rc
@@ -1,4 +1,3 @@
-/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"DXG DirectX interface Device Driver\0"
diff --git a/reactos/win32ss/reactx/dxgthk/dxgthk.rc b/reactos/win32ss/reactx/dxgthk/dxgthk.rc
index 5f88c536cfa..1c3c816396c 100644
--- a/reactos/win32ss/reactx/dxgthk/dxgthk.rc
+++ b/reactos/win32ss/reactx/dxgthk/dxgthk.rc
@@ -1,4 +1,3 @@
-/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"DirectX Graphics Driver Thunk\0"
diff --git a/reactos/win32ss/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
index 0541b6eed73..5256c03b651 100644
--- a/reactos/win32ss/user/ntuser/csr.h
+++ b/reactos/win32ss/user/ntuser/csr.h
@@ -1,5 +1,4 @@
-/* $Id: csr.h 56311 2012-04-01 20:42:43Z akhaldi $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Interface to csrss
diff --git a/reactos/win32ss/user/ntuser/vis.h b/reactos/win32ss/user/ntuser/vis.h
index 71cb1aa1c48..93e27b50963 100644
--- a/reactos/win32ss/user/ntuser/vis.h
+++ b/reactos/win32ss/user/ntuser/vis.h
@@ -1,5 +1,4 @@
-/* $Id: vis.h 56311 2012-04-01 20:42:43Z akhaldi $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Visibility computations interface definition
diff --git a/reactos/win32ss/user/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
index 97832b26d07..91a9892520c 100644
--- a/reactos/win32ss/user/user32/include/regcontrol.h
+++ b/reactos/win32ss/user/user32/include/regcontrol.h
@@ -1,5 +1,4 @@
-/* $Id: regcontrol.h 50357 2011-01-11 18:47:16Z gadamopoulos $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS User32
  * PURPOSE:          Built-in control registration
diff --git a/reactos/win32ss/user/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c
index 8eecc10ce48..da21a5efd3e 100644
--- a/reactos/win32ss/user/user32/misc/desktop.c
+++ b/reactos/win32ss/user/user32/misc/desktop.c
@@ -1,5 +1,4 @@
-/* $Id: desktop.c 57236 2012-09-04 05:37:13Z jimtabor $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/desktop.c
diff --git a/reactos/win32ss/user/user32/misc/object.c b/reactos/win32ss/user/user32/misc/object.c
index d86a0750e38..d85e6768d45 100644
--- a/reactos/win32ss/user/user32/misc/object.c
+++ b/reactos/win32ss/user/user32/misc/object.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: object.c 57652 2012-10-30 16:50:11Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
  * PURPOSE:         DDE
diff --git a/reactos/win32ss/user/user32/misc/timer.c b/reactos/win32ss/user/user32/misc/timer.c
index 7ea609b6e02..a3303c146c8 100644
--- a/reactos/win32ss/user/user32/misc/timer.c
+++ b/reactos/win32ss/user/user32/misc/timer.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
  * PURPOSE:         DDE
diff --git a/reactos/win32ss/user/user32/misc/winsta.c b/reactos/win32ss/user/user32/misc/winsta.c
index e4f6c82a5b9..ad7768d921a 100644
--- a/reactos/win32ss/user/user32/misc/winsta.c
+++ b/reactos/win32ss/user/user32/misc/winsta.c
@@ -1,5 +1,4 @@
-/* $Id: winsta.c 51082 2011-03-17 13:19:18Z gadamopoulos $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/winsta.c
diff --git a/reactos/win32ss/user/user32/windows/accel.c b/reactos/win32ss/user/user32/windows/accel.c
index 435abb084bc..40db647e99a 100644
--- a/reactos/win32ss/user/user32/windows/accel.c
+++ b/reactos/win32ss/user/user32/windows/accel.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: accel.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Accelerator tables
diff --git a/reactos/win32ss/user/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
index 06b55e56872..6b3b16cfc58 100644
--- a/reactos/win32ss/user/user32/windows/caret.c
+++ b/reactos/win32ss/user/user32/windows/caret.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: caret.c 54199 2011-10-19 16:17:32Z rharabien $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/caret.c
  * PURPOSE:         Caret
diff --git a/reactos/win32ss/user/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
index 14604152038..fe321a8f5ee 100644
--- a/reactos/win32ss/user/user32/windows/clipboard.c
+++ b/reactos/win32ss/user/user32/windows/clipboard.c
@@ -1,5 +1,4 @@
-/* $Id: clipboard.c 53657 2011-09-09 15:24:14Z rharabien $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/clipboard.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/dc.c b/reactos/win32ss/user/user32/windows/dc.c
index 37d12284880..6ade68f2984 100644
--- a/reactos/win32ss/user/user32/windows/dc.c
+++ b/reactos/win32ss/user/user32/windows/dc.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dc.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c
index 0e7a1b58527..a6f00eb8b10 100644
--- a/reactos/win32ss/user/user32/windows/font.c
+++ b/reactos/win32ss/user/user32/windows/font.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: font.c 48387 2010-07-31 22:36:22Z fireball $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/rect.c b/reactos/win32ss/user/user32/windows/rect.c
index f6547645c78..451407c3eb6 100644
--- a/reactos/win32ss/user/user32/windows/rect.c
+++ b/reactos/win32ss/user/user32/windows/rect.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: rect.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/text.c b/reactos/win32ss/user/user32/windows/text.c
index dfb645b3839..a6770b42cc6 100644
--- a/reactos/win32ss/user/user32/windows/text.c
+++ b/reactos/win32ss/user/user32/windows/text.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: text.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/win32csr/alias.c b/reactos/win32ss/user/win32csr/alias.c
index 55c69966627..3329d84e355 100644
--- a/reactos/win32ss/user/win32csr/alias.c
+++ b/reactos/win32ss/user/win32csr/alias.c
@@ -1,4 +1,4 @@
-/* $Id: init.c 31400 2007-12-22 17:18:32Z fireball $
+/*
  * PROJECT:     ReactOS CSRSS
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        subsystems/win32/csrss/api/alias.c
diff --git a/reactos/win32ss/user/win32csr/conio.h b/reactos/win32ss/user/win32csr/conio.h
index 7a35d7647d1..6f1b81a0b2e 100644
--- a/reactos/win32ss/user/win32csr/conio.h
+++ b/reactos/win32ss/user/win32csr/conio.h
@@ -1,5 +1,4 @@
-/* $Id: conio.h 55617 2012-02-15 20:29:08Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/include/conio.h
diff --git a/reactos/win32ss/user/win32csr/desktopbg.h b/reactos/win32ss/user/win32csr/desktopbg.h
index 006ac2102b1..84d3859eef3 100644
--- a/reactos/win32ss/user/win32csr/desktopbg.h
+++ b/reactos/win32ss/user/win32csr/desktopbg.h
@@ -1,5 +1,4 @@
-/* $Id: desktopbg.h 47315 2010-05-23 00:51:29Z jmorlan $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/include/destkopbg.h
diff --git a/reactos/win32ss/user/win32csr/exitros.c b/reactos/win32ss/user/win32csr/exitros.c
index 0e24d56a171..e8ac3f24098 100644
--- a/reactos/win32ss/user/win32csr/exitros.c
+++ b/reactos/win32ss/user/win32csr/exitros.c
@@ -1,5 +1,4 @@
-/* $Id: exitros.c 58411 2013-03-02 22:22:56Z gadamopoulos $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSRSS subsystem
  * FILE:            subsys/csrss/win32csr/exitros.c
diff --git a/reactos/win32ss/user/win32csr/guiconsole.c b/reactos/win32ss/user/win32csr/guiconsole.c
index af978bb4f99..1db2047ccbe 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.c
+++ b/reactos/win32ss/user/win32csr/guiconsole.c
@@ -1,5 +1,4 @@
-/* $Id: guiconsole.c 57326 2012-09-18 21:45:00Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/guiconsole.c
diff --git a/reactos/win32ss/user/win32csr/guiconsole.h b/reactos/win32ss/user/win32csr/guiconsole.h
index 94220f1f01d..d715883c089 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.h
+++ b/reactos/win32ss/user/win32csr/guiconsole.h
@@ -1,5 +1,4 @@
-/* $Id: guiconsole.h 57326 2012-09-18 21:45:00Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/guiconsole.h
diff --git a/reactos/win32ss/user/win32csr/handle.c b/reactos/win32ss/user/win32csr/handle.c
index f8b004ecc7e..33a654cfa63 100644
--- a/reactos/win32ss/user/win32csr/handle.c
+++ b/reactos/win32ss/user/win32csr/handle.c
@@ -1,5 +1,4 @@
-/* $Id: handle.c 56955 2012-07-23 20:25:11Z tfaber $
- *
+/*
  * reactos/subsys/csrss/api/handle.c
  *
  * CSRSS handle functions
diff --git a/reactos/win32ss/user/win32csr/resource.h b/reactos/win32ss/user/win32csr/resource.h
index 4f505bc68ee..1a210f4413f 100644
--- a/reactos/win32ss/user/win32csr/resource.h
+++ b/reactos/win32ss/user/win32csr/resource.h
@@ -1,5 +1,4 @@
-/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 subsystem
  * FILE:            subsys/csrss/win32csr/resource.h
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.c b/reactos/win32ss/user/win32csr/tuiconsole.c
index 5f773a47204..ceb7ba8e0db 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.c
+++ b/reactos/win32ss/user/win32csr/tuiconsole.c
@@ -1,5 +1,4 @@
-/* $Id: tuiconsole.c 47693 2010-06-08 06:38:14Z jmorlan $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/tuiconsole.c
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.h b/reactos/win32ss/user/win32csr/tuiconsole.h
index 9a2cedf0ca9..c4012bd8107 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.h
+++ b/reactos/win32ss/user/win32csr/tuiconsole.h
@@ -1,5 +1,4 @@
-/* $Id: tuiconsole.h 21947 2006-05-20 10:49:56Z fireball $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/tuiconsole.h
diff --git a/reactos/win32ss/user/win32csr/win32csr.h b/reactos/win32ss/user/win32csr/win32csr.h
index 6ee85dc2b27..9e68a0d46b6 100644
--- a/reactos/win32ss/user/win32csr/win32csr.h
+++ b/reactos/win32ss/user/win32csr/win32csr.h
@@ -1,5 +1,4 @@
-/* $Id: win32csr.h 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/win32csr.h
diff --git a/reactos/win32ss/user/winsrv/dllmain.c b/reactos/win32ss/user/winsrv/dllmain.c
index 5f790bdff77..c31ac89b1b6 100644
--- a/reactos/win32ss/user/winsrv/dllmain.c
+++ b/reactos/win32ss/user/winsrv/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * dllmain.c - ReactOS/Win32 Console+User Enviroment Subsystem Server
  *
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/init.c b/reactos/win32ss/user/winsrv/init.c
index 6a284f446bd..0be57ffd664 100644
--- a/reactos/win32ss/user/winsrv/init.c
+++ b/reactos/win32ss/user/winsrv/init.c
@@ -1,5 +1,4 @@
-/* $Id: init.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  * 
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/server.c b/reactos/win32ss/user/winsrv/server.c
index 22b768e17e5..f3cf32ed825 100644
--- a/reactos/win32ss/user/winsrv/server.c
+++ b/reactos/win32ss/user/winsrv/server.c
@@ -1,5 +1,4 @@
-/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  *
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/winsrv.def b/reactos/win32ss/user/winsrv/winsrv.def
index 4c002090d73..6283e2d10b0 100644
--- a/reactos/win32ss/user/winsrv/winsrv.def
+++ b/reactos/win32ss/user/winsrv/winsrv.def
@@ -1,4 +1,4 @@
-; $Id: winsrv.def 21947 2006-05-20 10:49:56Z fireball $
+
 LIBRARY winsrv.dll
 EXPORTS
 ConServerDllInitialization@8
diff --git a/reactos/win32ss/win32k.rc b/reactos/win32ss/win32k.rc
index 090dca89fcb..476b8d28dcc 100644
--- a/reactos/win32ss/win32k.rc
+++ b/reactos/win32ss/win32k.rc
@@ -1,4 +1,3 @@
-/* $Id: win32k.rc 56311 2012-04-01 20:42:43Z akhaldi $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 GDI KM subsystem\0"

From d0fa8743201497097c0565ae1eac078fc0b166c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 21:04:13 +0000
Subject: [PATCH 34/61] Remove the unneeded $Id$ blabla from the source code.
 (Part 2/N)

svn path=/trunk/; revision=58500
---
 reactos/hal/halppc/generic/display.c       | 3 +--
 reactos/hal/halppc/generic/dma.c           | 3 +--
 reactos/hal/halppc/generic/enum.c          | 3 +--
 reactos/hal/halppc/generic/font.c          | 3 +--
 reactos/hal/halppc/generic/irql.c          | 3 +--
 reactos/hal/halppc/generic/isa.c           | 3 +--
 reactos/hal/halppc/generic/portio.c        | 3 +--
 reactos/hal/halppc/generic/processor.c     | 3 +--
 reactos/hal/halppc/generic/reboot.c        | 3 +--
 reactos/hal/halppc/include/halirq.h        | 3 ---
 reactos/hal/halppc/up/halinit_up.c         | 3 +--
 reactos/hal/halx86/apic/halinit_apic.c     | 3 +--
 reactos/hal/halx86/include/halirq.h        | 3 ---
 reactos/hal/halx86/mp/apic.c               | 3 +--
 reactos/hal/halx86/mp/halinit_mp.c         | 3 +--
 reactos/hal/halx86/mp/ioapic.c             | 3 +--
 reactos/hal/halx86/mp/ipi_mp.c             | 3 +--
 reactos/hal/halx86/mp/mpconfig.c           | 3 +--
 reactos/hal/halx86/mp/processor_mp.c       | 3 +--
 reactos/hal/halx86/up/halinit_mini.c       | 3 +--
 reactos/hal/halx86/up/halinit_up.c         | 3 +--
 reactos/hal/halx86/xbox/halinit_xbox.c     | 3 +--
 reactos/hal/halx86/xbox/halxbox.h          | 3 +--
 reactos/hal/halx86/xbox/part_xbox.c        | 3 +--
 reactos/ntoskrnl/ke/powerpc/ppc_irq.c      | 3 +--
 reactos/subsystems/ntvdm/ntvdm.c           | 3 +--
 reactos/subsystems/ntvdm/ntvdm.rc          | 1 -
 reactos/subsystems/win/basesrv/basesrv.def | 2 +-
 reactos/subsystems/win/basesrv/init.c      | 3 +--
 reactos/subsystems/win/basesrv/main.c      | 3 +--
 reactos/subsystems/win/basesrv/server.c    | 3 +--
 reactos/tools/cdmake/cdmake.c              | 1 -
 reactos/tools/cdmake/llmosrt.c             | 1 -
 reactos/tools/ms2ps/ms2ps.cpp              | 2 +-
 reactos/tools/rgenstat/llmosrt.c           | 1 -
 35 files changed, 29 insertions(+), 66 deletions(-)

diff --git a/reactos/hal/halppc/generic/display.c b/reactos/hal/halppc/generic/display.c
index 9d82553bdc3..42e3cbd5452 100644
--- a/reactos/hal/halppc/generic/display.c
+++ b/reactos/hal/halppc/generic/display.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: display.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/display.c
diff --git a/reactos/hal/halppc/generic/dma.c b/reactos/hal/halppc/generic/dma.c
index 9ba4bbb0546..53935540ab4 100644
--- a/reactos/hal/halppc/generic/dma.c
+++ b/reactos/hal/halppc/generic/dma.c
@@ -1,5 +1,4 @@
-/* $Id: dma.c 24759 2006-11-14 20:59:48Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/dma.c
diff --git a/reactos/hal/halppc/generic/enum.c b/reactos/hal/halppc/generic/enum.c
index af8b06d4a87..2a6ea7ccf58 100644
--- a/reactos/hal/halppc/generic/enum.c
+++ b/reactos/hal/halppc/generic/enum.c
@@ -1,5 +1,4 @@
-/* $Id: enum.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/enum.c
diff --git a/reactos/hal/halppc/generic/font.c b/reactos/hal/halppc/generic/font.c
index 570cc5f1e51..d42794317e2 100644
--- a/reactos/hal/halppc/generic/font.c
+++ b/reactos/hal/halppc/generic/font.c
@@ -1,5 +1,4 @@
-/* $Id: font.c 21840 2006-05-07 18:56:52Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         Xbox HAL
  * FILE:            hal/halx86/xbox/font.h
diff --git a/reactos/hal/halppc/generic/irql.c b/reactos/hal/halppc/generic/irql.c
index 2a3b404f596..77c06f97d43 100644
--- a/reactos/hal/halppc/generic/irql.c
+++ b/reactos/hal/halppc/generic/irql.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/irql.c
diff --git a/reactos/hal/halppc/generic/isa.c b/reactos/hal/halppc/generic/isa.c
index 12d220a7f75..bba345e1839 100644
--- a/reactos/hal/halppc/generic/isa.c
+++ b/reactos/hal/halppc/generic/isa.c
@@ -1,5 +1,4 @@
-/* $Id: isa.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/isa.c
diff --git a/reactos/hal/halppc/generic/portio.c b/reactos/hal/halppc/generic/portio.c
index 0fe52830de2..f5af0d166f8 100644
--- a/reactos/hal/halppc/generic/portio.c
+++ b/reactos/hal/halppc/generic/portio.c
@@ -1,5 +1,4 @@
-/* $Id: portio.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/portio.c
diff --git a/reactos/hal/halppc/generic/processor.c b/reactos/hal/halppc/generic/processor.c
index 155769755f6..1c1d0876faa 100644
--- a/reactos/hal/halppc/generic/processor.c
+++ b/reactos/hal/halppc/generic/processor.c
@@ -1,5 +1,4 @@
-/* $Id: processor.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            hal/halx86/generic/processor.c
diff --git a/reactos/hal/halppc/generic/reboot.c b/reactos/hal/halppc/generic/reboot.c
index b43fd1ead90..cd3a8f37c77 100644
--- a/reactos/hal/halppc/generic/reboot.c
+++ b/reactos/hal/halppc/generic/reboot.c
@@ -1,5 +1,4 @@
-/* $Id: reboot.c 23907 2006-09-04 05:52:23Z arty $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/hal/x86/reboot.c
diff --git a/reactos/hal/halppc/include/halirq.h b/reactos/hal/halppc/include/halirq.h
index c3cc625dca4..e741027db64 100644
--- a/reactos/hal/halppc/include/halirq.h
+++ b/reactos/hal/halppc/include/halirq.h
@@ -1,6 +1,3 @@
-/*
- * $Id: halirq.h 23669 2006-08-23 16:58:43Z ion $
- */
 
 #pragma once
 
diff --git a/reactos/hal/halppc/up/halinit_up.c b/reactos/hal/halppc/up/halinit_up.c
index cbb18bc665e..d151f8baf0a 100644
--- a/reactos/hal/halppc/up/halinit_up.c
+++ b/reactos/hal/halppc/up/halinit_up.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_up.c 24964 2006-11-29 08:28:20Z ion $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          ntoskrnl/hal/x86/halinit.c
diff --git a/reactos/hal/halx86/apic/halinit_apic.c b/reactos/hal/halx86/apic/halinit_apic.c
index c432232e969..5c81231dd31 100644
--- a/reactos/hal/halx86/apic/halinit_apic.c
+++ b/reactos/hal/halx86/apic/halinit_apic.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_up.c 53529 2011-09-02 14:45:19Z tkreuzer $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          ntoskrnl/hal/x86/halinit.c
diff --git a/reactos/hal/halx86/include/halirq.h b/reactos/hal/halx86/include/halirq.h
index 0e2ca932cac..6e68f87f627 100644
--- a/reactos/hal/halx86/include/halirq.h
+++ b/reactos/hal/halx86/include/halirq.h
@@ -1,6 +1,3 @@
-/*
- * $Id: halirq.h 53677 2011-09-10 21:56:07Z tkreuzer $
- */
 
 #pragma once
 
diff --git a/reactos/hal/halx86/mp/apic.c b/reactos/hal/halx86/mp/apic.c
index 0cfa4d2b026..88248e429c3 100644
--- a/reactos/hal/halx86/mp/apic.c
+++ b/reactos/hal/halx86/mp/apic.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: apic.c 45565 2010-02-10 23:24:59Z tkreuzer $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS kernel
  * FILE:        hal/halx86/mp/apic.c
diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c
index c202cec1c01..5c1bc28c44f 100644
--- a/reactos/hal/halx86/mp/halinit_mp.c
+++ b/reactos/hal/halx86/mp/halinit_mp.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_mp.c 53675 2011-09-10 18:58:01Z tkreuzer $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          hal/halx86/mp/halinit_mp.c
diff --git a/reactos/hal/halx86/mp/ioapic.c b/reactos/hal/halx86/mp/ioapic.c
index 15710d93534..bc99c7626a1 100644
--- a/reactos/hal/halx86/mp/ioapic.c
+++ b/reactos/hal/halx86/mp/ioapic.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS kernel
  * FILE:                  hal/halx86/mp/ioapic.c
diff --git a/reactos/hal/halx86/mp/ipi_mp.c b/reactos/hal/halx86/mp/ipi_mp.c
index 025914058ec..ca0eae46cf7 100644
--- a/reactos/hal/halx86/mp/ipi_mp.c
+++ b/reactos/hal/halx86/mp/ipi_mp.c
@@ -1,5 +1,4 @@
-/* $Id: ipi_mp.c 45020 2010-01-09 22:43:16Z ekohl $
- *
+/*
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS kernel
  * FILE:                  hal/halx86/mp/ipi_mp.c
diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c
index 42e2ac36a47..6f3c5dff590 100644
--- a/reactos/hal/halx86/mp/mpconfig.c
+++ b/reactos/hal/halx86/mp/mpconfig.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:             See COPYING in the top level directory
  * PROJECT:               ReactOS kernel
  * FILE:                  hal/halx86/mp/mpconfig.c
diff --git a/reactos/hal/halx86/mp/processor_mp.c b/reactos/hal/halx86/mp/processor_mp.c
index 0f612c1bb55..51607b126ee 100644
--- a/reactos/hal/halx86/mp/processor_mp.c
+++ b/reactos/hal/halx86/mp/processor_mp.c
@@ -1,5 +1,4 @@
-/* $Id: processor_mp.c 47674 2010-06-07 20:37:19Z sir_richard $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            hal/halx86/mp/processor_mp.c
diff --git a/reactos/hal/halx86/up/halinit_mini.c b/reactos/hal/halx86/up/halinit_mini.c
index 7b349e42c6e..35939241029 100644
--- a/reactos/hal/halx86/up/halinit_mini.c
+++ b/reactos/hal/halx86/up/halinit_mini.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_up.c 53529 2011-09-02 14:45:19Z tkreuzer $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          ntoskrnl/hal/x86/halinit.c
diff --git a/reactos/hal/halx86/up/halinit_up.c b/reactos/hal/halx86/up/halinit_up.c
index 8318ec0bb66..a2170a8b36e 100644
--- a/reactos/hal/halx86/up/halinit_up.c
+++ b/reactos/hal/halx86/up/halinit_up.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_up.c 53675 2011-09-10 18:58:01Z tkreuzer $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          ntoskrnl/hal/x86/halinit.c
diff --git a/reactos/hal/halx86/xbox/halinit_xbox.c b/reactos/hal/halx86/xbox/halinit_xbox.c
index 39d2cb6c397..1cb9f63555c 100644
--- a/reactos/hal/halx86/xbox/halinit_xbox.c
+++ b/reactos/hal/halx86/xbox/halinit_xbox.c
@@ -1,5 +1,4 @@
-/* $Id: halinit_xbox.c 53675 2011-09-10 18:58:01Z tkreuzer $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          ntoskrnl/hal/x86/halinit.c
diff --git a/reactos/hal/halx86/xbox/halxbox.h b/reactos/hal/halx86/xbox/halxbox.h
index d0704368c17..b27c6e31c23 100644
--- a/reactos/hal/halx86/xbox/halxbox.h
+++ b/reactos/hal/halx86/xbox/halxbox.h
@@ -1,5 +1,4 @@
-/* $Id: halxbox.h 56228 2012-03-25 16:57:10Z sginsberg $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         Xbox HAL
  * FILE:            hal/halx86/xbox/halxbox.h
diff --git a/reactos/hal/halx86/xbox/part_xbox.c b/reactos/hal/halx86/xbox/part_xbox.c
index 2d8e8c01489..261dbe40e16 100644
--- a/reactos/hal/halx86/xbox/part_xbox.c
+++ b/reactos/hal/halx86/xbox/part_xbox.c
@@ -1,5 +1,4 @@
-/* $Id: part_xbox.c 43124 2009-09-23 20:59:08Z hpoussin $
- *
+/*
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
  * FILE:          hal/halx86/xbox/part_xbox.c
diff --git a/reactos/ntoskrnl/ke/powerpc/ppc_irq.c b/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
index cbdbc77b15b..1b273ca31ae 100644
--- a/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
+++ b/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/i386/irq.c
diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c
index 11b14ba291e..29cf5734bd2 100644
--- a/reactos/subsystems/ntvdm/ntvdm.c
+++ b/reactos/subsystems/ntvdm/ntvdm.c
@@ -1,5 +1,4 @@
-/* $Id: ntvdm.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            subsys/ntvdm/ntvdm->c
diff --git a/reactos/subsystems/ntvdm/ntvdm.rc b/reactos/subsystems/ntvdm/ntvdm.rc
index 52030f99b8e..7a60799929e 100644
--- a/reactos/subsystems/ntvdm/ntvdm.rc
+++ b/reactos/subsystems/ntvdm/ntvdm.rc
@@ -1,4 +1,3 @@
-/* $Id: ntvdm.rc 27460 2007-07-08 10:19:12Z cfinck $ */
 
 #include <windows.h>
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Virtual DOS Machine\0"
diff --git a/reactos/subsystems/win/basesrv/basesrv.def b/reactos/subsystems/win/basesrv/basesrv.def
index 1a140b2f71c..1b11aba6945 100644
--- a/reactos/subsystems/win/basesrv/basesrv.def
+++ b/reactos/subsystems/win/basesrv/basesrv.def
@@ -1,4 +1,4 @@
-; $Id: basesrv.def 21947 2006-05-20 10:49:56Z fireball $
+
 LIBRARY basesrv.dll
 EXPORTS
 BaseSetProcessCreateNotify@4
diff --git a/reactos/subsystems/win/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c
index 06d11661849..9cc86024093 100644
--- a/reactos/subsystems/win/basesrv/init.c
+++ b/reactos/subsystems/win/basesrv/init.c
@@ -1,5 +1,4 @@
-/* $Id: init.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * init.c - ReactOS/Win32 base enviroment subsystem server
  *
  * ReactOS Operating System
diff --git a/reactos/subsystems/win/basesrv/main.c b/reactos/subsystems/win/basesrv/main.c
index 48fb97b3053..71a220b710e 100644
--- a/reactos/subsystems/win/basesrv/main.c
+++ b/reactos/subsystems/win/basesrv/main.c
@@ -1,5 +1,4 @@
-/* $Id: main.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * dllmain.c - ReactOS/Win32 base enviroment subsystem server
  *
  * ReactOS Operating System
diff --git a/reactos/subsystems/win/basesrv/server.c b/reactos/subsystems/win/basesrv/server.c
index 34ac5978d55..599576f0444 100644
--- a/reactos/subsystems/win/basesrv/server.c
+++ b/reactos/subsystems/win/basesrv/server.c
@@ -1,5 +1,4 @@
-/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * server.c - ReactOS/Win32 base enviroment subsystem server
  *
  * ReactOS Operating System
diff --git a/reactos/tools/cdmake/cdmake.c b/reactos/tools/cdmake/cdmake.c
index 558d67f653b..622226b78cc 100644
--- a/reactos/tools/cdmake/cdmake.c
+++ b/reactos/tools/cdmake/cdmake.c
@@ -22,7 +22,6 @@
  * convert long filename to iso9660 file name by Magnus Olsen
  * magnus@greatlord.com
  *
- * $Id: cdmake.c 58431 2013-03-05 08:07:21Z tkreuzer $
  */
 
 /* According to his website, this file was released into the public domain by Phillip J. Erdelsky */
diff --git a/reactos/tools/cdmake/llmosrt.c b/reactos/tools/cdmake/llmosrt.c
index 7085d9a5731..bc78a10c1c0 100644
--- a/reactos/tools/cdmake/llmosrt.c
+++ b/reactos/tools/cdmake/llmosrt.c
@@ -1,4 +1,3 @@
-/* $Id: llmosrt.c 21352 2006-03-19 18:18:15Z peterw $ */
 /* A Linked-List Memory Sort
    by Philip J. Erdelsky
    pje@acm.org
diff --git a/reactos/tools/ms2ps/ms2ps.cpp b/reactos/tools/ms2ps/ms2ps.cpp
index e683805beac..2a1ef3b53ff 100644
--- a/reactos/tools/ms2ps/ms2ps.cpp
+++ b/reactos/tools/ms2ps/ms2ps.cpp
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: ms2ps.cpp 43790 2009-10-27 10:34:16Z dgorbachev $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS seh conversion tool
  * FILE:            tools/ms2ps/ms2ps.cpp
diff --git a/reactos/tools/rgenstat/llmosrt.c b/reactos/tools/rgenstat/llmosrt.c
index fb1a9380cda..bc78a10c1c0 100644
--- a/reactos/tools/rgenstat/llmosrt.c
+++ b/reactos/tools/rgenstat/llmosrt.c
@@ -1,4 +1,3 @@
-/* $Id: llmosrt.c 51374 2011-04-17 09:50:07Z mkupfer $ */
 /* A Linked-List Memory Sort
    by Philip J. Erdelsky
    pje@acm.org

From c94bff6b2e06910de5c3d85312c35325ebf23a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Thu, 14 Mar 2013 22:21:37 +0000
Subject: [PATCH 35/61] Remove the unneeded $Id$ blabla from the source code,
 but not in 3rd party code. (Part 3/N)

svn path=/trunk/; revision=58501
---
 reactos/lib/epsapi/enum/drivers.c             |  2 --
 reactos/lib/epsapi/enum/modules.c             |  2 --
 reactos/lib/epsapi/enum/processes.c           |  2 --
 reactos/lib/fslib/vfatlib/check/vfat.h        |  1 -
 reactos/lib/sdk/crt/except/i386/chkstk_asm.s  |  3 +-
 .../lib/sdk/crt/except/powerpc/chkstk_asm.s   |  3 +-
 reactos/lib/sdk/crt/math/adjust.c             |  3 --
 reactos/lib/sdk/crt/mem/i386/memchr_asm.s     |  3 +-
 reactos/lib/sdk/crt/mem/i386/memset_asm.s     |  3 --
 reactos/lib/sdk/crt/mem/memccpy.c             | 29 +++++++++----------
 reactos/lib/sdk/crt/mem/memchr.c              | 21 ++++++--------
 reactos/lib/sdk/crt/mem/memcmp.c              |  5 +---
 reactos/lib/sdk/crt/mem/memset.c              | 17 +++++------
 reactos/lib/sdk/crt/setjmp/i386/setjmp.s      |  3 +-
 reactos/lib/sdk/crt/stdlib/makepath.c         |  2 --
 reactos/lib/sdk/crt/stdlib/wmakpath.c         |  2 --
 reactos/lib/sdk/crt/string/i386/strcat_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/strchr_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/strcmp_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/strcpy_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/strlen_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/strncat_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/strncmp_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/strncpy_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/strnlen_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/strrchr_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/tchar.h       |  2 --
 reactos/lib/sdk/crt/string/i386/tcscat.inc    |  2 --
 reactos/lib/sdk/crt/string/i386/tcschr.inc    |  2 --
 reactos/lib/sdk/crt/string/i386/tcscmp.inc    |  2 --
 reactos/lib/sdk/crt/string/i386/tcscpy.inc    |  2 --
 reactos/lib/sdk/crt/string/i386/tcslen.inc    |  2 --
 reactos/lib/sdk/crt/string/i386/tcsncat.inc   |  2 --
 reactos/lib/sdk/crt/string/i386/tcsncmp.inc   |  2 --
 reactos/lib/sdk/crt/string/i386/tcsncpy.inc   |  2 --
 reactos/lib/sdk/crt/string/i386/tcsnlen.inc   |  2 --
 reactos/lib/sdk/crt/string/i386/tcsrchr.inc   |  2 --
 reactos/lib/sdk/crt/string/i386/wcscat_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/wcschr_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/wcscmp_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/wcscpy_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/wcslen_asm.s  |  2 --
 reactos/lib/sdk/crt/string/i386/wcsncat_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s |  2 --
 reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s |  2 --
 reactos/lib/sdk/crt/string/strcat.c           |  2 --
 reactos/lib/sdk/crt/string/strchr.c           |  2 --
 reactos/lib/sdk/crt/string/strcmp.c           |  2 --
 reactos/lib/sdk/crt/string/strcpy.c           |  2 --
 reactos/lib/sdk/crt/string/strcspn.c          |  2 --
 reactos/lib/sdk/crt/string/strlen.c           |  2 --
 reactos/lib/sdk/crt/string/strncat.c          |  2 --
 reactos/lib/sdk/crt/string/strncmp.c          |  2 --
 reactos/lib/sdk/crt/string/strncpy.c          |  3 +-
 reactos/lib/sdk/crt/string/strnlen.c          |  2 --
 reactos/lib/sdk/crt/string/strpbrk.c          |  4 +--
 reactos/lib/sdk/crt/string/strrchr.c          |  2 --
 reactos/lib/sdk/crt/string/strspn.c           |  2 --
 reactos/lib/sdk/crt/string/strxspn.h          |  2 --
 reactos/lib/sdk/crt/string/tcscat.h           |  2 --
 reactos/lib/sdk/crt/string/tcschr.h           |  2 --
 reactos/lib/sdk/crt/string/tcscmp.h           |  2 --
 reactos/lib/sdk/crt/string/tcscpy.h           |  2 --
 reactos/lib/sdk/crt/string/tcslen.h           |  2 --
 reactos/lib/sdk/crt/string/tcsncat.h          |  2 --
 reactos/lib/sdk/crt/string/tcsncmp.h          |  2 --
 reactos/lib/sdk/crt/string/tcsncpy.h          |  2 --
 reactos/lib/sdk/crt/string/tcsnlen.h          |  2 --
 reactos/lib/sdk/crt/string/tcsrchr.h          |  2 --
 reactos/lib/sdk/crt/string/wcscat.c           |  2 --
 reactos/lib/sdk/crt/string/wcschr.c           |  2 --
 reactos/lib/sdk/crt/string/wcscmp.c           |  2 --
 reactos/lib/sdk/crt/string/wcscpy.c           |  2 --
 reactos/lib/sdk/crt/string/wcslen.c           |  2 --
 reactos/lib/sdk/crt/string/wcsncat.c          |  2 --
 reactos/lib/sdk/crt/string/wcsncmp.c          |  2 --
 reactos/lib/sdk/crt/string/wcsncpy.c          |  2 --
 reactos/lib/sdk/crt/string/wcsnlen.c          |  2 --
 reactos/lib/sdk/crt/string/wcsrchr.c          |  2 --
 reactos/lib/sdk/crt/string/witow.c            |  3 +-
 reactos/lib/smlib/compses.c                   |  3 +-
 reactos/lib/smlib/connect.c                   |  3 +-
 reactos/lib/smlib/execpgm.c                   |  3 +-
 reactos/lib/smlib/lookupss.c                  |  3 +-
 86 files changed, 41 insertions(+), 208 deletions(-)

diff --git a/reactos/lib/epsapi/enum/drivers.c b/reactos/lib/epsapi/enum/drivers.c
index 52af504ff3a..fa87c5418c2 100644
--- a/reactos/lib/epsapi/enum/drivers.c
+++ b/reactos/lib/epsapi/enum/drivers.c
@@ -1,5 +1,3 @@
-/* $Id: drivers.c 52985 2011-07-28 16:21:48Z akhaldi $
-*/
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
diff --git a/reactos/lib/epsapi/enum/modules.c b/reactos/lib/epsapi/enum/modules.c
index f017af963dc..8cfc2bf5f85 100644
--- a/reactos/lib/epsapi/enum/modules.c
+++ b/reactos/lib/epsapi/enum/modules.c
@@ -1,5 +1,3 @@
-/* $Id: modules.c 52985 2011-07-28 16:21:48Z akhaldi $
-*/
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
diff --git a/reactos/lib/epsapi/enum/processes.c b/reactos/lib/epsapi/enum/processes.c
index e1588cd94ea..089130554af 100644
--- a/reactos/lib/epsapi/enum/processes.c
+++ b/reactos/lib/epsapi/enum/processes.c
@@ -1,5 +1,3 @@
-/* $Id: processes.c 52985 2011-07-28 16:21:48Z akhaldi $
-*/
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
diff --git a/reactos/lib/fslib/vfatlib/check/vfat.h b/reactos/lib/fslib/vfatlib/check/vfat.h
index 1aecfba279a..a7536c9905e 100644
--- a/reactos/lib/fslib/vfatlib/check/vfat.h
+++ b/reactos/lib/fslib/vfatlib/check/vfat.h
@@ -1,4 +1,3 @@
-/* $Id: vfat.h 16656 2005-07-20 02:52:52Z ion $ */
 
 #include <ddk/ntifs.h>
 #include <ddk/ntdddisk.h>
diff --git a/reactos/lib/sdk/crt/except/i386/chkstk_asm.s b/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
index 56c1507b301..5508611bdb7 100644
--- a/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
+++ b/reactos/lib/sdk/crt/except/i386/chkstk_asm.s
@@ -1,5 +1,4 @@
-/* $Id: chkstk_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Stack checker
diff --git a/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s b/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s
index 653fec4dd07..67b726800e6 100644
--- a/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s
+++ b/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s
@@ -1,5 +1,4 @@
-/* $Id: chkstk_asm.s 26099 2007-03-14 20:30:32Z ion $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Stack checker
diff --git a/reactos/lib/sdk/crt/math/adjust.c b/reactos/lib/sdk/crt/math/adjust.c
index 907def473c4..dcffa5f7237 100644
--- a/reactos/lib/sdk/crt/math/adjust.c
+++ b/reactos/lib/sdk/crt/math/adjust.c
@@ -1,6 +1,3 @@
-/* $Id: adjust.c 22022 2006-05-24 20:50:55Z greatlrd $
- *
- */
 
 int _adjust_fdiv = 0;
 
diff --git a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
index 95d9d55998b..37e5deb9f52 100644
--- a/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memchr_asm.s
@@ -1,5 +1,4 @@
-/* $Id: memchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            lib/sdk/crt/mem/i386/memchr.s
diff --git a/reactos/lib/sdk/crt/mem/i386/memset_asm.s b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
index 949c2ef0a9f..dc964ac3969 100644
--- a/reactos/lib/sdk/crt/mem/i386/memset_asm.s
+++ b/reactos/lib/sdk/crt/mem/i386/memset_asm.s
@@ -1,6 +1,3 @@
-/* 
- * $Id: memset_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include <asm.inc>
 #include <ks386.inc>
diff --git a/reactos/lib/sdk/crt/mem/memccpy.c b/reactos/lib/sdk/crt/mem/memccpy.c
index d8a02156139..f819b399c68 100644
--- a/reactos/lib/sdk/crt/mem/memccpy.c
+++ b/reactos/lib/sdk/crt/mem/memccpy.c
@@ -1,6 +1,3 @@
-/*
- * $Id: memccpy.c 30288 2007-11-09 11:22:29Z fireball $
- */
 
 #include <string.h>
 
@@ -8,18 +5,18 @@
 void *
 _memccpy (void *to, const void *from,int c,size_t count)
 {
-  char t;
-  size_t i;
-  char *dst=(char*)to;
-  const char *src=(const char*)from;
+    char t;
+    size_t i;
+    char *dst=(char*)to;
+    const char *src=(const char*)from;
 
-  for ( i = 0; i < count; i++ )
-  {
-    dst[i] = t = src[i];
-    if ( t == '\0' )
-      break;
-    if ( t == c )
-      return &dst[i+1];
-  }
-  return NULL; /* didn't copy c */
+    for ( i = 0; i < count; i++ )
+    {
+        dst[i] = t = src[i];
+        if ( t == '\0' )
+            break;
+        if ( t == c )
+            return &dst[i+1];
+    }
+    return NULL; /* didn't copy c */
 }
diff --git a/reactos/lib/sdk/crt/mem/memchr.c b/reactos/lib/sdk/crt/mem/memchr.c
index a0261d4fcc5..47be47effc9 100644
--- a/reactos/lib/sdk/crt/mem/memchr.c
+++ b/reactos/lib/sdk/crt/mem/memchr.c
@@ -1,18 +1,15 @@
-/*
- * $Id: memchr.c 30266 2007-11-08 10:54:42Z fireball $
- */
 
 #include <string.h>
 
 void* memchr(const void *s, int c, size_t n)
 {
-  if (n)
-  {
-    const char *p = s;
-    do {
-      if (*p++ == c)
-	return (void *)(p-1);
-    } while (--n != 0);
-  }
-  return 0;
+    if (n)
+    {
+        const char *p = s;
+        do {
+            if (*p++ == c)
+                return (void *)(p-1);
+        } while (--n != 0);
+    }
+    return 0;
 }
diff --git a/reactos/lib/sdk/crt/mem/memcmp.c b/reactos/lib/sdk/crt/mem/memcmp.c
index 959402650ad..4b3a8354174 100644
--- a/reactos/lib/sdk/crt/mem/memcmp.c
+++ b/reactos/lib/sdk/crt/mem/memcmp.c
@@ -1,6 +1,3 @@
-/*
- * $Id: memcmp.c 50647 2011-02-10 11:35:05Z tkreuzer $
- */
 
 #include <string.h>
 
@@ -15,7 +12,7 @@ int memcmp(const void *s1, const void *s2, size_t n)
         const unsigned char *p1 = s1, *p2 = s2;
         do {
             if (*p1++ != *p2++)
-	            return (*--p1 - *--p2);
+                return (*--p1 - *--p2);
         } while (--n != 0);
     }
     return 0;
diff --git a/reactos/lib/sdk/crt/mem/memset.c b/reactos/lib/sdk/crt/mem/memset.c
index 09bb66a7894..60ad45a9296 100644
--- a/reactos/lib/sdk/crt/mem/memset.c
+++ b/reactos/lib/sdk/crt/mem/memset.c
@@ -1,17 +1,14 @@
-/*
- * $Id: memset.c 30266 2007-11-08 10:54:42Z fireball $
- */
 
 #include <string.h>
 
 void* memset(void* src, int val, size_t count)
 {
-	char *char_src = (char *)src;
+    char *char_src = (char *)src;
 
-	while(count>0) {
-		*char_src = val;
-		char_src++;
-		count--;
-	}
-	return src;
+    while(count>0) {
+        *char_src = val;
+        char_src++;
+        count--;
+    }
+    return src;
 }
diff --git a/reactos/lib/sdk/crt/setjmp/i386/setjmp.s b/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
index 470b67914fb..6c165dfc53d 100644
--- a/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
+++ b/reactos/lib/sdk/crt/setjmp/i386/setjmp.s
@@ -1,5 +1,4 @@
-/* $Id: setjmp.s 49836 2010-11-28 09:53:22Z tkreuzer $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
  * PURPOSE:           Implementation of _setjmp/longjmp
diff --git a/reactos/lib/sdk/crt/stdlib/makepath.c b/reactos/lib/sdk/crt/stdlib/makepath.c
index 43c16b9f9b9..1e40e10e5a9 100644
--- a/reactos/lib/sdk/crt/stdlib/makepath.c
+++ b/reactos/lib/sdk/crt/stdlib/makepath.c
@@ -11,8 +11,6 @@
  *
  */
 
-/* $Id: makepath.c 53713 2011-09-15 17:11:53Z tkreuzer $
- */
 #include <precomp.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/stdlib/wmakpath.c b/reactos/lib/sdk/crt/stdlib/wmakpath.c
index 2da0c92cd71..156d8704a2d 100644
--- a/reactos/lib/sdk/crt/stdlib/wmakpath.c
+++ b/reactos/lib/sdk/crt/stdlib/wmakpath.c
@@ -11,8 +11,6 @@
  *
  */
 
-/* $Id: wmakpath.c 53713 2011-09-15 17:11:53Z tkreuzer $
- */
 #include <precomp.h>
 
 /*
diff --git a/reactos/lib/sdk/crt/string/i386/strcat_asm.s b/reactos/lib/sdk/crt/string/i386/strcat_asm.s
index 183035e272e..f04fb4bb6dc 100644
--- a/reactos/lib/sdk/crt/string/i386/strcat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcat_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strcat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcscat.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strchr_asm.s b/reactos/lib/sdk/crt/string/i386/strchr_asm.s
index 4d4dcb1a65e..f837a938bd2 100644
--- a/reactos/lib/sdk/crt/string/i386/strchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strchr_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcschr.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strcmp_asm.s b/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
index 1a57d43dad3..2afef2d0c35 100644
--- a/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcmp_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strcmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcscmp.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strcpy_asm.s b/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
index a9387e47f23..22b71a92ea5 100644
--- a/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strcpy_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strcpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcscpy.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strlen_asm.s b/reactos/lib/sdk/crt/string/i386/strlen_asm.s
index 6715afed07d..821c27d62e8 100644
--- a/reactos/lib/sdk/crt/string/i386/strlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strlen_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcslen.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strncat_asm.s b/reactos/lib/sdk/crt/string/i386/strncat_asm.s
index 1ed59d89e70..7a479b77ef4 100644
--- a/reactos/lib/sdk/crt/string/i386/strncat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncat_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strncat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcsncat.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strncmp_asm.s b/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
index fa1b0455331..14c9a29c086 100644
--- a/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncmp_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strncmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcsncmp.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strncpy_asm.s b/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
index eda19d058af..e62470a317a 100644
--- a/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strncpy_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strncpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcsncpy.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strnlen_asm.s b/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
index 30983971dc1..28db26f37e2 100644
--- a/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strnlen_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strnlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcsnlen.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/strrchr_asm.s b/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
index 8d6ddb5de3d..0c27b47dae5 100644
--- a/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/strrchr_asm.s
@@ -1,5 +1,3 @@
-/* $Id: strrchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #include "tcsrchr.inc"
 
diff --git a/reactos/lib/sdk/crt/string/i386/tchar.h b/reactos/lib/sdk/crt/string/i386/tchar.h
index 6b2a40ab2e1..fd3c361fdd0 100644
--- a/reactos/lib/sdk/crt/string/i386/tchar.h
+++ b/reactos/lib/sdk/crt/string/i386/tchar.h
@@ -1,5 +1,3 @@
-/* $Id: tchar.h 53439 2011-08-25 09:34:26Z tkreuzer $
- */
 
 #ifndef __TCHAR_INC_S__
 #define __TCHAR_INC_S__
diff --git a/reactos/lib/sdk/crt/string/i386/tcscat.inc b/reactos/lib/sdk/crt/string/i386/tcscat.inc
index d587128f447..bc709f7e264 100644
--- a/reactos/lib/sdk/crt/string/i386/tcscat.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcscat.inc
@@ -1,5 +1,3 @@
-/* $Id: tcscat.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcschr.inc b/reactos/lib/sdk/crt/string/i386/tcschr.inc
index 9554ac3cbcd..8e7184f7dda 100644
--- a/reactos/lib/sdk/crt/string/i386/tcschr.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcschr.inc
@@ -1,5 +1,3 @@
-/* $Id: tcschr.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcscmp.inc b/reactos/lib/sdk/crt/string/i386/tcscmp.inc
index 3bcf453e7b7..7331dbb24f9 100644
--- a/reactos/lib/sdk/crt/string/i386/tcscmp.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcscmp.inc
@@ -1,5 +1,3 @@
-/* $Id: tcscmp.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcscpy.inc b/reactos/lib/sdk/crt/string/i386/tcscpy.inc
index 6b5086f40f8..797771dc223 100644
--- a/reactos/lib/sdk/crt/string/i386/tcscpy.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcscpy.inc
@@ -1,5 +1,3 @@
-/* $Id: tcscpy.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcslen.inc b/reactos/lib/sdk/crt/string/i386/tcslen.inc
index f749b9d88c4..c1304cc3e93 100644
--- a/reactos/lib/sdk/crt/string/i386/tcslen.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcslen.inc
@@ -1,5 +1,3 @@
-/* $Id: tcslen.inc 49591 2010-11-15 01:29:12Z tkreuzer $
-*/
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcsncat.inc b/reactos/lib/sdk/crt/string/i386/tcsncat.inc
index b03bb87785f..a25df29eb16 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsncat.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsncat.inc
@@ -1,5 +1,3 @@
-/* $Id: tcsncat.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcsncmp.inc b/reactos/lib/sdk/crt/string/i386/tcsncmp.inc
index 9545e583bec..ce8fdf8110f 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsncmp.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsncmp.inc
@@ -1,5 +1,3 @@
-/* $Id: tcsncmp.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcsncpy.inc b/reactos/lib/sdk/crt/string/i386/tcsncpy.inc
index 248c5ce9a20..9d021d4ee80 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsncpy.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsncpy.inc
@@ -1,5 +1,3 @@
-/* $Id: tcsncpy.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcsnlen.inc b/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
index fc72607adb2..59827783abd 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsnlen.inc
@@ -1,5 +1,3 @@
-/* $Id: tcsnlen.inc 49591 2010-11-15 01:29:12Z tkreuzer $
-*/
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/tcsrchr.inc b/reactos/lib/sdk/crt/string/i386/tcsrchr.inc
index 9527853122a..84c759895d4 100644
--- a/reactos/lib/sdk/crt/string/i386/tcsrchr.inc
+++ b/reactos/lib/sdk/crt/string/i386/tcsrchr.inc
@@ -1,5 +1,3 @@
-/* $Id: tcsrchr.inc 49591 2010-11-15 01:29:12Z tkreuzer $
- */
 
 #include "tchar.h"
 #include <asm.inc>
diff --git a/reactos/lib/sdk/crt/string/i386/wcscat_asm.s b/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
index d8edb2bd438..0d9b2f95b7f 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscat_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcscat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcscat.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcschr_asm.s b/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
index c0733a5f14b..51b5cfd9fc6 100644
--- a/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcschr_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcschr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcschr.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s b/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
index 167e0dc9bd7..752f5e355f5 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcscmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcscmp.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s b/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
index 6468a10919d..604b58a0bc8 100644
--- a/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcscpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcscpy.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcslen_asm.s b/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
index 02a24b61be7..f7f8d0d8672 100644
--- a/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcslen_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcslen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcslen.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
index caa864bf10a..5911c28652f 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcsncat_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcsncat.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
index 7f3878ef979..7997ec31a85 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcsncmp_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcsncmp.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s b/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
index d97e0114744..abc040efbdd 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcsncpy_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcsncpy.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s b/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
index 48827ef4c74..ca05841ce74 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcsnlen_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcsnlen.inc"
diff --git a/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s b/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
index c38b8e320ef..75d39c9ac94 100644
--- a/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
+++ b/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s
@@ -1,5 +1,3 @@
-/* $Id: wcsrchr_asm.s 49826 2010-11-27 22:12:15Z tkreuzer $
- */
 
 #define _UNICODE
 #include "tcsrchr.inc"
diff --git a/reactos/lib/sdk/crt/string/strcat.c b/reactos/lib/sdk/crt/string/strcat.c
index 698ccbf9133..7507ebce06b 100644
--- a/reactos/lib/sdk/crt/string/strcat.c
+++ b/reactos/lib/sdk/crt/string/strcat.c
@@ -1,5 +1,3 @@
-/* $Id: strcat.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcscat.h"
diff --git a/reactos/lib/sdk/crt/string/strchr.c b/reactos/lib/sdk/crt/string/strchr.c
index eb4e77a55b0..ce6804f0944 100644
--- a/reactos/lib/sdk/crt/string/strchr.c
+++ b/reactos/lib/sdk/crt/string/strchr.c
@@ -1,5 +1,3 @@
-/* $Id: strchr.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _XINT int
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strcmp.c b/reactos/lib/sdk/crt/string/strcmp.c
index cf89b07b691..9ca05ce7161 100644
--- a/reactos/lib/sdk/crt/string/strcmp.c
+++ b/reactos/lib/sdk/crt/string/strcmp.c
@@ -1,5 +1,3 @@
-/* $Id: strcmp.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcscmp.h"
diff --git a/reactos/lib/sdk/crt/string/strcpy.c b/reactos/lib/sdk/crt/string/strcpy.c
index d5c98627a16..bbeb6110e42 100644
--- a/reactos/lib/sdk/crt/string/strcpy.c
+++ b/reactos/lib/sdk/crt/string/strcpy.c
@@ -1,5 +1,3 @@
-/* $Id: strcpy.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcscpy.h"
diff --git a/reactos/lib/sdk/crt/string/strcspn.c b/reactos/lib/sdk/crt/string/strcspn.c
index 2cb7a556374..7fc3c53132b 100644
--- a/reactos/lib/sdk/crt/string/strcspn.c
+++ b/reactos/lib/sdk/crt/string/strcspn.c
@@ -1,5 +1,3 @@
-/* $Id: strcspn.c 30291 2007-11-09 12:20:16Z fireball $
- */
 
 #define _x(_X_) (_X_)
 #define _strxspn strcspn
diff --git a/reactos/lib/sdk/crt/string/strlen.c b/reactos/lib/sdk/crt/string/strlen.c
index 2df72aa277e..131835ff91c 100644
--- a/reactos/lib/sdk/crt/string/strlen.c
+++ b/reactos/lib/sdk/crt/string/strlen.c
@@ -1,5 +1,3 @@
-/* $Id: strlen.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcslen.h"
diff --git a/reactos/lib/sdk/crt/string/strncat.c b/reactos/lib/sdk/crt/string/strncat.c
index b076851377c..6fa1dacd016 100644
--- a/reactos/lib/sdk/crt/string/strncat.c
+++ b/reactos/lib/sdk/crt/string/strncat.c
@@ -1,5 +1,3 @@
-/* $Id: strncat.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcsncat.h"
diff --git a/reactos/lib/sdk/crt/string/strncmp.c b/reactos/lib/sdk/crt/string/strncmp.c
index b1dd599a5de..b47feafb73c 100644
--- a/reactos/lib/sdk/crt/string/strncmp.c
+++ b/reactos/lib/sdk/crt/string/strncmp.c
@@ -1,5 +1,3 @@
-/* $Id: strncmp.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcsncmp.h"
diff --git a/reactos/lib/sdk/crt/string/strncpy.c b/reactos/lib/sdk/crt/string/strncpy.c
index b00a3de214d..6961eda4f4a 100644
--- a/reactos/lib/sdk/crt/string/strncpy.c
+++ b/reactos/lib/sdk/crt/string/strncpy.c
@@ -1,5 +1,4 @@
-/* $Id: strncpy.c 30283 2007-11-08 21:06:20Z fireball $
- */
+
 #include <string.h>
 #include "tcsncpy.h"
 
diff --git a/reactos/lib/sdk/crt/string/strnlen.c b/reactos/lib/sdk/crt/string/strnlen.c
index 5228b498cea..3126d51272f 100644
--- a/reactos/lib/sdk/crt/string/strnlen.c
+++ b/reactos/lib/sdk/crt/string/strnlen.c
@@ -1,5 +1,3 @@
-/* $Id: strnlen.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <string.h>
 #include "tcsnlen.h"
diff --git a/reactos/lib/sdk/crt/string/strpbrk.c b/reactos/lib/sdk/crt/string/strpbrk.c
index dc05fbc8c78..083fc611ea6 100644
--- a/reactos/lib/sdk/crt/string/strpbrk.c
+++ b/reactos/lib/sdk/crt/string/strpbrk.c
@@ -1,6 +1,4 @@
-/*
- * $Id$
- */
+
 #include <limits.h>
 #include <string.h>
 
diff --git a/reactos/lib/sdk/crt/string/strrchr.c b/reactos/lib/sdk/crt/string/strrchr.c
index 7ba3657216d..9ef39c12b28 100644
--- a/reactos/lib/sdk/crt/string/strrchr.c
+++ b/reactos/lib/sdk/crt/string/strrchr.c
@@ -1,5 +1,3 @@
-/* $Id: strrchr.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _XINT int
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/strspn.c b/reactos/lib/sdk/crt/string/strspn.c
index 20f8dfe91c0..e1c446191cf 100644
--- a/reactos/lib/sdk/crt/string/strspn.c
+++ b/reactos/lib/sdk/crt/string/strspn.c
@@ -1,5 +1,3 @@
-/* $Id: strspn.c 30291 2007-11-09 12:20:16Z fireball $
- */
 
 #define _x(_X_) (!(_X_))
 #define _strxspn strspn
diff --git a/reactos/lib/sdk/crt/string/strxspn.h b/reactos/lib/sdk/crt/string/strxspn.h
index 98e3a9c65b3..1da43d34b1d 100644
--- a/reactos/lib/sdk/crt/string/strxspn.h
+++ b/reactos/lib/sdk/crt/string/strxspn.h
@@ -1,5 +1,3 @@
-/* $Id: strxspn.h 30291 2007-11-09 12:20:16Z fireball $
- */
 
 #include <limits.h>
 #include <string.h>
diff --git a/reactos/lib/sdk/crt/string/tcscat.h b/reactos/lib/sdk/crt/string/tcscat.h
index d9d0ba3fa17..1c45439c484 100644
--- a/reactos/lib/sdk/crt/string/tcscat.h
+++ b/reactos/lib/sdk/crt/string/tcscat.h
@@ -1,5 +1,3 @@
-/* $Id: tcscat.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <tchar.h>
 
diff --git a/reactos/lib/sdk/crt/string/tcschr.h b/reactos/lib/sdk/crt/string/tcschr.h
index b9db9045ff3..65e01b2a9e0 100644
--- a/reactos/lib/sdk/crt/string/tcschr.h
+++ b/reactos/lib/sdk/crt/string/tcschr.h
@@ -1,5 +1,3 @@
-/* $Id: tcschr.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <tchar.h>
 
diff --git a/reactos/lib/sdk/crt/string/tcscmp.h b/reactos/lib/sdk/crt/string/tcscmp.h
index 73c44fa52a9..e7c5b281b3c 100644
--- a/reactos/lib/sdk/crt/string/tcscmp.h
+++ b/reactos/lib/sdk/crt/string/tcscmp.h
@@ -1,5 +1,3 @@
-/* $Id: tcscmp.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <tchar.h>
 
diff --git a/reactos/lib/sdk/crt/string/tcscpy.h b/reactos/lib/sdk/crt/string/tcscpy.h
index 38443b004c1..716e06e5041 100644
--- a/reactos/lib/sdk/crt/string/tcscpy.h
+++ b/reactos/lib/sdk/crt/string/tcscpy.h
@@ -1,5 +1,3 @@
-/* $Id: tcscpy.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <tchar.h>
 
diff --git a/reactos/lib/sdk/crt/string/tcslen.h b/reactos/lib/sdk/crt/string/tcslen.h
index fe64c252ada..ab2cc75419a 100644
--- a/reactos/lib/sdk/crt/string/tcslen.h
+++ b/reactos/lib/sdk/crt/string/tcslen.h
@@ -1,5 +1,3 @@
-/* $Id: tcslen.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <stddef.h>
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncat.h b/reactos/lib/sdk/crt/string/tcsncat.h
index 597d00cada5..d213a01281c 100644
--- a/reactos/lib/sdk/crt/string/tcsncat.h
+++ b/reactos/lib/sdk/crt/string/tcsncat.h
@@ -1,5 +1,3 @@
-/* $Id: tcsncat.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <stddef.h>
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncmp.h b/reactos/lib/sdk/crt/string/tcsncmp.h
index b57f2352918..ae6c8d19563 100644
--- a/reactos/lib/sdk/crt/string/tcsncmp.h
+++ b/reactos/lib/sdk/crt/string/tcsncmp.h
@@ -1,5 +1,3 @@
-/* $Id: tcsncmp.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <stddef.h>
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcsncpy.h b/reactos/lib/sdk/crt/string/tcsncpy.h
index d0a88898c2a..dbab841a111 100644
--- a/reactos/lib/sdk/crt/string/tcsncpy.h
+++ b/reactos/lib/sdk/crt/string/tcsncpy.h
@@ -1,5 +1,3 @@
-/* $Id: tcsncpy.h 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #include <stddef.h>
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcsnlen.h b/reactos/lib/sdk/crt/string/tcsnlen.h
index 1b0fb98c6ff..953b5adec86 100644
--- a/reactos/lib/sdk/crt/string/tcsnlen.h
+++ b/reactos/lib/sdk/crt/string/tcsnlen.h
@@ -1,5 +1,3 @@
-/* $Id: tcsnlen.h 38052 2008-12-13 21:28:05Z tkreuzer $
- */
 
 #include <stddef.h>
 #include <tchar.h>
diff --git a/reactos/lib/sdk/crt/string/tcsrchr.h b/reactos/lib/sdk/crt/string/tcsrchr.h
index eacf4b0e5d3..81890a0fc10 100644
--- a/reactos/lib/sdk/crt/string/tcsrchr.h
+++ b/reactos/lib/sdk/crt/string/tcsrchr.h
@@ -1,5 +1,3 @@
-/* $Id: tcsrchr.h 41916 2009-07-12 10:40:39Z ros-arm-bringup $
- */
 
 #include <tchar.h>
 
diff --git a/reactos/lib/sdk/crt/string/wcscat.c b/reactos/lib/sdk/crt/string/wcscat.c
index 1705625b39b..af1638556d4 100644
--- a/reactos/lib/sdk/crt/string/wcscat.c
+++ b/reactos/lib/sdk/crt/string/wcscat.c
@@ -1,5 +1,3 @@
-/* $Id: wcscat.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcschr.c b/reactos/lib/sdk/crt/string/wcschr.c
index 2ea1977afd4..c01bea28338 100644
--- a/reactos/lib/sdk/crt/string/wcschr.c
+++ b/reactos/lib/sdk/crt/string/wcschr.c
@@ -1,5 +1,3 @@
-/* $Id: wcschr.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #define _XINT wchar_t
diff --git a/reactos/lib/sdk/crt/string/wcscmp.c b/reactos/lib/sdk/crt/string/wcscmp.c
index a8edb3ba1ea..e7a9639d92e 100644
--- a/reactos/lib/sdk/crt/string/wcscmp.c
+++ b/reactos/lib/sdk/crt/string/wcscmp.c
@@ -1,5 +1,3 @@
-/* $Id: wcscmp.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcscpy.c b/reactos/lib/sdk/crt/string/wcscpy.c
index c1d359f7295..8d6714b7094 100644
--- a/reactos/lib/sdk/crt/string/wcscpy.c
+++ b/reactos/lib/sdk/crt/string/wcscpy.c
@@ -1,5 +1,3 @@
-/* $Id: wcscpy.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcslen.c b/reactos/lib/sdk/crt/string/wcslen.c
index de5487e7ec3..930680e42ce 100644
--- a/reactos/lib/sdk/crt/string/wcslen.c
+++ b/reactos/lib/sdk/crt/string/wcslen.c
@@ -1,5 +1,3 @@
-/* $Id: wcslen.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcsncat.c b/reactos/lib/sdk/crt/string/wcsncat.c
index 3a0d24282dd..2a5611c65cd 100644
--- a/reactos/lib/sdk/crt/string/wcsncat.c
+++ b/reactos/lib/sdk/crt/string/wcsncat.c
@@ -1,5 +1,3 @@
-/* $Id: wcsncat.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcsncmp.c b/reactos/lib/sdk/crt/string/wcsncmp.c
index 0ec0af173ff..4e20c8618ab 100644
--- a/reactos/lib/sdk/crt/string/wcsncmp.c
+++ b/reactos/lib/sdk/crt/string/wcsncmp.c
@@ -1,5 +1,3 @@
-/* $Id: wcsncmp.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcsncpy.c b/reactos/lib/sdk/crt/string/wcsncpy.c
index 1eb892e2731..da1f4afb5fc 100644
--- a/reactos/lib/sdk/crt/string/wcsncpy.c
+++ b/reactos/lib/sdk/crt/string/wcsncpy.c
@@ -1,5 +1,3 @@
-/* $Id: wcsncpy.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcsnlen.c b/reactos/lib/sdk/crt/string/wcsnlen.c
index 0eca5cb003e..7f4d9693c2b 100644
--- a/reactos/lib/sdk/crt/string/wcsnlen.c
+++ b/reactos/lib/sdk/crt/string/wcsnlen.c
@@ -1,5 +1,3 @@
-/* $Id: wcsnlen.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #include <wchar.h>
diff --git a/reactos/lib/sdk/crt/string/wcsrchr.c b/reactos/lib/sdk/crt/string/wcsrchr.c
index 6e44965b310..01686515d36 100644
--- a/reactos/lib/sdk/crt/string/wcsrchr.c
+++ b/reactos/lib/sdk/crt/string/wcsrchr.c
@@ -1,5 +1,3 @@
-/* $Id: wcsrchr.c 30283 2007-11-08 21:06:20Z fireball $
- */
 
 #define _UNICODE
 #define _XINT wchar_t
diff --git a/reactos/lib/sdk/crt/string/witow.c b/reactos/lib/sdk/crt/string/witow.c
index 335b1dd6c55..4add3319ef0 100644
--- a/reactos/lib/sdk/crt/string/witow.c
+++ b/reactos/lib/sdk/crt/string/witow.c
@@ -1,5 +1,4 @@
-/* $Id: witow.c 54651 2011-12-14 22:09:24Z spetreolle $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS system libraries
  * FILE:        lib/msvcrt/stdlib/itow.c
diff --git a/reactos/lib/smlib/compses.c b/reactos/lib/smlib/compses.c
index 176d2296fb8..73978d7292a 100644
--- a/reactos/lib/smlib/compses.c
+++ b/reactos/lib/smlib/compses.c
@@ -1,5 +1,4 @@
-/* $Id: compses.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/smlib/compses.c
diff --git a/reactos/lib/smlib/connect.c b/reactos/lib/smlib/connect.c
index c0d68a1986d..aa95d9ab4d8 100644
--- a/reactos/lib/smlib/connect.c
+++ b/reactos/lib/smlib/connect.c
@@ -1,5 +1,4 @@
-/* $Id: connect.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS system libraries
  * FILE:       reactos/lib/smlib/connect.c
diff --git a/reactos/lib/smlib/execpgm.c b/reactos/lib/smlib/execpgm.c
index 6ab07e6c401..82cba98c4ac 100644
--- a/reactos/lib/smlib/execpgm.c
+++ b/reactos/lib/smlib/execpgm.c
@@ -1,5 +1,4 @@
-/* $Id: execpgm.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/smlib/execpgm.c
diff --git a/reactos/lib/smlib/lookupss.c b/reactos/lib/smlib/lookupss.c
index 50a8c62a6bb..f4971f8c1c0 100644
--- a/reactos/lib/smlib/lookupss.c
+++ b/reactos/lib/smlib/lookupss.c
@@ -1,5 +1,4 @@
-/* $Id: lookupss.c 58237 2013-01-27 00:07:58Z hbelusca $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/smlib/lookupss.c

From 97bc0bcd23c37559a7e511d051dd48a8b793f53b Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 13:32:56 +0000
Subject: [PATCH 36/61] [CRT] * Annotate float.h.

svn path=/trunk/; revision=58502
---
 reactos/include/crt/float.h | 92 ++++++++++++++++++++++++++++++++-----
 1 file changed, 81 insertions(+), 11 deletions(-)

diff --git a/reactos/include/crt/float.h b/reactos/include/crt/float.h
index d80ae0ec295..6870b0c570c 100644
--- a/reactos/include/crt/float.h
+++ b/reactos/include/crt/float.h
@@ -105,9 +105,22 @@ extern "C" {
 /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask),
  * i.e. change the bits in unMask to have the values they have in unNew,
  * leaving other bits unchanged. */
-__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask);
-__MINGW_NOTHROW _CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask);
 
+__MINGW_NOTHROW
+_CRTIMP
+unsigned int
+__cdecl
+_controlfp(
+  _In_ unsigned int unNew,
+  _In_ unsigned int unMask);
+
+__MINGW_NOTHROW
+_CRTIMP
+unsigned int
+__cdecl
+_control87(
+  _In_ unsigned int unNew,
+  _In_ unsigned int unMask);
 
 __MINGW_NOTHROW _CRTIMP unsigned int __cdecl _clearfp (void);	/* Clear the FPU status word */
 __MINGW_NOTHROW _CRTIMP unsigned int __cdecl _statusfp (void);	/* Report the FPU status word */
@@ -136,17 +149,74 @@ __MINGW_NOTHROW _CRTIMP int * __cdecl __fpecode(void);
  * but they really belong in math.h.
  */
 
-__MINGW_NOTHROW _CRTIMP double __cdecl _chgsign	(double);
-__MINGW_NOTHROW _CRTIMP double __cdecl _copysign (double, double);
-__MINGW_NOTHROW _CRTIMP double __cdecl _logb (double);
-__MINGW_NOTHROW _CRTIMP double __cdecl _nextafter (double, double);
-__MINGW_NOTHROW _CRTIMP double __cdecl _scalb (double, long);
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+double
+__cdecl
+_chgsign(
+  _In_ double);
 
-__MINGW_NOTHROW _CRTIMP int __cdecl _finite (double);
-__MINGW_NOTHROW _CRTIMP int __cdecl _fpclass (double);
-__MINGW_NOTHROW _CRTIMP int __cdecl _isnan (double);
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+double
+__cdecl
+_copysign(
+  _In_ double,
+  _In_ double);
 
-#ifdef	__cplusplus
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+double
+__cdecl
+_logb(
+  _In_ double);
+
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+double
+__cdecl
+_nextafter(
+  _In_ double,
+  _In_ double);
+
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+double
+__cdecl
+_scalb(
+  _In_ double,
+  _In_ long);
+
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+int
+__cdecl
+_finite(
+  _In_ double);
+
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+int
+__cdecl
+_fpclass(
+  _In_ double);
+
+_Check_return_
+__MINGW_NOTHROW
+_CRTIMP
+int
+__cdecl
+_isnan(
+  _In_ double);
+
+#ifdef __cplusplus
 }
 #endif
 

From a1866f4f923af7d4d69c75681fba6dce7b8903e4 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 13:34:52 +0000
Subject: [PATCH 37/61] [CALC] * Fix some format specifiers.

svn path=/trunk/; revision=58503
---
 reactos/base/applications/calc/winmain.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c
index 6279d3d5091..e9a82c8e895 100644
--- a/reactos/base/applications/calc/winmain.c
+++ b/reactos/base/applications/calc/winmain.c
@@ -229,12 +229,12 @@ static void load_config(void)
 
     /* Try to load last selected layout */
     GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%ld"), &calc.layout) != 1)
+    if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1)
         calc.layout = CALC_LAYOUT_STANDARD;
 
     /* Try to load last selected formatting option */
     GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%ld"), &tmp) != 1)
+    if (_stscanf(buf, TEXT("%lu"), &tmp) != 1)
         calc.usesep = FALSE;
     else
         calc.usesep = (tmp == 1) ? TRUE : FALSE;

From 5dfaa3991c061ed08363c80daabd183afdaa6556 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 14:51:02 +0000
Subject: [PATCH 38/61] [FREELDR] * Fix a format specifiers.

svn path=/trunk/; revision=58504
---
 reactos/boot/freeldr/freeldr/inifile/parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/boot/freeldr/freeldr/inifile/parse.c b/reactos/boot/freeldr/freeldr/inifile/parse.c
index 8af3080f57f..ce9dbdfeb5a 100644
--- a/reactos/boot/freeldr/freeldr/inifile/parse.c
+++ b/reactos/boot/freeldr/freeldr/inifile/parse.c
@@ -122,7 +122,7 @@ BOOLEAN IniParseFile(PCHAR IniFileData, ULONG IniFileSize)
 			// First check to make sure we're inside a [section]
 			if (CurrentSection == NULL)
 			{
-				printf("Error: freeldr.ini:%ld: Setting '%s' found outside of a [section].\n", CurrentLineNumber, IniFileLine);
+				printf("Error: freeldr.ini:%lu: Setting '%s' found outside of a [section].\n", CurrentLineNumber, IniFileLine);
 				printf("Press any key to continue...\n");
 				MachConsGetCh();
 				CurrentLineNumber++;

From 77f02beef83e7790b0b89875a199706332c27bc8 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 14:52:20 +0000
Subject: [PATCH 39/61] [CRT] * Annotate io.h.

svn path=/trunk/; revision=58505
---
 reactos/include/crt/io.h | 769 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 674 insertions(+), 95 deletions(-)

diff --git a/reactos/include/crt/io.h b/reactos/include/crt/io.h
index 4a3f37dafbb..5e29e67680b 100644
--- a/reactos/include/crt/io.h
+++ b/reactos/include/crt/io.h
@@ -18,7 +18,15 @@
 extern "C" {
 #endif
 
-_CRTIMP char* __cdecl _getcwd (char*, int);
+_Check_return_
+_Ret_opt_z_
+_CRTIMP
+char*
+__cdecl
+_getcwd(
+  _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+  _In_ int _SizeInBytes);
+
 #ifndef _FSIZE_T_DEFINED
   typedef unsigned long _fsize_t;
 #define _FSIZE_T_DEFINED
@@ -162,57 +170,316 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 #define	W_OK	2	/* Check for write permission */
 #define	R_OK	4	/* Check for read permission */
 
-  _CRTIMP int __cdecl _access(const char *_Filename,int _AccessMode);
-  _CRTIMP int __cdecl _chmod(const char *_Filename,int _Mode);
-  _CRTIMP int __cdecl _chsize(int _FileHandle,long _Size);
-  _CRTIMP int __cdecl _close(int _FileHandle);
-  _CRTIMP int __cdecl _commit(int _FileHandle);
-  _CRTIMP int __cdecl _creat(const char *_Filename,int _PermissionMode);
-  _CRTIMP int __cdecl _dup(int _FileHandle);
-  _CRTIMP int __cdecl _dup2(int _FileHandleSrc,int _FileHandleDst);
-  _CRTIMP int __cdecl _eof(int _FileHandle);
-  _CRTIMP long __cdecl _filelength(int _FileHandle);
-  _CRTIMP intptr_t __cdecl _findfirst(const char *_Filename, struct _finddata_t *_FindData);
-  _CRTIMP intptr_t __cdecl _findfirst32(const char *_Filename,struct _finddata32_t *_FindData);
-  _CRTIMP int __cdecl _findnext(intptr_t _FindHandle,struct _finddata_t *_FindData);
-  _CRTIMP int __cdecl _findnext32(intptr_t _FindHandle,struct _finddata32_t *_FindData);
-  _CRTIMP int __cdecl _findclose(intptr_t _FindHandle);
-  _CRTIMP int __cdecl _isatty(int _FileHandle);
-  _CRTIMP int __cdecl _locking(int _FileHandle,int _LockMode,long _NumOfBytes);
-  _CRTIMP long __cdecl _lseek(int _FileHandle,long _Offset,int _Origin);
-  _CRTIMP char *__cdecl _mktemp(char *_TemplateName);
-  _CRTIMP int __cdecl _pipe(int *_PtHandles,unsigned int _PipeSize,int _TextMode);
-  _CRTIMP int __cdecl _read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount);
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _access(
+    _In_z_ const char *_Filename,
+    _In_ int _AccessMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _chmod(
+    _In_z_ const char *_Filename,
+    _In_ int _Mode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _chsize(
+    _In_ int _FileHandle,
+    _In_ long _Size);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _close(
+    _In_ int _FileHandle);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _commit(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _creat(
+    _In_z_ const char *_Filename,
+    _In_ int _PermissionMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _dup(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _dup2(
+    _In_ int _FileHandleSrc,
+    _In_ int _FileHandleDst);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _eof(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  long
+  __cdecl
+  _filelength(
+    _In_ int _FileHandle);
+
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _findfirst(
+    const char *_Filename,
+    struct _finddata_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _findfirst32(
+    _In_z_ const char *_Filename,
+    _Out_ struct _finddata32_t *_FindData);
+
+  _CRTIMP
+  int
+  __cdecl
+  _findnext(
+    intptr_t _FindHandle,
+    struct _finddata_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _findnext32(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _finddata32_t *_FindData);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  _findclose(
+    _In_ intptr_t _FindHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _isatty(
+    _In_ int _FileHandle);
+
+  _CRTIMP
+  int
+  __cdecl
+  _locking(
+    _In_ int _FileHandle,
+    _In_ int _LockMode,
+    _In_ long _NumOfBytes);
+
+  _Check_return_opt_
+  _CRTIMP
+  long
+  __cdecl
+  _lseek(
+    _In_ int _FileHandle,
+    _In_ long _Offset,
+    _In_ int _Origin);
+
+  _Check_return_
+  _CRTIMP
+  char*
+  __cdecl
+  _mktemp(
+    _Inout_z_ char *_TemplateName);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _pipe(
+    _Inout_updates_(2) int *_PtHandles,
+    _In_ unsigned int _PipeSize,
+    _In_ int _TextMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _read(
+    _In_ int _FileHandle,
+    _Out_writes_bytes_(_MaxCharCount) void *_DstBuf,
+    _In_ unsigned int _MaxCharCount);
 
 #ifndef _CRT_DIRECTORY_DEFINED
 #define _CRT_DIRECTORY_DEFINED
-  int __cdecl remove(const char *_Filename);
-  int __cdecl rename(const char *_OldFilename,const char *_NewFilename);
-  _CRTIMP int __cdecl _unlink(const char *_Filename);
-#ifndef	NO_OLDNAMES
-  _CRTIMP int __cdecl unlink(const char *_Filename);
-#endif
+
+  _Check_return_
+  int
+  __cdecl
+  remove(
+    _In_z_ const char *_Filename);
+
+  _Check_return_
+  int
+  __cdecl
+  rename(
+    _In_z_ const char *_OldFilename,
+    _In_z_ const char *_NewFilename);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _unlink(
+    _In_z_ const char *_Filename);
+
+#ifndef NO_OLDNAMES
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  unlink(
+    _In_z_ const char *_Filename);
 #endif
 
-  _CRTIMP int __cdecl _setmode(int _FileHandle,int _Mode);
-  _CRTIMP long __cdecl _tell(int _FileHandle);
-  _CRTIMP int __cdecl _umask(int _Mode);
-  _CRTIMP int __cdecl _write(int _FileHandle,const void *_Buf,unsigned int _MaxCharCount);
+#endif /* _CRT_DIRECTORY_DEFINED */
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _setmode(
+    _In_ int _FileHandle,
+    _In_ int _Mode);
+
+  _Check_return_
+  _CRTIMP
+  long
+  __cdecl
+  _tell(
+    _In_ int _FileHandle);
+
+  _CRTIMP
+  int
+  __cdecl
+  _umask(
+    _In_ int _Mode);
+
+  _CRTIMP
+  int
+  __cdecl
+  _write(
+    _In_ int _FileHandle,
+    _In_reads_bytes_(_MaxCharCount) const void *_Buf,
+    _In_ unsigned int _MaxCharCount);
 
 #if _INTEGRAL_MAX_BITS >= 64
-  __MINGW_EXTENSION _CRTIMP __int64 __cdecl _filelengthi64(int _FileHandle);
-  _CRTIMP intptr_t __cdecl _findfirst32i64(const char *_Filename,struct _finddata32i64_t *_FindData);
-  _CRTIMP intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData);
-  _CRTIMP intptr_t __cdecl _findfirst64(const char *_Filename,struct __finddata64_t *_FindData);
-  _CRTIMP int __cdecl _findnext32i64(intptr_t _FindHandle,struct _finddata32i64_t *_FindData);
-  _CRTIMP int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData);
-  _CRTIMP int __cdecl _findnext64(intptr_t _FindHandle,struct __finddata64_t *_FindData);
-  __MINGW_EXTENSION _CRTIMP __int64 __cdecl _lseeki64(int _FileHandle,__int64 _Offset,int _Origin);
-  __MINGW_EXTENSION _CRTIMP __int64 __cdecl _telli64(int _FileHandle);
+
+  _Check_return_
+  __MINGW_EXTENSION
+  _CRTIMP
+  __int64
+  __cdecl
+  _filelengthi64(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _findfirst32i64(
+    _In_z_ const char *_Filename,
+    _Out_ struct _finddata32i64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _findfirst64i32(
+    _In_z_ const char *_Filename,
+    _Out_ struct _finddata64i32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _findfirst64(
+    _In_z_ const char *_Filename,
+    _Out_ struct __finddata64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _findnext32i64(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _finddata32i64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _findnext64i32(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _finddata64i32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _findnext64(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct __finddata64_t *_FindData);
+
+  _Check_return_opt_
+  __MINGW_EXTENSION
+  _CRTIMP
+  __int64
+  __cdecl
+  _lseeki64(
+    _In_ int _FileHandle,
+    _In_ __int64 _Offset,
+    _In_ int _Origin);
+
+  _Check_return_
+  __MINGW_EXTENSION
+  _CRTIMP
+  __int64
+  __cdecl
+  _telli64(
+    _In_ int _FileHandle);
+
 #ifdef __cplusplus
 #include <string.h>
 #endif
-  __CRT_INLINE intptr_t __cdecl _findfirst64i32(const char *_Filename,struct _finddata64i32_t *_FindData)
+
+  __CRT_INLINE
+  intptr_t
+  __cdecl
+  _findfirst64i32(
+    const char *_Filename,
+    struct _finddata64i32_t *_FindData)
   {
     struct __finddata64_t fd;
     intptr_t ret = _findfirst64(_Filename,&fd);
@@ -224,7 +491,13 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
     strncpy(_FindData->name,fd.name,260);
     return ret;
   }
-  __CRT_INLINE int __cdecl _findnext64i32(intptr_t _FindHandle,struct _finddata64i32_t *_FindData)
+
+  __CRT_INLINE
+  int
+  __cdecl
+  _findnext64i32(
+    intptr_t _FindHandle,
+    struct _finddata64i32_t *_FindData)
   {
     struct __finddata64_t fd;
     int ret = _findnext64(_FindHandle,&fd);
@@ -236,20 +509,69 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
     strncpy(_FindData->name,fd.name,260);
     return ret;
   }
-#endif
+
+#endif /* _INTEGRAL_MAX_BITS >= 64 */
 
 #ifndef NO_OLDNAMES
 #ifndef _UWIN
-  _CRTIMP int __cdecl chdir (const char *);
-  _CRTIMP char *__cdecl getcwd (char *, int);
-  _CRTIMP int __cdecl mkdir (const char *);
-  _CRTIMP char *__cdecl mktemp(char *);
-  _CRTIMP int __cdecl rmdir (const char*);
-  _CRTIMP int __cdecl chmod (const char *, int);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  chdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _Ret_opt_z_
+  _CRTIMP
+  char*
+  __cdecl
+  getcwd(
+    _Out_writes_opt_(_SizeInBytes) char *_DstBuf,
+    _In_ int _SizeInBytes);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  mkdir(
+    _In_z_ const char *_Path);
+
+  _CRTIMP
+  char*
+  __cdecl
+  mktemp(
+    _Inout_z_ char *_TemplateName);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  rmdir(
+    _In_z_ const char *_Path);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  chmod(
+    _In_z_ const char *_Filename,
+    _In_ int _AccessMode);
+
 #endif /* _UWIN */
 #endif /* Not NO_OLDNAMES */
 
-  _CRTIMP errno_t __cdecl _sopen_s(int *_FileHandle,const char *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionMode);
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _sopen_s(
+    _Out_ int *_FileHandle,
+    _In_z_ const char *_Filename,
+    _In_ int _OpenFlag,
+    _In_ int _ShareFlag,
+    _In_ int _PermissionMode);
 
 #ifndef __cplusplus
   _CRTIMP int __cdecl _open(const char *_Filename,int _OpenFlag,...);
@@ -261,25 +583,130 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 
 #ifndef _WIO_DEFINED
 #define _WIO_DEFINED
-  _CRTIMP int __cdecl _waccess(const wchar_t *_Filename,int _AccessMode);
-  _CRTIMP int __cdecl _wchmod(const wchar_t *_Filename,int _Mode);
-  _CRTIMP int __cdecl _wcreat(const wchar_t *_Filename,int _PermissionMode);
-  _CRTIMP intptr_t __cdecl _wfindfirst32(const wchar_t *_Filename,struct _wfinddata32_t *_FindData);
-  _CRTIMP int __cdecl _wfindnext32(intptr_t _FindHandle,struct _wfinddata32_t *_FindData);
-  _CRTIMP int __cdecl _wunlink(const wchar_t *_Filename);
-  _CRTIMP int __cdecl _wrename(const wchar_t *_NewFilename,const wchar_t *_OldFilename);
-  _CRTIMP wchar_t *__cdecl _wmktemp(wchar_t *_TemplateName);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _waccess(
+    _In_z_ const wchar_t *_Filename,
+    _In_ int _AccessMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wchmod(
+    _In_z_ const wchar_t *_Filename,
+    _In_ int _Mode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wcreat(
+    _In_z_ const wchar_t *_Filename,
+    _In_ int _PermissionMode);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _wfindfirst32(
+    _In_z_ const wchar_t *_Filename,
+    _Out_ struct _wfinddata32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wfindnext32(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _wfinddata32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wunlink(
+    _In_z_ const wchar_t *_Filename);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wrename(
+    _In_z_ const wchar_t *_NewFilename,
+    _In_z_ const wchar_t *_OldFilename);
+
+  _CRTIMP
+  wchar_t*
+  __cdecl
+  _wmktemp(
+    _Inout_z_ wchar_t *_TemplateName);
 
 #if _INTEGRAL_MAX_BITS >= 64
-  _CRTIMP intptr_t __cdecl _wfindfirst32i64(const wchar_t *_Filename,struct _wfinddata32i64_t *_FindData);
-  intptr_t __cdecl _wfindfirst64i32(const wchar_t *_Filename,struct _wfinddata64i32_t *_FindData);
-  _CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t *_Filename,struct _wfinddata64_t *_FindData);
-  _CRTIMP int __cdecl _wfindnext32i64(intptr_t _FindHandle,struct _wfinddata32i64_t *_FindData);
-  int __cdecl _wfindnext64i32(intptr_t _FindHandle,struct _wfinddata64i32_t *_FindData);
-  _CRTIMP int __cdecl _wfindnext64(intptr_t _FindHandle,struct _wfinddata64_t *_FindData);
-#endif
 
-  _CRTIMP errno_t __cdecl _wsopen_s(int *_FileHandle,const wchar_t *_Filename,int _OpenFlag,int _ShareFlag,int _PermissionFlag);
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _wfindfirst32i64(
+    _In_z_ const wchar_t *_Filename,
+    _Out_ struct _wfinddata32i64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _wfindfirst64i32(
+    _In_z_ const wchar_t *_Filename,
+    _Out_ struct _wfinddata64i32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _wfindfirst64(
+    _In_z_ const wchar_t *_Filename,
+    _Out_ struct _wfinddata64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wfindnext32i64(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _wfinddata32i64_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wfindnext64i32(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _wfinddata64i32_t *_FindData);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _wfindnext64(
+    _In_ intptr_t _FindHandle,
+    _Out_ struct _wfinddata64_t *_FindData);
+
+#endif /* _INTEGRAL_MAX_BITS >= 64 */
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wsopen_s(
+    _Out_ int *_FileHandle,
+    _In_z_ const wchar_t *_Filename,
+    _In_ int _OpenFlag,
+    _In_ int _ShareFlag,
+    _In_ int _PermissionFlag);
 
 #if !defined(__cplusplus) || !(defined(_X86_) && !defined(__x86_64))
   _CRTIMP int __cdecl _wopen(const wchar_t *_Filename,int _OpenFlag,...);
@@ -291,33 +718,187 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 
 #endif /* !_WIO_DEFINED */
 
-  int __cdecl __lock_fhandle(int _Filehandle);
-  void __cdecl _unlock_fhandle(int _Filehandle);
-  _CRTIMP intptr_t __cdecl _get_osfhandle(int _FileHandle);
-  _CRTIMP int __cdecl _open_osfhandle(intptr_t _OSFileHandle,int _Flags);
+  int
+  __cdecl
+  __lock_fhandle(
+    _In_ int _Filehandle);
 
-#ifndef	NO_OLDNAMES
-  _CRTIMP int __cdecl access(const char *_Filename,int _AccessMode);
-  _CRTIMP int __cdecl chmod(const char *_Filename,int _AccessMode);
-  _CRTIMP int __cdecl chsize(int _FileHandle,long _Size);
-  _CRTIMP int __cdecl close(int _FileHandle);
-  _CRTIMP int __cdecl creat(const char *_Filename,int _PermissionMode);
-  _CRTIMP int __cdecl dup(int _FileHandle);
-  _CRTIMP int __cdecl dup2(int _FileHandleSrc,int _FileHandleDst);
-  _CRTIMP int __cdecl eof(int _FileHandle);
-  _CRTIMP long __cdecl filelength(int _FileHandle);
-  _CRTIMP int __cdecl isatty(int _FileHandle);
-  _CRTIMP int __cdecl locking(int _FileHandle,int _LockMode,long _NumOfBytes);
-  _CRTIMP long __cdecl lseek(int _FileHandle,long _Offset,int _Origin);
-  _CRTIMP char *__cdecl mktemp(char *_TemplateName);
-  _CRTIMP int __cdecl open(const char *_Filename,int _OpenFlag,...);
-  _CRTIMP int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount);
-  _CRTIMP int __cdecl setmode(int _FileHandle,int _Mode);
-  _CRTIMP int __cdecl sopen(const char *_Filename,int _OpenFlag,int _ShareFlag,...);
-  _CRTIMP long __cdecl tell(int _FileHandle);
-  _CRTIMP int __cdecl umask(int _Mode);
-  _CRTIMP int __cdecl write(int _Filehandle,const void *_Buf,unsigned int _MaxCharCount);
-#endif
+  void
+  __cdecl
+  _unlock_fhandle(
+    _In_ int _Filehandle);
+
+  _CRTIMP
+  intptr_t
+  __cdecl
+  _get_osfhandle(
+    _In_ int _FileHandle);
+
+  _CRTIMP
+  int
+  __cdecl
+  _open_osfhandle(
+    _In_ intptr_t _OSFileHandle,
+    _In_ int _Flags);
+
+#ifndef NO_OLDNAMES
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  access(
+    _In_z_ const char *_Filename,
+    _In_ int _AccessMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  chmod(
+    _In_z_ const char *_Filename,
+    _In_ int _AccessMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  chsize(
+    _In_ int _FileHandle,
+    _In_ long _Size);
+
+  _Check_return_opt_
+  _CRTIMP
+  int
+  __cdecl
+  close(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  creat(
+    _In_z_ const char *_Filename,
+    _In_ int _PermissionMode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  dup(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  dup2(
+    _In_ int _FileHandleSrc,
+    _In_ int _FileHandleDst);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  __cdecl eof(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  long
+  __cdecl
+  filelength(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  isatty(
+    _In_ int _FileHandle);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  locking(
+    _In_ int _FileHandle,
+    _In_ int _LockMode,
+    _In_ long _NumOfBytes);
+
+  _Check_return_opt_
+  _CRTIMP
+  long
+  __cdecl
+  lseek(
+    _In_ int _FileHandle,
+    _In_ long _Offset,
+    _In_ int _Origin);
+
+  _CRTIMP
+  char*
+  __cdecl
+  mktemp(
+    _Inout_z_ char *_TemplateName);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  open(
+    _In_z_ const char *_Filename,
+    _In_ int _OpenFlag,
+    ...);
+
+  _CRTIMP
+  int
+  __cdecl
+  read(
+    _In_ int _FileHandle,
+    _Out_writes_bytes_(_MaxCharCount) void *_DstBuf,
+    _In_ unsigned int _MaxCharCount);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  setmode(
+    _In_ int _FileHandle,
+    _In_ int _Mode);
+
+  _CRTIMP
+  int
+  __cdecl
+  sopen(
+    const char *_Filename,
+    int _OpenFlag,
+    int _ShareFlag,
+    ...);
+
+  _Check_return_
+  _CRTIMP
+  long
+  __cdecl
+  tell(
+    _In_ int _FileHandle);
+
+  _CRTIMP
+  int
+  __cdecl
+  umask(
+    _In_ int _Mode);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  write(
+    _In_ int _Filehandle,
+    _In_reads_bytes_(_MaxCharCount) const void *_Buf,
+    _In_ unsigned int _MaxCharCount);
+
+#endif /* NO_OLDNAMES */
 
 #ifdef __cplusplus
 }
@@ -345,12 +926,10 @@ static inline int __mingw_access (const char *__fname, int __mode) {
 #define access(__f,__m)  __mingw_access (__f, __m)
 #endif
 
-
 #ifdef __cplusplus
 }
 #endif
 
-
 #pragma pack(pop)
 
 #include <sec_api/io_s.h>

From d67bfcb1798fe41322c36320df8f101e09a9d73f Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 15:47:39 +0000
Subject: [PATCH 40/61] [WINMINE] * Fix some format specifiers.

svn path=/trunk/; revision=58506
---
 reactos/base/applications/games/winmine/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/base/applications/games/winmine/main.c b/reactos/base/applications/games/winmine/main.c
index 9aa0dd25ca8..1260c7b4c40 100644
--- a/reactos/base/applications/games/winmine/main.c
+++ b/reactos/base/applications/games/winmine/main.c
@@ -108,7 +108,7 @@ static void LoadBoard( BOARD *p_board )
         p_board->IsMarkQ = TRUE;
 
     for( i = 0; i < 3; i++ ) {
-        wsprintf( key_name, "Name%d", i+1 );
+        wsprintf( key_name, "Name%u", i+1 );
         size = sizeof( data );
         if( RegQueryValueEx( hkey, key_name, NULL, &type,
                 (LPBYTE) data, &size ) == ERROR_SUCCESS )
@@ -118,7 +118,7 @@ static void LoadBoard( BOARD *p_board )
     }
 
     for( i = 0; i < 3; i++ ) {
-        wsprintf( key_name, "Time%d", i+1 );
+        wsprintf( key_name, "Time%u", i+1 );
         size = sizeof( p_board->best_time[i] );
         if( !RegQueryValueEx( hkey, key_name, NULL, &type,
                 (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS )

From dccac52c2c145aaf88e7e1e6e0248cf54a982424 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 17:03:42 +0000
Subject: [PATCH 41/61] [CRT] * Annotate mbctype.h.

svn path=/trunk/; revision=58507
---
 reactos/include/crt/mbctype.h | 251 +++++++++++++++++++++++++++++-----
 1 file changed, 218 insertions(+), 33 deletions(-)

diff --git a/reactos/include/crt/mbctype.h b/reactos/include/crt/mbctype.h
index f39c66f5bbc..7a7a709be85 100644
--- a/reactos/include/crt/mbctype.h
+++ b/reactos/include/crt/mbctype.h
@@ -17,8 +17,8 @@ extern "C" {
 #if 1
 #if defined (_DLL) && defined (_M_IX86)
   /* Retained for compatibility with VC++ 5.0 and earlier versions */
-  _CRTIMP unsigned char * __cdecl __p__mbctype(void);
-  _CRTIMP unsigned char * __cdecl __p__mbcasemap(void);
+  _Check_return_ _CRTIMP unsigned char * __cdecl __p__mbctype(void);
+  _Check_return_ _CRTIMP unsigned char * __cdecl __p__mbcasemap(void);
 #endif  /* defined (_DLL) && defined (_M_IX86) */
 #endif
 #ifndef _mbctype
@@ -70,40 +70,225 @@ extern "C" {
 #ifndef _MBCTYPE_DEFINED
 #define _MBCTYPE_DEFINED
 
-  _CRTIMP int __cdecl _setmbcp(int _CodePage);
-  _CRTIMP int __cdecl _getmbcp(void);
-  _CRTIMP int __cdecl _ismbbkalnum(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbkalnum_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbkana(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbkana_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbkpunct(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbkpunct_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbkprint(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbkprint_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbalpha(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbalpha_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbpunct(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbpunct_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbalnum(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbalnum_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbprint(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbprint_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbgraph(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbgraph_l(unsigned int _C,_locale_t _Locale);
+  _CRTIMP
+  int
+  __cdecl
+  _setmbcp(
+    _In_ int _CodePage);
+
+  _CRTIMP
+  int
+  __cdecl
+  _getmbcp(void);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkalnum(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkalnum_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkana(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkana_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkpunct(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkpunct_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkprint(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbkprint_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbalpha(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbalpha_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbpunct(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbpunct_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbalnum(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbalnum_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbprint(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbprint_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbgraph(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbgraph_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
 #ifndef _MBLEADTRAIL_DEFINED
 #define _MBLEADTRAIL_DEFINED
-  _CRTIMP int __cdecl _ismbblead(unsigned int _C);
-  _CRTIMP int __cdecl _ismbblead_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbbtrail(unsigned int _C);
-  _CRTIMP int __cdecl _ismbbtrail_l(unsigned int _C,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbslead(const unsigned char *_Str,const unsigned char *_Pos);
-  _CRTIMP int __cdecl _ismbslead_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale);
-  _CRTIMP int __cdecl _ismbstrail(const unsigned char *_Str,const unsigned char *_Pos);
-  _CRTIMP int __cdecl _ismbstrail_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale);
-#endif
-#endif
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbblead(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbblead_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbtrail(
+    _In_ unsigned int _C);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbbtrail_l(
+    _In_ unsigned int _C,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbslead(
+    _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str,
+    _In_z_ const unsigned char *_Pos);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbslead_l(
+    _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str,
+    _In_z_ const unsigned char *_Pos,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbstrail(
+    _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str,
+    _In_z_ const unsigned char *_Pos);
+
+  _Check_return_
+  _CRTIMP
+  int
+  __cdecl
+  _ismbstrail_l(
+    _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str,
+    _In_z_ const unsigned char *_Pos,
+    _In_opt_ _locale_t _Locale);
+
+#endif /* _MBLEADTRAIL_DEFINED */
+
+#endif /* _MBCTYPE_DEFINED */
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* _INC_MBCTYPE */

From 922de4a0ad93344f874ee4940ae66a95c965bd63 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 17:28:43 +0000
Subject: [PATCH 42/61] [SC] * Fix some format specifiers.

svn path=/trunk/; revision=58508
---
 reactos/base/applications/sc/print.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/base/applications/sc/print.c b/reactos/base/applications/sc/print.c
index ea2c84d5338..276ac7594f2 100644
--- a/reactos/base/applications/sc/print.c
+++ b/reactos/base/applications/sc/print.c
@@ -81,10 +81,10 @@ PrintService(LPCTSTR lpServiceName,
 
     _tprintf(_T(")\n"));
 
-    _tprintf(_T("\tWIN32_EXIT_CODE    : %d  (0x%x)\n"),
+    _tprintf(_T("\tWIN32_EXIT_CODE    : %u  (0x%x)\n"),
         (unsigned int)pStatus->dwWin32ExitCode,
         (unsigned int)pStatus->dwWin32ExitCode);
-    _tprintf(_T("\tSERVICE_EXIT_CODE  : %d  (0x%x)\n"),
+    _tprintf(_T("\tSERVICE_EXIT_CODE  : %u  (0x%x)\n"),
         (unsigned int)pStatus->dwServiceSpecificExitCode,
         (unsigned int)pStatus->dwServiceSpecificExitCode);
     _tprintf(_T("\tCHECKPOINT         : 0x%x\n"),

From 5743d95036632752d0e9f9b3fa45b8afd505b6f9 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 21:36:13 +0000
Subject: [PATCH 43/61] [SAL] * Add _Outptr_result_z_ annotation.

svn path=/trunk/; revision=58509
---
 reactos/include/psdk/sal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h
index b1d80924c8f..8f0ed8f4b5a 100644
--- a/reactos/include/psdk/sal.h
+++ b/reactos/include/psdk/sal.h
@@ -838,7 +838,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default};
 #define _Outptr_result_maybenull_                                   _SAL2_NAME(_Outptr_result_maybenull_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] [SA_Post(Deref=1,Null=SA_Maybe,Notref=1,ValidElements="\n""1")] )
 //#define _Outptr_result_maybenull_z_
 #define _Outptr_result_nullonfailure_                               _SAL2_NAME(_Outptr_result_nullonfailure_) _Group_(_Outptr_ [SAL_context(p1="SAL_failed")] _Group_([SAL_post] _Deref_post_null_) )
-//#define _Outptr_result_z_
+#define _Outptr_result_z_                                           _SAL2_NAME(_Outptr_result_z_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElementsConst=1,Notref=1)] [SA_Post(Valid=SA_Yes)] _Deref_post_z_)
 //#define _Outref_
 //#define _Outref_result_buffer_(size)
 //#define _Outref_result_buffer_all_(size)

From 1fe48aa611bc4c0c0e124dc844d76f702641cf91 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 21:59:57 +0000
Subject: [PATCH 44/61] [APPLICATIONS] * Fix some format specifiers.

svn path=/trunk/; revision=58510
---
 reactos/base/applications/cmdutils/hostname/hostname.c | 2 +-
 reactos/base/applications/mscutils/eventvwr/eventvwr.c | 2 +-
 reactos/base/applications/setup16/main.c               | 2 +-
 reactos/base/applications/shutdown/misc.c              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/reactos/base/applications/cmdutils/hostname/hostname.c b/reactos/base/applications/cmdutils/hostname/hostname.c
index b1c66713ce5..c118d2b575b 100644
--- a/reactos/base/applications/cmdutils/hostname/hostname.c
+++ b/reactos/base/applications/cmdutils/hostname/hostname.c
@@ -44,7 +44,7 @@ int main (int argc, char ** argv)
 			printf ("%s\n", ComputerName);
 			return EXIT_SUCCESS;
 		}
-		fprintf (stderr, "%s: Win32 error %ld.\n",
+		fprintf (stderr, "%s: Win32 error %lu.\n",
 			argv[0], GetLastError());
 		return EXIT_FAILURE;
 	}else{
diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.c b/reactos/base/applications/mscutils/eventvwr/eventvwr.c
index 628eac0c505..f04b5118621 100644
--- a/reactos/base/applications/mscutils/eventvwr/eventvwr.c
+++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.c
@@ -695,7 +695,7 @@ QueryEventMessages(LPWSTR lpMachineName,
     else
         _snwprintf(szWindowTitle+i, dwMaxLength, L"%s", lpComputerName);
 
-    swprintf(szStatusText, L"%s has %d event(s)", lpLogName, dwTotalRecords);
+    swprintf(szStatusText, L"%s has %lu event(s)", lpLogName, dwTotalRecords);
 
     // Update the status bar
     SendMessageW(hwndStatus, SB_SETTEXT, (WPARAM)0, (LPARAM)szStatusText);
diff --git a/reactos/base/applications/setup16/main.c b/reactos/base/applications/setup16/main.c
index 639cd98518e..a3b2ae40f04 100644
--- a/reactos/base/applications/setup16/main.c
+++ b/reactos/base/applications/setup16/main.c
@@ -143,7 +143,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     else
     {
         WCHAR szMsg[MAX_PATH];
-        wsprintf(szMsg, L"Failed to load the installer. Error %d", GetLastError());
+        wsprintf(szMsg, L"Failed to load the installer. Error %lu", GetLastError());
         MessageBoxW(0, szMsg, L"Error", MB_OK | MB_ICONERROR);
         DeleteDirectory(szTempPath);
         return 1;
diff --git a/reactos/base/applications/shutdown/misc.c b/reactos/base/applications/shutdown/misc.c
index b26ff706e37..a245bfa37af 100644
--- a/reactos/base/applications/shutdown/misc.c
+++ b/reactos/base/applications/shutdown/misc.c
@@ -179,7 +179,7 @@ VOID DisplayError(DWORD dwError)
 
     /* Prints out the error message to the user */
     fprintf(stderr, resMsg);
-    fwprintf(stderr, L"Error code: %d\n", dwError);
+    fwprintf(stderr, L"Error code: %lu\n", dwError);
 
     LocalFree(lpMsgBuf);
     LocalFree(resMsg);

From 4e177c7895abebbae17bda41886f38a954b2808a Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 15 Mar 2013 22:04:05 +0000
Subject: [PATCH 45/61] [CRT] * Annotate stdlib_s.h. * Annotate more functions
 in stdlib.h.

svn path=/trunk/; revision=58511
---
 reactos/include/crt/sec_api/stdlib_s.h | 348 ++++++++++++++++++++++---
 reactos/include/crt/stdlib.h           |  22 +-
 2 files changed, 329 insertions(+), 41 deletions(-)

diff --git a/reactos/include/crt/sec_api/stdlib_s.h b/reactos/include/crt/sec_api/stdlib_s.h
index 2601746b7e4..2f2697b2eec 100644
--- a/reactos/include/crt/sec_api/stdlib_s.h
+++ b/reactos/include/crt/sec_api/stdlib_s.h
@@ -14,50 +14,330 @@
 extern "C" {
 #endif
 
-  _CRTIMP errno_t __cdecl _dupenv_s(char **_PBuffer,size_t *_PBufferSizeInBytes,const char *_VarName);
-  _CRTIMP errno_t __cdecl _itoa_s(int _Value,char *_DstBuf,size_t _Size,int _Radix);
-  _CRTIMP errno_t __cdecl _i64toa_s(__int64 _Val,char *_DstBuf,size_t _Size,int _Radix);
-  _CRTIMP errno_t __cdecl _ui64toa_s(unsigned __int64 _Val,char *_DstBuf,size_t _Size,int _Radix);
-  _CRTIMP errno_t __cdecl _ltoa_s(long _Val,char *_DstBuf,size_t _Size,int _Radix);
-  _CRTIMP errno_t __cdecl mbstowcs_s(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount);
-  _CRTIMP errno_t __cdecl _mbstowcs_s_l(size_t *_PtNumOfCharConverted,wchar_t *_DstBuf,size_t _SizeInWords,const char *_SrcBuf,size_t _MaxCount,_locale_t _Locale);
-  _CRTIMP errno_t __cdecl _ultoa_s(unsigned long _Val,char *_DstBuf,size_t _Size,int _Radix);
-  _CRTIMP errno_t __cdecl _wctomb_s_l(int *_SizeConverted,char *_MbCh,size_t _SizeInBytes,wchar_t _WCh,_locale_t _Locale);
-  _CRTIMP errno_t __cdecl wcstombs_s(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes);
-  _CRTIMP errno_t __cdecl _wcstombs_s_l(size_t *_PtNumOfCharConverted,char *_Dst,size_t _DstSizeInBytes,const wchar_t *_Src,size_t _MaxCountInBytes,_locale_t _Locale);
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _dupenv_s(
+    _Outptr_result_buffer_maybenull_(*_PBufferSizeInBytes) _Outptr_result_z_ char **_PBuffer,
+    _Out_opt_ size_t *_PBufferSizeInBytes,
+    _In_z_ const char *_VarName);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _itoa_s(
+    _In_ int _Value,
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ int _Radix);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _i64toa_s(
+    _In_ __int64 _Val,
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ int _Radix);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ui64toa_s(
+    _In_ unsigned __int64 _Val,
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ int _Radix);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ltoa_s(
+    _In_ long _Val,
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ int _Radix);
+
+  _Success_(return!=EINVAL)
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  mbstowcs_s(
+    _Out_opt_ size_t *pcchConverted,
+    _Out_writes_to_opt_(sizeInWords, *pcchConverted) wchar_t *pwcstr,
+    _In_ size_t sizeInWords,
+    _In_reads_or_z_(count) const char *pmbstr,
+    _In_ size_t count);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _mbstowcs_s_l(
+    _Out_opt_ size_t *_PtNumOfCharConverted,
+    _Out_writes_to_opt_(_SizeInWords, *_PtNumOfCharConverted) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_reads_or_z_(_MaxCount) const char *_SrcBuf,
+    _In_ size_t _MaxCount,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_opt_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ultoa_s(
+    _In_ unsigned long _Val,
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ int _Radix);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wctomb_s_l(
+    _Out_opt_ int *_SizeConverted,
+    _Out_writes_opt_z_(_SizeInBytes) char *_MbCh,
+    _In_ size_t _SizeInBytes,
+    _In_ wchar_t _WCh,
+    _In_opt_ _locale_t _Locale);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  wcstombs_s(
+    _Out_opt_ size_t *_PtNumOfCharConverted,
+    _Out_writes_bytes_to_opt_(_DstSizeInBytes, *_PtNumOfCharConverted) char *_Dst,
+    _In_ size_t _DstSizeInBytes,
+    _In_z_ const wchar_t *_Src,
+    _In_ size_t _MaxCountInBytes);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wcstombs_s_l(
+    _Out_opt_ size_t *_PtNumOfCharConverted,
+    _Out_writes_bytes_to_opt_(_DstSizeInBytes, *_PtNumOfCharConverted) char *_Dst,
+    _In_ size_t _DstSizeInBytes,
+    _In_z_ const wchar_t *_Src,
+    _In_ size_t _MaxCountInBytes,
+    _In_opt_ _locale_t _Locale);
 
 #ifndef _WSTDLIB_S_DEFINED
 #define _WSTDLIB_S_DEFINED
-  _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
-  _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
-  _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
-  _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName);
-  _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName);
-  _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
-  _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
-#endif
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _itow_s(
+    _In_ int _Val,
+    _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_ int _Radix);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ltow_s(
+    _In_ long _Val,
+    _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_ int _Radix);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ultow_s(
+    _In_ unsigned long _Val,
+    _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_ int _Radix);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wgetenv_s(
+    _Out_ size_t *_ReturnSize,
+    _Out_writes_opt_z_(_DstSizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _DstSizeInWords,
+    _In_z_ const wchar_t *_VarName);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wdupenv_s(
+    _Outptr_result_buffer_maybenull_(*_BufferSizeInWords) _Outptr_result_z_ wchar_t **_Buffer,
+    _Out_opt_ size_t *_BufferSizeInWords,
+    _In_z_ const wchar_t *_VarName);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _i64tow_s(
+    _In_ __int64 _Val,
+    _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_ int _Radix);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ui64tow_s(
+    _In_ unsigned __int64 _Val,
+    _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf,
+    _In_ size_t _SizeInWords,
+    _In_ int _Radix);
+
+#endif /* _WSTDLIB_S_DEFINED */
 
 #ifndef _POSIX_
-  _CRTIMP errno_t __cdecl _ecvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDights,int *_PtDec,int *_PtSign);
-  _CRTIMP errno_t __cdecl _fcvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDec,int *_PtDec,int *_PtSign);
-  _CRTIMP errno_t __cdecl _gcvt_s(char *_DstBuf,size_t _Size,double _Val,int _NumOfDigits);
-  _CRTIMP errno_t __cdecl _makepath_s(char *_PathResult,size_t _Size,const char *_Drive,const char *_Dir,const char *_Filename,const char *_Ext);
-  _CRTIMP errno_t __cdecl _putenv_s(const char *_Name,const char *_Value);
-  _CRTIMP errno_t __cdecl _searchenv_s(const char *_Filename,const char *_EnvVar,char *_ResultPath,size_t _SizeInBytes);
-  _CRTIMP errno_t __cdecl _splitpath_s(const char *_FullPath,char *_Drive,size_t _DriveSize,char *_Dir,size_t _DirSize,char *_Filename,size_t _FilenameSize,char *_Ext,size_t _ExtSize);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _ecvt_s(
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ double _Val,
+    _In_ int _NumOfDights,
+    _Out_ int *_PtDec,
+    _Out_ int *_PtSign);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _fcvt_s(
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ double _Val,
+    _In_ int _NumOfDec,
+    _Out_ int *_PtDec,
+    _Out_ int *_PtSign);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _gcvt_s(
+    _Out_writes_z_(_Size) char *_DstBuf,
+    _In_ size_t _Size,
+    _In_ double _Val,
+    _In_ int _NumOfDigits);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _makepath_s(
+    _Out_writes_z_(_Size) char *_PathResult,
+    _In_ size_t _Size,
+    _In_opt_z_ const char *_Drive,
+    _In_opt_z_ const char *_Dir,
+    _In_opt_z_ const char *_Filename,
+    _In_opt_z_ const char *_Ext);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _putenv_s(
+    _In_z_ const char *_Name,
+    _In_z_ const char *_Value);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _searchenv_s(
+    _In_z_ const char *_Filename,
+    _In_z_ const char *_EnvVar,
+    _Out_writes_z_(_SizeInBytes) char *_ResultPath,
+    _In_ size_t _SizeInBytes);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _splitpath_s(
+    _In_z_ const char *_FullPath,
+    _Out_writes_opt_z_(_DriveSize) char *_Drive,
+    _In_ size_t _DriveSize,
+    _Out_writes_opt_z_(_DirSize) char *_Dir,
+    _In_ size_t _DirSize,
+    _Out_writes_opt_z_(_FilenameSize) char *_Filename,
+    _In_ size_t _FilenameSize,
+    _Out_writes_opt_z_(_ExtSize) char *_Ext,
+    _In_ size_t _ExtSize);
 
 #ifndef _WSTDLIBP_S_DEFINED
 #define _WSTDLIBP_S_DEFINED
-  _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext);
-  _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value);
-  _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords);
-  _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords);
-#endif
-#endif
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wmakepath_s(
+    _Out_writes_z_(_SizeInWords) wchar_t *_PathResult,
+    _In_ size_t _SizeInWords,
+    _In_opt_z_ const wchar_t *_Drive,
+    _In_opt_z_ const wchar_t *_Dir,
+    _In_opt_z_ const wchar_t *_Filename,
+    _In_opt_z_ const wchar_t *_Ext);
+
+  _Check_return_wat_
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wputenv_s(
+    _In_z_ const wchar_t *_Name,
+    _In_z_ const wchar_t *_Value);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wsearchenv_s(
+    _In_z_ const wchar_t *_Filename,
+    _In_z_ const wchar_t *_EnvVar,
+    _Out_writes_z_(_SizeInWords) wchar_t *_ResultPath,
+    _In_ size_t _SizeInWords);
+
+  _CRTIMP
+  errno_t
+  __cdecl
+  _wsplitpath_s(
+    _In_z_ const wchar_t *_FullPath,
+    _Out_writes_opt_z_(_DriveSizeInWords) wchar_t *_Drive,
+    _In_ size_t _DriveSizeInWords,
+    _Out_writes_opt_z_(_DirSizeInWords) wchar_t *_Dir,
+    _In_ size_t _DirSizeInWords,
+    _Out_writes_opt_z_(_FilenameSizeInWords) wchar_t *_Filename,
+    _In_ size_t _FilenameSizeInWords,
+    _Out_writes_opt_z_(_ExtSizeInWords) wchar_t *_Ext,
+    _In_ size_t _ExtSizeInWords);
+
+#endif /* _WSTDLIBP_S_DEFINED */
+
+#endif /* _POSIX_ */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
-#endif
+#endif /* defined(MINGW_HAS_SECURE_API) */
+
+#endif /* _INC_STDLIB_S */
diff --git a/reactos/include/crt/stdlib.h b/reactos/include/crt/stdlib.h
index 1ee091de6e8..cd197283ecc 100644
--- a/reactos/include/crt/stdlib.h
+++ b/reactos/include/crt/stdlib.h
@@ -131,11 +131,11 @@ extern "C" {
 
   typedef void (__cdecl *_purecall_handler)(void);
 
-  _CRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler _Handler);
+  _CRTIMP _purecall_handler __cdecl _set_purecall_handler(_In_opt_ _purecall_handler _Handler);
   _CRTIMP _purecall_handler __cdecl _get_purecall_handler(void);
 
   typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t *,const wchar_t *,const wchar_t *,unsigned int,uintptr_t);
-  _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler _Handler);
+  _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_In_opt_ _invalid_parameter_handler _Handler);
   _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void);
 
 #include <errno.h>
@@ -186,8 +186,8 @@ extern "C" {
 
   _CRTIMP errno_t __cdecl _get_environ(_Out_ char***);
   _CRTIMP errno_t __cdecl _get_wenviron(_Out_ wchar_t***);
-  _CRTIMP errno_t __cdecl _get_pgmptr(_Deref_out_z_ char **_Value);
-  _CRTIMP errno_t __cdecl _get_wpgmptr(_Deref_out_z_ wchar_t **_Value);
+  _CRTIMP errno_t __cdecl _get_pgmptr(_Outptr_result_z_ char **_Value);
+  _CRTIMP errno_t __cdecl _get_wpgmptr(_Outptr_result_z_ wchar_t **_Value);
 
 #ifdef _M_CEE_PURE
   _CRTIMP int* __cdecl __p__fmode();
@@ -330,7 +330,7 @@ extern "C" {
   void
   __cdecl
   qsort(
-    _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) void *_Base,
+    _Inout_updates_bytes_(_NumOfElements * _SizeOfElements) _Post_readable_byte_size_(_NumOfElements * _SizeOfElements) void *_Base,
     _In_ size_t _NumOfElements,
     _In_ size_t _SizeOfElements,
     _In_ int (__cdecl *_PtFuncCompare)(const void *,const void *));
@@ -464,6 +464,7 @@ extern "C" {
 
 #endif /* _INTEGRAL_MAX_BITS >= 64 */
 
+  _Check_return_
   ldiv_t
   __cdecl
   ldiv(
@@ -710,6 +711,7 @@ extern "C" {
   malloc(
     _In_ size_t _Size);
 
+  _Success_(return != 0)
   _Check_return_
   _Ret_maybenull_
   _Post_writable_byte_size_(_NewSize)
@@ -719,6 +721,7 @@ extern "C" {
     _Pre_maybenull_ _Post_invalid_ void *_Memory,
     _In_ size_t _NewSize);
 
+  _Success_(return != 0)
   _Check_return_
   _Ret_maybenull_
   _Post_writable_byte_size_(_Count * _Size)
@@ -768,6 +771,7 @@ extern "C" {
     _In_ size_t _Alignment,
     _In_ size_t _Offset);
 
+  _Success_(return != 0)
   _Check_return_
   _Ret_maybenull_
   _Post_writable_byte_size_(_Size)
@@ -779,6 +783,7 @@ extern "C" {
     _In_ size_t _Size,
     _In_ size_t _Alignment);
 
+  _Success_(return != 0)
   _Check_return_
   _Ret_maybenull_
   _Post_writable_byte_size_(_Count * _Size)
@@ -791,6 +796,7 @@ extern "C" {
     _In_ size_t _Size,
     _In_ size_t _Alignment);
 
+  _Success_(return != 0)
   _Check_return_
   _Ret_maybenull_
   _Post_writable_byte_size_(_Size)
@@ -1143,12 +1149,14 @@ extern "C" {
     _In_z_ char *_Str,
     _In_opt_ _locale_t _Locale);
 
+  _Check_return_
   unsigned long
   __cdecl
   _lrotl(
     _In_ unsigned long _Val,
     _In_ int _Shift);
 
+  _Check_return_
   unsigned long
   __cdecl
   _lrotr(
@@ -1426,10 +1434,10 @@ extern "C" {
 
   __MINGW_EXTENSION typedef struct { long long quot, rem; } lldiv_t;
 
-  __MINGW_EXTENSION lldiv_t __cdecl lldiv(long long, long long);
+  _Check_return_ __MINGW_EXTENSION lldiv_t __cdecl lldiv(_In_ long long, _In_ long long);
 
 #ifndef _MSC_VER
-  __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(long long _j) { return (_j >= 0 ? _j : -_j); }
+  __MINGW_EXTENSION __CRT_INLINE long long __cdecl llabs(_In_ long long _j) { return (_j >= 0 ? _j : -_j); }
 #endif
 
   __MINGW_EXTENSION long long  __cdecl strtoll(const char* __restrict__, char** __restrict, int);

From d90981b0301ba722b08f32d8fe732b8c04848bdd Mon Sep 17 00:00:00 2001
From: Daniel Reimer <reimer.daniel@freenet.de>
Date: Sat, 16 Mar 2013 08:17:19 +0000
Subject: [PATCH 46/61] Update Rapps Database. Welcome to CLT2013 ^^

svn path=/trunk/; revision=58512
---
 .../applications/rapps/rapps/bittorrent.txt   |  6 ++---
 .../applications/rapps/rapps/firefox5.txt     | 24 +++++++++----------
 .../base/applications/rapps/rapps/kdewin.txt  |  4 ++--
 .../applications/rapps/rapps/libreoffice.txt  |  4 ++--
 .../applications/rapps/rapps/mirandaim.txt    |  4 ++--
 .../base/applications/rapps/rapps/mirc.txt    |  4 ++--
 .../base/applications/rapps/rapps/mono2.txt   |  2 +-
 .../base/applications/rapps/rapps/opera.txt   |  4 ++--
 .../base/applications/rapps/rapps/scite.txt   |  4 ++--
 .../applications/rapps/rapps/seamonkey.txt    | 18 +++++++-------
 .../applications/rapps/rapps/sumatrapdf.txt   |  4 ++--
 .../applications/rapps/rapps/thunderbird5.txt | 18 +++++++-------
 .../applications/rapps/rapps/utorrent.txt     |  4 ++--
 13 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/reactos/base/applications/rapps/rapps/bittorrent.txt b/reactos/base/applications/rapps/rapps/bittorrent.txt
index 68dd202d1e2..e5dd543cc13 100644
--- a/reactos/base/applications/rapps/rapps/bittorrent.txt
+++ b/reactos/base/applications/rapps/rapps/bittorrent.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = BitTorrent
-Version = 7.7.2
+Version = 7.8
 Licence = Freeware for non-commercial uses
 Description = The Original BitTorrent Client.
-Size = 956KB
+Size = 1012KB
 Category = 5
 URLSite = http://www.bittorrent.com/
-URLDownload = http://download.bittorrent.com/7.7.2/BitTorrent.exe
+URLDownload = http://download.bittorrent.com/7.8/BitTorrent.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/firefox5.txt b/reactos/base/applications/rapps/rapps/firefox5.txt
index c7a488f3f59..c8bc4c6d26d 100644
--- a/reactos/base/applications/rapps/rapps/firefox5.txt
+++ b/reactos/base/applications/rapps/rapps/firefox5.txt
@@ -1,33 +1,33 @@
 ; UTF-8
 
 [Section]
-Name = Mozilla Firefox 17
-Version = 17.0.1
+Name = Mozilla Firefox 19
+Version = 19.0.2
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
 Size = 15.8MB
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/en-US/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/en-US/Firefox%20Setup%2019.0.2.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 15.7MB
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/de/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/de/Firefox%20Setup%2019.0.2.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 15.6MB
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/es-ES/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/es-ES/Firefox%20Setup%2019.0.2.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
 Size = 15.9MB
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/fr/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/fr/Firefox%20Setup%2019.0.2.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis Web browsers.
@@ -38,34 +38,34 @@ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 15.6MB
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/nb-NO/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/nb-NO/Firefox%20Setup%2019.0.2.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ…darek internetowych.
 Size = 16.5MB
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/pl/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/pl/Firefox%20Setup%2019.0.2.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune navigatoare web gratuite existente.
 Size = 16,1 Mo
 URLSite = http://www.mozilla-europe.org/ro/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/ro/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/ro/Firefox%20Setup%2019.0.2.exe
 
 [Section.0419]
 Description = Один из �амых попул�рных и лучших бе�платных браузеров.
 Size = 16.1MB
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/ru/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/ru/Firefox%20Setup%2019.0.2.exe
 
 [Section.041b] 
 Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliada�ov.
 Size = 16.3MB
 URLSite = http://www.mozilla-europe.org/sk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/sk/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/sk/Firefox%20Setup%2019.0.2.exe
 
 [Section.0422]
 Description = �айпопул�рніший та один з кращих безплатних веб-браузерів.
 Size = 16.1MB
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/17.0.1/win32/uk/Firefox%20Setup%2017.0.1.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/19.0.2/win32/uk/Firefox%20Setup%2019.0.2.exe
diff --git a/reactos/base/applications/rapps/rapps/kdewin.txt b/reactos/base/applications/rapps/rapps/kdewin.txt
index 7d9022d1eb4..fca793b6e07 100644
--- a/reactos/base/applications/rapps/rapps/kdewin.txt
+++ b/reactos/base/applications/rapps/rapps/kdewin.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = K Desktop Environment
-Version = 0.9.9-7
+Version = 0.9.9-8
 Licence = GPL
 Description = KDE for Windows.
 Size = 2.21MB
 Category = 15
 URLSite = http://www.winkde.org/
-URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.9-7.exe
+URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.9.9-8.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/libreoffice.txt b/reactos/base/applications/rapps/rapps/libreoffice.txt
index 0fa0fd7c77f..1cb734e1a59 100644
--- a/reactos/base/applications/rapps/rapps/libreoffice.txt
+++ b/reactos/base/applications/rapps/rapps/libreoffice.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = LibreOffice
-Version = 3.6.4
+Version = 4.0.1
 Licence = LGPL
 Description = Former called OpenOffice. Open Source Office Suite.
 Size = 200.0MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.6.4/win/x86/LibO_3.6.4_Win_x86_install_multi.msi
+URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.0.1/win/x86/LibreOffice_4.0.1_Win_x86.msi
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/mirandaim.txt b/reactos/base/applications/rapps/rapps/mirandaim.txt
index 694fce29978..1c39c74a722 100644
--- a/reactos/base/applications/rapps/rapps/mirandaim.txt
+++ b/reactos/base/applications/rapps/rapps/mirandaim.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = Miranda IM
-Version = 0.10.9
+Version = 0.10.11
 Licence = GPL
 Description = Open source multiprotocol instant messaging application - May not work completely.
 Size = 3.1MB
 Category = 5
 URLSite = http://www.miranda-im.org/
-URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.9-unicode.exe
+URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.11-unicode.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/mirc.txt b/reactos/base/applications/rapps/rapps/mirc.txt
index 921a25080cd..953303ca36c 100644
--- a/reactos/base/applications/rapps/rapps/mirc.txt
+++ b/reactos/base/applications/rapps/rapps/mirc.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = mIRC 7
-Version = 7.27
+Version = 7.29
 Licence = Shareware
 Description = The most popular client for the Internet Relay Chat (IRC).
 Size = 1.82MB
 Category = 5
 URLSite = http://www.mirc.com/
-URLDownload = http://download.mirc.com/6/mirc727.exe
+URLDownload = http://download.mirc.com/7/mirc729.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/mono2.txt b/reactos/base/applications/rapps/rapps/mono2.txt
index 2794b7076fc..74be2a2fa2e 100644
--- a/reactos/base/applications/rapps/rapps/mono2.txt
+++ b/reactos/base/applications/rapps/rapps/mono2.txt
@@ -8,7 +8,7 @@ Description = Open Source .net Framework.
 Size = 91.9MB
 Category = 14
 URLSite = http://www.mono-project.com/Main_Page
-URLDownload = http://download.mono-project.com/archive/2.11.4/windows-installer/mono-2.11.4-gtksharp-2.12.11-win32-0.exe
+URLDownload = http://download.mono-project.com/archive/2.10.9/windows-installer/0/mono-2.10.9-gtksharp-2.12.11-win32-0.exe
 CDPath = none
 
 [Section.040a]
diff --git a/reactos/base/applications/rapps/rapps/opera.txt b/reactos/base/applications/rapps/rapps/opera.txt
index 96060dc1764..c0eaaab8eb8 100644
--- a/reactos/base/applications/rapps/rapps/opera.txt
+++ b/reactos/base/applications/rapps/rapps/opera.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = Opera
-Version = 12.12
+Version = 12.14
 Licence = Freeware
 Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
 Size = 12.00MB
 Category = 5
 URLSite = http://www.opera.com/
-URLDownload = http://ftp.opera.com/pub/opera/win/1212/int/Opera_1212_int_Setup.exe
+URLDownload = http://ftp.opera.com/pub/opera/win/1214/int/Opera_1214_int_Setup.exe
 CDPath = none
 
 [Section.0405]
diff --git a/reactos/base/applications/rapps/rapps/scite.txt b/reactos/base/applications/rapps/rapps/scite.txt
index 6a5ed5d79e8..3d42b09514f 100644
--- a/reactos/base/applications/rapps/rapps/scite.txt
+++ b/reactos/base/applications/rapps/rapps/scite.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = SciTE
-Version = 3.2.3
+Version = 3.2.5
 Licence = Freeware
 Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.
 Size = 685kB
 Category = 7
 URLSite = http://www.scintilla.org/
-URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.3/Sc323.exe
+URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.5/Sc325.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/seamonkey.txt b/reactos/base/applications/rapps/rapps/seamonkey.txt
index b04482c4bdc..fe171f7e003 100644
--- a/reactos/base/applications/rapps/rapps/seamonkey.txt
+++ b/reactos/base/applications/rapps/rapps/seamonkey.txt
@@ -2,39 +2,39 @@
 
 [Section]
 Name = Mozilla SeaMonkey
-Version = 2.14.1
+Version = 2.16.2
 Licence = MPL/GPL/LGPL
 Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.
 Size = 20.0MB
 Category = 5
 URLSite = http://www.seamonkey-project.org/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/en-US/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/en-US/SeaMonkey%20Setup%202.16.2.exe
 CDPath = none
 
 [Section.0407]
 Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
 Size = 20.0MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/de/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/de/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.040a]
 Description = La suite de Mozilla está viva. Es el primero y único navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarás.
 Size = 19.9MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/es-ES/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/es-ES/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.040c]
 Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin.
 Size = 20.2MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/fr/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/fr/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.0413]
 Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer.
 Size = 20.6MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/nl/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/nl/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.0415]
 Description = Pakiet Mozilla żyje. W zestawie: przeglądarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz.
 Size = 20.8MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/pl/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/pl/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.0418]
 Description = Suita Mozilla. Acest pachet ce încorporează navigator, poștă electronică, client IRC și editor HTML, acoperind astfel o arie largă de necesități.
@@ -43,9 +43,9 @@ Size = 20.59Mo
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
 Size = 20.5MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/ru/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/ru/SeaMonkey%20Setup%202.16.2.exe
 
 [Section.0422]
 Description = Продовженн� Mozilla Suite. Включає в �ебе браузер, поштовий клієнт, IRC-клієнт та HTML-редактор.
 Size = 20.5MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.14.1/win32/ru/SeaMonkey%20Setup%202.14.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.16.2/win32/ru/SeaMonkey%20Setup%202.16.2.exe
diff --git a/reactos/base/applications/rapps/rapps/sumatrapdf.txt b/reactos/base/applications/rapps/rapps/sumatrapdf.txt
index d1c1465a9a9..9ee530c4a17 100644
--- a/reactos/base/applications/rapps/rapps/sumatrapdf.txt
+++ b/reactos/base/applications/rapps/rapps/sumatrapdf.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = SumatraPDF
-Version = 2.2
+Version = 2.2.1
 Licence = GPLv3
 Description = Sumatra PDF is a slim, free, open-source PDF reader. Portable out of the box.
 Size = 4.8MB
 Category = 6
 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader.html
-URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.2-install.exe
+URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.2.1-install.exe
 CDPath = none
 
 [Section.0407]
diff --git a/reactos/base/applications/rapps/rapps/thunderbird5.txt b/reactos/base/applications/rapps/rapps/thunderbird5.txt
index 0a8255f8eb5..e70d751cee0 100644
--- a/reactos/base/applications/rapps/rapps/thunderbird5.txt
+++ b/reactos/base/applications/rapps/rapps/thunderbird5.txt
@@ -2,32 +2,32 @@
 
 [Section]
 Name = Mozilla Thunderbird 17
-Version = 17.0
+Version = 17.0.4
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Mail Clients out there.
 Size = 17.6MB
 Category = 5
 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/en-US/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/en-US/Thunderbird%20Setup%2017.0.4.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Mail-Clients.
 Size = 17.5MB
 URLSite = http://www.mozilla-europe.org/de/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/de/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/de/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores clientes mail que hay.
 Size = 17.4MB
 URLSite = http://www.mozilla-europe.org/es/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/es-ES/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/es-ES/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.040c]
 Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible.
 Size = 17.8MB
 URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/fr/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/fr/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis e-mail-programma's.
@@ -39,22 +39,22 @@ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1
 Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty.
 Size = 18.3MB
 URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/pl/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/pl/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune clientele gratuite de poștă electronică.
 Size = 18,0 Mo
 URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/ro/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/ro/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.0419]
 Description = Один из �амых попул�рных и лучших бе�платных почтовых клиентов.
 Size = 17.9MB
 URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/ru/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/ru/Thunderbird%20Setup%2017.0.4.exe
 
 [Section.0422]
 Description = �айпопул�рніший та один з кращих поштових клієнтів.
 Size = 17.9MB
 URLSite = http://www.mozillamessaging.com/uk/thunderbird/
-URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0/win32/uk/Thunderbird%20Setup%2017.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/17.0.4/win32/uk/Thunderbird%20Setup%2017.0.4.exe
diff --git a/reactos/base/applications/rapps/rapps/utorrent.txt b/reactos/base/applications/rapps/rapps/utorrent.txt
index 36f0225c13f..434673c5891 100644
--- a/reactos/base/applications/rapps/rapps/utorrent.txt
+++ b/reactos/base/applications/rapps/rapps/utorrent.txt
@@ -2,13 +2,13 @@
 
 [Section]
 Name = µTorrent
-Version = 3.2.3
+Version = 3.3
 Licence = Freeware for non-commercial uses
 Description = Small and fast BitTorrent Client.
 Size = 946.00kB
 Category = 5
 URLSite = http://www.utorrent.com/
-URLDownload = http://download.utorrent.com/3.2.3/uTorrent.exe
+URLDownload = http://download.utorrent.com/3.3/uTorrent.exe
 CDPath = none
 
 

From aa4c4bda1ea2affd31009792c3ca884f9518ffb9 Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Sat, 16 Mar 2013 09:09:53 +0000
Subject: [PATCH 47/61] [win32csr] - When we close a window during shutdown,
 switch to the desktop of the window CORE-5439

svn path=/trunk/; revision=58513
---
 reactos/win32ss/user/win32csr/exitros.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/reactos/win32ss/user/win32csr/exitros.c b/reactos/win32ss/user/win32csr/exitros.c
index e8ac3f24098..0b92f35c41a 100644
--- a/reactos/win32ss/user/win32csr/exitros.c
+++ b/reactos/win32ss/user/win32csr/exitros.c
@@ -61,6 +61,7 @@ typedef struct tagNOTIFY_CONTEXT
     WPARAM wParam;
     LPARAM lParam;
     HDESK Desktop;
+    HDESK OldDesktop;
     DWORD StartTime;
     DWORD QueryResult;
     HWND Dlg;
@@ -412,8 +413,13 @@ NotifyDesktopEnum(LPWSTR DesktopName, LPARAM lParam)
         return FALSE;
     }
 
+    Context->OldDesktop = GetThreadDesktop(GetCurrentThreadId());
+    SwitchDesktop(Context->Desktop);
+
     EnumDesktopWindows(Context->Desktop, NotifyTopLevelEnum, lParam);
 
+    SwitchDesktop(Context->OldDesktop);
+
     CloseDesktop(Context->Desktop);
 
     return QUERY_RESULT_CONTINUE == Context->QueryResult;

From cbed503fb8a848e9c02e98369499982e4209803d Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Sat, 16 Mar 2013 10:12:16 +0000
Subject: [PATCH 48/61] [win32k] - Store the session id in WINSTATION_OBJECT
 when we create a window station. - Don't allow switching to a desktop that
 belongs to a different session This is a modified version of the patch from
 CORE-5531

svn path=/trunk/; revision=58514
---
 reactos/win32ss/user/ntuser/desktop.c | 6 ++++++
 reactos/win32ss/user/ntuser/winsta.c  | 1 +
 reactos/win32ss/user/ntuser/winsta.h  | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/reactos/win32ss/user/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c
index dfa993ea9f8..566af46425e 100644
--- a/reactos/win32ss/user/ntuser/desktop.c
+++ b/reactos/win32ss/user/ntuser/desktop.c
@@ -1632,6 +1632,12 @@ NtUserSwitchDesktop(HDESK hdesk)
       RETURN(FALSE);
    }
 
+   if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId)
+   {
+      ERR("NtUserSwitchDesktop called for a desktop of a different session\n");
+      RETURN(FALSE);  
+   }
+
    if(pdesk == gpdeskInputDesktop)
    {
        WARN("NtUserSwitchDesktop called for active desktop\n");
diff --git a/reactos/win32ss/user/ntuser/winsta.c b/reactos/win32ss/user/ntuser/winsta.c
index 3056fc3d5bf..315fdb5da54 100644
--- a/reactos/win32ss/user/ntuser/winsta.c
+++ b/reactos/win32ss/user/ntuser/winsta.c
@@ -432,6 +432,7 @@ NtUserCreateWindowStation(
    Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable);
    WindowStationObject->SystemMenuTemplate = (HANDLE)0;
    WindowStationObject->Name = WindowStationName;
+   WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId;
 
    if (InputWindowStation == NULL)
    {
diff --git a/reactos/win32ss/user/ntuser/winsta.h b/reactos/win32ss/user/ntuser/winsta.h
index f2d0fba2ea6..4b20fc6f251 100644
--- a/reactos/win32ss/user/ntuser/winsta.h
+++ b/reactos/win32ss/user/ntuser/winsta.h
@@ -9,6 +9,8 @@
 
 typedef struct _WINSTATION_OBJECT
 {
+    DWORD dwSessionId;
+
     KSPIN_LOCK Lock;
     UNICODE_STRING Name;
     LIST_ENTRY DesktopListHead;

From f4e620080580367907a984e368eaa360348b6d16 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 16 Mar 2013 13:40:28 +0000
Subject: [PATCH 49/61] [CRT] Implement [v]s[nw]printf_s

[MSVCRT]
Enable [v]s[nw]printf_s exports

svn path=/trunk/; revision=58515
---
 reactos/dll/win32/msvcrt/msvcrt.spec       | 16 +++---
 reactos/lib/sdk/crt/crt.cmake              |  8 +++
 reactos/lib/sdk/crt/printf/_snprintf_s.c   | 13 +++++
 reactos/lib/sdk/crt/printf/_snwprintf_s.c  | 14 +++++
 reactos/lib/sdk/crt/printf/_sxprintf.c     | 65 ++++++++++++++++++++--
 reactos/lib/sdk/crt/printf/_vsnprintf_s.c  | 14 +++++
 reactos/lib/sdk/crt/printf/_vsnwprintf_s.c | 15 +++++
 reactos/lib/sdk/crt/printf/sprintf_s.c     | 13 +++++
 reactos/lib/sdk/crt/printf/swprintf_s.c    | 14 +++++
 reactos/lib/sdk/crt/printf/vsprintf_s.c    | 14 +++++
 reactos/lib/sdk/crt/printf/vswprintf_s.c   | 15 +++++
 11 files changed, 188 insertions(+), 13 deletions(-)
 create mode 100644 reactos/lib/sdk/crt/printf/_snprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/_snwprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/_vsnprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/_vsnwprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/sprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/swprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/vsprintf_s.c
 create mode 100644 reactos/lib/sdk/crt/printf/vswprintf_s.c

diff --git a/reactos/dll/win32/msvcrt/msvcrt.spec b/reactos/dll/win32/msvcrt/msvcrt.spec
index 23ca3b7c17f..2336c22d95f 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.spec
+++ b/reactos/dll/win32/msvcrt/msvcrt.spec
@@ -832,7 +832,7 @@
 # stub _snprintf_c
 # stub _snprintf_c_l
 # stub _snprintf_l
-# stub _snprintf_s
+@ varargs _snprintf_s(ptr long long ptr)
 # stub _snprintf_s_l
 # stub _snscanf
 # stub _snscanf_l
@@ -840,7 +840,7 @@
 # stub _snscanf_s_l
 @ varargs _snwprintf(ptr long wstr)
 # stub _snwprintf_l
-# stub _snwprintf_s
+@ varargs _snwprintf_s(ptr long long ptr)
 # stub _snwprintf_s_l
 # stub _snwscanf
 # stub _snwscanf_l
@@ -985,11 +985,11 @@
 @ cdecl _vsnprintf_c(ptr long str ptr) _vsnprintf
 # @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) _vsnprintf_l
 # @ cdecl _vsnprintf_l(ptr long str ptr ptr)
-# @ cdecl _vsnprintf_s(ptr long long str ptr)
+@ cdecl _vsnprintf_s(ptr long long str ptr)
 # @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr)
 @ cdecl _vsnwprintf(ptr long wstr ptr)
 # @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr)
-# @ cdecl _vsnwprintf_s(ptr long long wstr ptr)
+@ cdecl _vsnwprintf_s(ptr long long wstr ptr)
 # @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr)
 # stub _vsprintf_l
 @ cdecl _vsprintf_p(ptr long str ptr)
@@ -1313,7 +1313,7 @@
 @ cdecl -arch=x86_64 sinf(long)
 @ cdecl sinh(double)
 @ varargs sprintf(ptr str)
-# @ varargs sprintf_s(ptr long str)
+@ varargs sprintf_s(ptr long str)
 @ cdecl sqrt(double)
 @ cdecl -arch=x86_64 sqrtf(long)
 @ cdecl srand(long)
@@ -1348,7 +1348,7 @@
 @ cdecl strtoul(str ptr long)
 @ cdecl strxfrm(ptr str long)
 @ varargs swprintf(ptr wstr)
-# @ varargs swprintf_s(ptr long wstr)
+@ varargs swprintf_s(ptr long wstr)
 @ varargs swscanf(wstr wstr)
 # @ varargs swscanf_s(wstr wstr)
 @ cdecl system(str)
@@ -1374,9 +1374,9 @@
 @ cdecl vprintf_s(str ptr)
 # stub vsnprintf
 @ cdecl vsprintf(ptr str ptr)
-# @ cdecl vsprintf_s(ptr long str ptr)
+@ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf(ptr wstr ptr)
-# @ cdecl vswprintf_s(ptr long wstr ptr)
+@ cdecl vswprintf_s(ptr long wstr ptr)
 @ cdecl vwprintf(wstr ptr)
 @ cdecl vwprintf_s(wstr ptr)
 # stub wcrtomb
diff --git a/reactos/lib/sdk/crt/crt.cmake b/reactos/lib/sdk/crt/crt.cmake
index eaf22f2c1c8..66d8a057fe1 100644
--- a/reactos/lib/sdk/crt/crt.cmake
+++ b/reactos/lib/sdk/crt/crt.cmake
@@ -135,13 +135,17 @@ list(APPEND CRT_SOURCE
     printf/_cprintf.c
     printf/_cwprintf.c
     printf/_snprintf.c
+    printf/_snprintf_s.c
     printf/_snwprintf.c
+    printf/_snwprintf_s.c
     printf/_vcprintf.c
     printf/_vcwprintf.c
     printf/_vscprintf.c
     printf/_vscwprintf.c
     printf/_vsnprintf.c
+    printf/_vsnprintf_s.c
     printf/_vsnwprintf.c
+    printf/_vsnwprintf_s.c
     printf/_vsprintf_p.c
     printf/fprintf.c
     printf/fprintf_s.c
@@ -150,8 +154,10 @@ list(APPEND CRT_SOURCE
     printf/printf.c
     printf/printf_s.c
     printf/sprintf.c
+    printf/sprintf_s.c
     printf/streamout.c
     printf/swprintf.c
+    printf/swprintf_s.c
     printf/vfprintf.c
     printf/vfprintf_s.c
     printf/vfwprintf.c
@@ -159,7 +165,9 @@ list(APPEND CRT_SOURCE
     printf/vprintf.c
     printf/vprintf_s.c
     printf/vsprintf.c
+    printf/vsprintf_s.c
     printf/vswprintf.c
+    printf/vswprintf_s.c
     printf/vwprintf.c
     printf/vwprintf_s.c
     printf/wprintf.c
diff --git a/reactos/lib/sdk/crt/printf/_snprintf_s.c b/reactos/lib/sdk/crt/printf/_snprintf_s.c
new file mode 100644
index 00000000000..249a8b3936f
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/_snprintf_s.c
@@ -0,0 +1,13 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/_snprintf_s.c
+ * PURPOSE:         Implementation of _snprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf _snprintf_s
+#define USE_COUNT 1
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/_snwprintf_s.c b/reactos/lib/sdk/crt/printf/_snwprintf_s.c
new file mode 100644
index 00000000000..cd60e135466
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/_snwprintf_s.c
@@ -0,0 +1,14 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/_snwprintf_s.c
+ * PURPOSE:         Implementation of _snwprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf _snwprintf_s
+#define USE_COUNT 1
+#define _UNICODE
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/_sxprintf.c b/reactos/lib/sdk/crt/printf/_sxprintf.c
index 44d35ecafff..28d77aa2fd7 100644
--- a/reactos/lib/sdk/crt/printf/_sxprintf.c
+++ b/reactos/lib/sdk/crt/printf/_sxprintf.c
@@ -10,6 +10,9 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <tchar.h>
+#if IS_SECAPI
+#include <internal/safecrt.h>
+#endif
 
 #ifdef _UNICODE
 #define _tstreamout wstreamout
@@ -17,6 +20,8 @@
 #define _tstreamout streamout
 #endif
 
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+
 int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr);
 
 int
@@ -27,6 +32,9 @@ _cdecl
 #endif
 _sxprintf(
     TCHAR *buffer,
+#if IS_SECAPI
+    size_t sizeOfBuffer,
+#endif
 #if USE_COUNT
    size_t count,
 #endif
@@ -37,20 +45,42 @@ _sxprintf(
     ...)
 #endif
 {
+#if !USE_COUNT
+    const size_t count = INT_MAX;
+#endif
+#if !IS_SECAPI
+    const size_t sizeOfBuffer = count;
+#endif
 #if !USE_VARARGS
     va_list argptr;
 #endif
     int result;
     FILE stream;
 
+    /* Check trivial case */
+    if ((buffer == NULL) && (count == 0) && (sizeOfBuffer == 0))
+    {
+        return 0;
+    }
+
+#if IS_SECAPI
+    /* Validate parameters */
+    if (MSVCRT_CHECK_PMT(((buffer == NULL) || (format == NULL) || (sizeOfBuffer <= 0))))
+    {
+        errno = EINVAL;
+        return -1;
+    }
+
+    /* Limit output to count + 1 characters */
+    if (count != -1)
+        sizeOfBuffer = min(sizeOfBuffer, count + 1);
+#endif
+
+    /* Setup the FILE structure */
     stream._base = (char*)buffer;
     stream._ptr = stream._base;
     stream._charbuf = 0;
-#if USE_COUNT
-    stream._cnt = (int)(count * sizeof(TCHAR));
-#else
-    stream._cnt = INT_MAX;
-#endif
+    stream._cnt = (int)(sizeOfBuffer * sizeof(TCHAR));
     stream._bufsiz = 0;
     stream._flag = _IOSTRG | _IOWRT;
     stream._tmpfname = 0;
@@ -63,8 +93,33 @@ _sxprintf(
     va_end(argptr);
 #endif
 
+#if IS_SECAPI
+    /* Check for failure or unterminated string */
+    if ((result < 0) || (result == sizeOfBuffer))
+    {
+        /* Null-terminate the buffer at the end */
+        buffer[sizeOfBuffer-1] = _T('\0');
+
+        /* Check if we can truncate */
+        if (count != _TRUNCATE)
+        {
+            /* We can't, invoke invalid parameter handler */
+            MSVCRT_INVALID_PMT("Buffer is too small");
+
+            /* If we came back, set the buffer to an empty string */
+            *buffer = 0;
+        }
+
+        /* Return failure */
+        return -1;
+    }
+
+    /* Null-terminate the buffer after the string */
+    buffer[result] = _T('\0');
+#else
     /* Only zero terminate if there is enough space left */
     if (stream._cnt >= sizeof(TCHAR)) *(TCHAR*)stream._ptr = _T('\0');
+#endif
 
     return result;
 }
diff --git a/reactos/lib/sdk/crt/printf/_vsnprintf_s.c b/reactos/lib/sdk/crt/printf/_vsnprintf_s.c
new file mode 100644
index 00000000000..7355406e798
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/_vsnprintf_s.c
@@ -0,0 +1,14 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/_vsnprintf_s.c
+ * PURPOSE:         Implementation of _vsnprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf _vsnprintf_s
+#define USE_COUNT 1
+#define USE_VARARGS 1
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c b/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c
new file mode 100644
index 00000000000..fc7585cdf2f
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/_vsnwprintf_s.c
@@ -0,0 +1,15 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/_vsnwprintf_s.c
+ * PURPOSE:         Implementation of _vsnwprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf _vsnwprintf_s
+#define USE_COUNT 1
+#define USE_VARARGS 1
+#define _UNICODE
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/sprintf_s.c b/reactos/lib/sdk/crt/printf/sprintf_s.c
new file mode 100644
index 00000000000..671747391f2
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/sprintf_s.c
@@ -0,0 +1,13 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/sprintf_s.c
+ * PURPOSE:         Implementation of sprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf sprintf_s
+#define USE_COUNT 0
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/swprintf_s.c b/reactos/lib/sdk/crt/printf/swprintf_s.c
new file mode 100644
index 00000000000..a77136c6849
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/swprintf_s.c
@@ -0,0 +1,14 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/swprintf_s.c
+ * PURPOSE:         Implementation of swprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf swprintf_s
+#define USE_COUNT 0
+#define USE_VARARGS 0
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/vsprintf_s.c b/reactos/lib/sdk/crt/printf/vsprintf_s.c
new file mode 100644
index 00000000000..b049afaecd3
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/vsprintf_s.c
@@ -0,0 +1,14 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/vsprintf_s.c
+ * PURPOSE:         Implementation of vsprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf vsprintf_s
+#define USE_COUNT 0
+#define USE_VARARGS 1
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"
diff --git a/reactos/lib/sdk/crt/printf/vswprintf_s.c b/reactos/lib/sdk/crt/printf/vswprintf_s.c
new file mode 100644
index 00000000000..68702ba9f75
--- /dev/null
+++ b/reactos/lib/sdk/crt/printf/vswprintf_s.c
@@ -0,0 +1,15 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/printf/vswprintf_s.c
+ * PURPOSE:         Implementation of vswprintf_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _sxprintf vswprintf_s
+#define USE_COUNT 0
+#define USE_VARARGS 1
+#define _UNICODE
+#define IS_SECAPI 1
+
+#include "_sxprintf.c"

From abf1110ae81f6caa4e9164719439ddbd12e68dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 13:50:24 +0000
Subject: [PATCH 50/61] [SERVICES] - Precise the purpose of lock.c - Add an
 informative comment.

No code changes.

svn path=/trunk/; revision=58516
---
 reactos/base/system/services/driver.c | 8 +++-----
 reactos/base/system/services/lock.c   | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/base/system/services/driver.c b/reactos/base/system/services/driver.c
index 8526b663211..a22ed98820c 100644
--- a/reactos/base/system/services/driver.c
+++ b/reactos/base/system/services/driver.c
@@ -141,13 +141,11 @@ ScmGetDriverStatus(PSERVICE lpService,
 
     if (lpService->Status.dwServiceType == SERVICE_KERNEL_DRIVER)
     {
-        RtlInitUnicodeString(&DirName,
-                             L"\\Driver");
+        RtlInitUnicodeString(&DirName, L"\\Driver");
     }
-    else
+    else // if (lpService->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER)
     {
-        RtlInitUnicodeString(&DirName,
-                             L"\\FileSystem");
+        RtlInitUnicodeString(&DirName, L"\\FileSystem");
     }
 
     InitializeObjectAttributes(&ObjectAttributes,
diff --git a/reactos/base/system/services/lock.c b/reactos/base/system/services/lock.c
index 1f27d80dc8f..6993e3dcb72 100644
--- a/reactos/base/system/services/lock.c
+++ b/reactos/base/system/services/lock.c
@@ -2,7 +2,7 @@
  * PROJECT:     ReactOS Service Control Manager
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/system/services/lock.c
- * PURPOSE:     Service lock functions
+ * PURPOSE:     User-side Services Start Serialization Lock functions
  * COPYRIGHT:   Copyright 2012 Hermès Bélusca
  */
 
@@ -16,6 +16,7 @@
 
 /* GLOBALS *******************************************************************/
 
+/* The unique user service start lock of the SCM */
 static PSTART_LOCK pServiceStartLock = NULL;
 
 

From 05a927e9e3453fc4fb9f380d630371172fa9dd08 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 16 Mar 2013 14:46:35 +0000
Subject: [PATCH 51/61] [CRT] Implement _splitpath_s and _wsplitpath_s

[MSVCRT]
Export _splitpath_s and _wsplitpath_s

svn path=/trunk/; revision=58517
---
 reactos/dll/win32/msvcrt/msvcrt.spec       |   4 +-
 reactos/lib/sdk/crt/crt.cmake              |   6 +-
 reactos/lib/sdk/crt/libcntpr.cmake         |   4 +-
 reactos/lib/sdk/crt/string/_splitpath.c    |  11 ++
 reactos/lib/sdk/crt/string/_splitpath_s.c  |  12 ++
 reactos/lib/sdk/crt/string/_tsplitpath_x.h | 146 +++++++++++++++++++++
 reactos/lib/sdk/crt/string/_wsplitpath.c   |  12 ++
 reactos/lib/sdk/crt/string/_wsplitpath_s.c |  13 ++
 reactos/lib/sdk/crt/string/splitp.c        |  94 -------------
 reactos/lib/sdk/crt/string/wsplitp.c       |   7 -
 10 files changed, 202 insertions(+), 107 deletions(-)
 create mode 100644 reactos/lib/sdk/crt/string/_splitpath.c
 create mode 100644 reactos/lib/sdk/crt/string/_splitpath_s.c
 create mode 100644 reactos/lib/sdk/crt/string/_tsplitpath_x.h
 create mode 100644 reactos/lib/sdk/crt/string/_wsplitpath.c
 create mode 100644 reactos/lib/sdk/crt/string/_wsplitpath_s.c
 delete mode 100644 reactos/lib/sdk/crt/string/splitp.c
 delete mode 100644 reactos/lib/sdk/crt/string/wsplitp.c

diff --git a/reactos/dll/win32/msvcrt/msvcrt.spec b/reactos/dll/win32/msvcrt/msvcrt.spec
index 2336c22d95f..db1d101a047 100644
--- a/reactos/dll/win32/msvcrt/msvcrt.spec
+++ b/reactos/dll/win32/msvcrt/msvcrt.spec
@@ -857,7 +857,7 @@
 @ cdecl _spawnvp(long str ptr)
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
-# stub _splitpath_s
+@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long)
 # stub _sprintf_l
 # stub _sprintf_p_l
 # stub _sprintf_s_l
@@ -1127,7 +1127,7 @@
 @ cdecl _wspawnvp(long wstr ptr)
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
-# @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
+@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
 @ cdecl _wstat(wstr ptr)
 @ cdecl _wstati64(wstr ptr)
 @ cdecl _wstat64(wstr ptr)
diff --git a/reactos/lib/sdk/crt/crt.cmake b/reactos/lib/sdk/crt/crt.cmake
index 66d8a057fe1..c01e1756c90 100644
--- a/reactos/lib/sdk/crt/crt.cmake
+++ b/reactos/lib/sdk/crt/crt.cmake
@@ -260,6 +260,10 @@ list(APPEND CRT_SOURCE
     stdlib/wmakpath_s.c
     string/_mbsnlen.c
     string/_mbstrnlen.c
+    string/_splitpath.c
+    string/_splitpath_s.c
+    string/_wsplitpath.c
+    string/_wsplitpath_s.c
     string/atof.c
     string/atoi.c
     string/atoi64.c
@@ -271,7 +275,6 @@ list(APPEND CRT_SOURCE
     string/itow.c
     string/mbstowcs_s.c
     string/scanf.c
-    string/splitp.c
     string/strcoll.c
     string/strcspn.c
     string/strdup.c
@@ -299,7 +302,6 @@ list(APPEND CRT_SOURCE
     string/wcstombs_s.c
     string/wcstoul.c
     string/wctype.c
-    string/wsplitp.c
     string/wtoi.c
     string/wtoi64.c
     string/wtol.c
diff --git a/reactos/lib/sdk/crt/libcntpr.cmake b/reactos/lib/sdk/crt/libcntpr.cmake
index 7c8e490b3ca..487c92e3a60 100644
--- a/reactos/lib/sdk/crt/libcntpr.cmake
+++ b/reactos/lib/sdk/crt/libcntpr.cmake
@@ -26,6 +26,8 @@ list(APPEND LIBCNTPR_SOURCE
     search/bsearch.c
     search/lfind.c
     stdlib/qsort.c
+    string/_splitpath.c
+    string/_wsplitpath.c
     string/ctype.c
     string/iswctype.c
     string/is_wctype.c
@@ -46,7 +48,6 @@ list(APPEND LIBCNTPR_SOURCE
     string/itoa.c
     string/itow.c
     string/mbstowcs_nt.c
-    string/splitp.c
     string/strtol.c
     string/strtoul.c
     string/strtoull.c
@@ -55,7 +56,6 @@ list(APPEND LIBCNTPR_SOURCE
     string/wcstombs_nt.c
     string/wcstoul.c
     string/wctype.c
-    string/wsplitp.c
     string/wtoi64.c
     string/wtoi.c
     string/wtol.c
diff --git a/reactos/lib/sdk/crt/string/_splitpath.c b/reactos/lib/sdk/crt/string/_splitpath.c
new file mode 100644
index 00000000000..0a14da494ad
--- /dev/null
+++ b/reactos/lib/sdk/crt/string/_splitpath.c
@@ -0,0 +1,11 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/string/_splitpath.c
+ * PURPOSE:         Implementation of _splitpath
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _tsplitpath_x _splitpath
+
+#include "_tsplitpath_x.h"
diff --git a/reactos/lib/sdk/crt/string/_splitpath_s.c b/reactos/lib/sdk/crt/string/_splitpath_s.c
new file mode 100644
index 00000000000..ed9c4e2a25b
--- /dev/null
+++ b/reactos/lib/sdk/crt/string/_splitpath_s.c
@@ -0,0 +1,12 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/string/_splitpath_s.c
+ * PURPOSE:         Implementation of _splitpath_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _tsplitpath_x _splitpath_s
+#define IS_SECAPI 1
+
+#include "_tsplitpath_x.h"
diff --git a/reactos/lib/sdk/crt/string/_tsplitpath_x.h b/reactos/lib/sdk/crt/string/_tsplitpath_x.h
new file mode 100644
index 00000000000..76473c98257
--- /dev/null
+++ b/reactos/lib/sdk/crt/string/_tsplitpath_x.h
@@ -0,0 +1,146 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         BSD - See COPYING.ARM in the top level directory
+ * PURPOSE:         CRT: implementation of __[w]splitpath[_s]
+ * PROGRAMMERS:     Timo Kreuzer
+ */
+
+#include <precomp.h>
+#include <tchar.h>
+
+#if IS_SECAPI
+#define _FAILURE -1
+#define _SUCCESS 0
+
+_Check_return_wat_
+_CRTIMP_ALTERNATIVE
+errno_t
+__cdecl
+_tsplitpath_x(
+    _In_z_ const _TCHAR* path,
+    _Out_writes_opt_z_(drive_size) _TCHAR* drive,
+    _In_ size_t drive_size,
+    _Out_writes_opt_z_(dir_size) _TCHAR* dir,
+    _In_ size_t dir_size,
+    _Out_writes_opt_z_(fname_size) _TCHAR* fname,
+    _In_ size_t fname_size,
+    _Out_writes_opt_z_(ext_size) _TCHAR* ext,
+    _In_ size_t ext_size)
+#else
+#define _FAILURE
+#define _SUCCESS
+
+_CRT_INSECURE_DEPRECATE(_splitpath_s)
+_CRTIMP
+void
+__cdecl
+_tsplitpath_x(
+    _In_z_ const _TCHAR* path,
+    _Pre_maybenull_ _Post_z_ _TCHAR* drive,
+    _Pre_maybenull_ _Post_z_ _TCHAR* dir,
+    _Pre_maybenull_ _Post_z_ _TCHAR* fname,
+    _Pre_maybenull_ _Post_z_ _TCHAR* ext)
+#endif
+{
+    const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0;
+    size_t count;
+#if !IS_SECAPI
+    const size_t drive_size = INT_MAX, dir_size = INT_MAX,
+        fname_size = INT_MAX, ext_size = INT_MAX;
+#endif
+
+#if IS_SECAPI
+    /* Validate parameters */
+    if (MSVCRT_CHECK_PMT((path == NULL) ||
+                         ((drive != NULL) && (drive_size == 0)) ||
+                         ((dir != NULL) &&  (dir_size == 0)) ||
+                         ((fname != NULL) && (fname_size == 0)) ||
+                         ((ext != NULL) && (ext_size == 0))))
+    {
+        errno = EINVAL;
+        return -1;
+    }
+#endif
+
+    /* Truncate all output strings */
+    if (drive) drive[0] = '\0';
+    if (dir) dir[0] = '\0';
+    if (fname) fname[0] = '\0';
+    if (ext) ext[0] = '\0';
+
+#if WINVER >= 0x600
+    /* Check parameter */
+    if (!path)
+    {
+#ifndef _LIBCNT_
+        _set_errno(EINVAL);
+#endif
+        return _FAILURE;
+    }
+#endif
+
+    _Analysis_assume_(path != 0);
+
+#if WINVER == 0x600
+    /* Skip '\\?\' prefix */
+    if ((path[0] == '\\') && (path[1] == '\\') &&
+        (path[2] == '?') && (path[3] == '\\')) path += 4;
+#endif
+
+    if (path[0] == '\0') return _FAILURE;
+
+    /* Check if we have a drive letter (only 1 char supported) */
+    if (path[1] == ':')
+    {
+        if (drive && (drive_size >= 3))
+        {
+            drive[0] = path[0];
+            drive[1] = ':';
+            drive[2] = '\0';
+        }
+        path += 2;
+	}
+
+    /* Scan the rest of the string */
+    dir_start = path;
+    while (*path != '\0')
+    {
+        /* Remember last path separator and last dot */
+        if ((*path == '\\') || (*path == '/')) file_start = path + 1;
+        if (*path == '.') ext_start = path;
+        path++;
+    }
+
+    /* Check if we got a file name / extension */
+    if (!file_start)
+        file_start = dir_start;
+    if (!ext_start || ext_start < file_start)
+        ext_start = path;
+
+    if (dir)
+    {
+        src = dir_start;
+        count = dir_size - 1;
+        while (src < file_start && count--) *dir++ = *src++;
+        *dir = '\0';
+    }
+
+    if (fname)
+    {
+        src = file_start;
+        count = fname_size - 1;
+        while (src < ext_start && count--) *fname++ = *src++;
+        *fname = '\0';
+    }
+
+    if (ext)
+    {
+        src = ext_start;
+        count = ext_size - 1;
+        while (*src != '\0' && count--) *ext++ = *src++;
+        *ext = '\0';
+    }
+
+    return _SUCCESS;
+}
+
diff --git a/reactos/lib/sdk/crt/string/_wsplitpath.c b/reactos/lib/sdk/crt/string/_wsplitpath.c
new file mode 100644
index 00000000000..7cca8189731
--- /dev/null
+++ b/reactos/lib/sdk/crt/string/_wsplitpath.c
@@ -0,0 +1,12 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/string/_wsplitpath.c
+ * PURPOSE:         Implementation of _wsplitpath
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _tsplitpath_x _wsplitpath
+#define _UNICODE
+
+#include "_tsplitpath_x.h"
diff --git a/reactos/lib/sdk/crt/string/_wsplitpath_s.c b/reactos/lib/sdk/crt/string/_wsplitpath_s.c
new file mode 100644
index 00000000000..bebfc815d86
--- /dev/null
+++ b/reactos/lib/sdk/crt/string/_wsplitpath_s.c
@@ -0,0 +1,13 @@
+/*
+ * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
+ * PROJECT:         ReactOS crt library
+ * FILE:            lib/sdk/crt/string/_wsplitpath_s.c
+ * PURPOSE:         Implementation of _wsplitpath_s
+ * PROGRAMMER:      Timo Kreuzer
+ */
+
+#define _tsplitpath_x _wsplitpath_s
+#define _UNICODE
+#define IS_SECAPI 1
+
+#include "_tsplitpath_x.h"
diff --git a/reactos/lib/sdk/crt/string/splitp.c b/reactos/lib/sdk/crt/string/splitp.c
deleted file mode 100644
index 7500c920f96..00000000000
--- a/reactos/lib/sdk/crt/string/splitp.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * PROJECT:         ReactOS Kernel
- * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * PURPOSE:         CRT: implementation of _splitpath / _wsplitpath
- * PROGRAMMERS:     Timo Kreuzer
- */
-
-#include <precomp.h>
-#include <tchar.h>
-
-/*
- * @implemented
- */
-void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext)
-{
-    const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0;
-
-    /* Truncate all output strings */
-    if (drive) drive[0] = '\0';
-    if (dir) dir[0] = '\0';
-    if (fname) fname[0] = '\0';
-    if (ext) ext[0] = '\0';
-
-#if WINVER >= 0x600
-    /* Check parameter */
-    if (!path)
-    {
-#ifndef _LIBCNT_
-        _set_errno(EINVAL);
-#endif
-        return;
-    }
-#endif
-
-    _Analysis_assume_(path != 0);
-
-#if WINVER == 0x600
-    /* Skip '\\?\' prefix */
-    if ((path[0] == '\\') && (path[1] == '\\') &&
-        (path[2] == '?') && (path[3] == '\\')) path += 4;
-#endif
-
-    if (path[0] == '\0') return;
-
-    /* Check if we have a drive letter (only 1 char supported) */
-    if (path[1] == ':')
-    {
-        if (drive)
-        {
-            drive[0] = path[0];
-            drive[1] = ':';
-            drive[2] = '\0';
-        }
-        path += 2;
-	}
-
-    /* Scan the rest of the string */
-    dir_start = path;
-    while (*path != '\0')
-    {
-        /* Remember last path seperator and last dot */
-        if ((*path == '\\') || (*path == '/')) file_start = path + 1;
-        if (*path == '.') ext_start = path;
-        path++;
-    }
-
-    /* Check if we got a file name / extension */
-    if (!file_start)
-        file_start = dir_start;
-    if (!ext_start || ext_start < file_start)
-        ext_start = path;
-
-    if (dir)
-    {
-        src = dir_start;
-        while (src < file_start) *dir++ = *src++;
-        *dir = '\0';
-    }
-
-    if (fname)
-    {
-        src = file_start;
-        while (src < ext_start) *fname++ = *src++;
-        *fname = '\0';
-    }
-
-    if (ext)
-    {
-        src = ext_start;
-        while (*src != '\0') *ext++ = *src++;
-        *ext = '\0';
-    }
-}
-
diff --git a/reactos/lib/sdk/crt/string/wsplitp.c b/reactos/lib/sdk/crt/string/wsplitp.c
deleted file mode 100644
index 4655be577bd..00000000000
--- a/reactos/lib/sdk/crt/string/wsplitp.c
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#define _UNICODE
-#define UNICODE
-
-#include <tchar.h>
-
-#include "splitp.c"

From 0b0a413710c00ffbcc5abfc440dbe786859f1066 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 16 Mar 2013 15:01:33 +0000
Subject: [PATCH 52/61] [GDI32_WINETEST] * Sync with Wine 1.5.26.

svn path=/trunk/; revision=58518
---
 rostests/winetests/gdi32/CMakeLists.txt |   6 +-
 rostests/winetests/gdi32/bitmap.c       | 282 +++++++--
 rostests/winetests/gdi32/clipping.c     |  16 +
 rostests/winetests/gdi32/dc.c           | 148 ++++-
 rostests/winetests/gdi32/dib.c          |   3 +-
 rostests/winetests/gdi32/font.c         | 780 ++++++++++++++++++++++--
 rostests/winetests/gdi32/gdiobj.c       |  44 ++
 rostests/winetests/gdi32/metafile.c     | 199 +++++-
 rostests/winetests/gdi32/wine_test.sfd  |  29 +-
 rostests/winetests/gdi32/wine_test.ttf  | Bin 1552 -> 1652 bytes
 10 files changed, 1363 insertions(+), 144 deletions(-)

diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt
index 725662fdfca..b2899c80b06 100644
--- a/rostests/winetests/gdi32/CMakeLists.txt
+++ b/rostests/winetests/gdi32/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(
     -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+    -D__WINESRC__)
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
@@ -22,9 +22,7 @@ list(APPEND SOURCE
     pen.c
     testlist.c)
 
-add_executable(gdi32_winetest
-    ${SOURCE}
-    resource.rc)
+add_executable(gdi32_winetest ${SOURCE} resource.rc)
 
 if(NOT MSVC)
     # FIXME: http://www.cmake.org/Bug/view.php?id=12998
diff --git a/rostests/winetests/gdi32/bitmap.c b/rostests/winetests/gdi32/bitmap.c
index d4a6e3a6376..84f1d11929d 100755
--- a/rostests/winetests/gdi32/bitmap.c
+++ b/rostests/winetests/gdi32/bitmap.c
@@ -339,16 +339,18 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER
     ok(ret == 0, "%d != 0\n", ret);
 }
 
-#define test_color(hdc, color, exp) \
-{ \
-    COLORREF c; \
-    c = SetPixel(hdc, 0, 0, color); \
-    ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \
-    c = GetPixel(hdc, 0, 0); \
-    ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \
-    c = GetNearestColor(hdc, color); \
-    ok(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \
+static void _test_color( int line, HDC hdc, COLORREF color, COLORREF exp )
+{
+    COLORREF c;
+    c = SetPixel(hdc, 0, 0, color);
+    ok_(__FILE__, line)(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, exp);
+    c = GetPixel(hdc, 0, 0);
+    ok_(__FILE__, line)(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, exp);
+    c = GetNearestColor(hdc, color);
+    ok_(__FILE__, line)(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, exp);
 }
+#define test_color(hdc, color, exp) _test_color( __LINE__, hdc, color, exp )
+
 
 static void test_dib_bits_access( HBITMAP hdib, void *bits )
 {
@@ -892,7 +894,7 @@ static void test_dib_formats(void)
 
     memset( data, 0xaa, sizeof(data) );
 
-#if 0 // FIXME: ReactOS Bug 6527
+#if 0 // FIXME: CORE-5922
     for (bpp = 0; bpp <= 64; bpp++)
     {
         for (planes = 0; planes <= 64; planes++)
@@ -1516,6 +1518,189 @@ static void test_bitmap(void)
     DeleteDC(hdc);
 }
 
+static COLORREF get_nearest( int r, int g, int b )
+{
+    return (r*r + g*g + b*b < (255-r)*(255-r) + (255-g)*(255-g) + (255-b)*(255-b)) ? 0x000000 : 0xffffff;
+}
+
+static int is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b )
+{
+    if (fg == 0 || bg == 0xffffff) return RGB(r,g,b) != 0xffffff && RGB(r,g,b) != bg;
+    return RGB(r,g,b) == 0x000000 || RGB(r,g,b) == bg;
+}
+
+static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, int b )
+{
+    static const WORD pattern_bits[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa };
+    BITMAPINFO *info;
+    RGBQUAD *colors;
+    WORD bits[16];
+    void *bits_ptr;
+    COLORREF res;
+    HBRUSH old_brush;
+    HPEN old_pen;
+    HBITMAP bitmap;
+    HDC memdc;
+
+    res = SetPixel( hdc, 0, 0, RGB(r,g,b) );
+    ok( res == get_nearest( r, g, b ),
+        "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg );
+    res = GetPixel( hdc, 0, 0 );
+    ok( res == get_nearest( r, g, b ),
+        "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg );
+    res = GetNearestColor( hdc, RGB(r,g,b) );
+    ok( res == get_nearest( r, g, b ),
+        "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg );
+
+    /* solid pen */
+    old_pen = SelectObject( hdc, CreatePen( PS_SOLID, 1, RGB(r,g,b) ));
+    MoveToEx( hdc, 0, 0, NULL );
+    LineTo( hdc, 16, 0 );
+    res = GetPixel( hdc, 0, 0 );
+    ok( res == (is_black_pen( fg, bg, r, g, b ) ? 0 : 0xffffff),
+        "wrong result %06x for %02x,%02x,%02x fg %06x bg %06x\n", res, r, g, b, fg, bg );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == (is_black_pen( fg, bg, r, g, b ) ? 0x00 : 0xffff),
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+    DeleteObject( SelectObject( hdc, old_pen ));
+
+    /* mono DDB pattern brush */
+    bitmap = CreateBitmap( 16, 8, 1, 1, pattern_bits );
+    old_brush = SelectObject( hdc, CreatePatternBrush( bitmap ));
+    PatBlt( hdc, 0, 0, 16, 16, PATCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0x5555,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+    DeleteObject( SelectObject( hdc, old_brush ));
+
+    /* mono DDB bitmap */
+    memdc = CreateCompatibleDC( hdc );
+    SelectObject( memdc, bitmap );
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0x5555,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+    SetTextColor( memdc, RGB(255,255,255) );
+    SetBkColor( memdc, RGB(0,0,0) );
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0x5555,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+
+    /* mono DIB section */
+    info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) );
+    colors = info->bmiColors;
+    info->bmiHeader.biSize = sizeof(info->bmiHeader);
+    info->bmiHeader.biHeight = -16;
+    info->bmiHeader.biWidth = 16;
+    info->bmiHeader.biBitCount = 1;
+    info->bmiHeader.biPlanes = 1;
+    info->bmiHeader.biCompression = BI_RGB;
+    colors[0].rgbRed = 0xff;
+    colors[0].rgbGreen = 0xff;
+    colors[0].rgbBlue = 0xf0;
+    colors[1].rgbRed = 0x20;
+    colors[1].rgbGreen = 0x0;
+    colors[1].rgbBlue = 0x0;
+    bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 );
+    memset( bits_ptr, 0x55, 64 );
+    DeleteObject( SelectObject( memdc, bitmap ));
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0x5555,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+
+    colors[0].rgbRed = 0x0;
+    colors[0].rgbGreen = 0x0;
+    colors[0].rgbBlue = 0x10;
+    colors[1].rgbRed = 0xff;
+    colors[1].rgbGreen = 0xf0;
+    colors[1].rgbBlue = 0xff;
+    bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits_ptr, NULL, 0 );
+    memset( bits_ptr, 0x55, 64 );
+    DeleteObject( SelectObject( memdc, bitmap ));
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0xaaaa,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+
+    SetTextColor( memdc, RGB(0,20,0) );
+    SetBkColor( memdc, RGB(240,240,240) );
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0x5555,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+
+    SetTextColor( memdc, RGB(250,250,250) );
+    SetBkColor( memdc, RGB(10,10,10) );
+    BitBlt( hdc, 0, 0, 16, 8, memdc, 0, 0, SRCCOPY );
+    GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits );
+    ok( bits[0] == 0xaaaa,
+        "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg );
+    DeleteDC( memdc );
+    DeleteObject( bitmap );
+    HeapFree( GetProcessHeap(), 0, info );
+}
+
+static void test_mono_bitmap(void)
+{
+    static const COLORREF colors[][2] =
+    {
+        { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff) },
+        { RGB(0xff,0xff,0xff), RGB(0x00,0x00,0x00) },
+        { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xfe) },
+        { RGB(0x00,0x01,0x00), RGB(0xff,0xff,0xff) },
+        { RGB(0x00,0x00,0x00), RGB(0x80,0x80,0x80) },
+        { RGB(0x80,0x80,0x80), RGB(0xff,0xff,0xff) },
+        { RGB(0x30,0x40,0x50), RGB(0x60,0x70,0x80) },
+        { RGB(0xa0,0xa0,0xa0), RGB(0x20,0x30,0x10) },
+        { PALETTEINDEX(0), PALETTEINDEX(255) },
+        { PALETTEINDEX(1), PALETTEINDEX(2) },
+    };
+
+    HBITMAP hbmp;
+    HDC hdc;
+    DWORD col;
+    int i, r, g, b;
+
+    if (!winetest_interactive)
+    {
+        skip("test_mono_bitmap skipped, CORE-5922\n");
+        return;
+    }
+
+    hdc = CreateCompatibleDC(0);
+    assert(hdc != 0);
+
+    hbmp = CreateBitmap(16, 16, 1, 1, NULL);
+    assert(hbmp != NULL);
+
+    SelectObject( hdc, hbmp );
+
+    for (col = 0; col < sizeof(colors) / sizeof(colors[0]); col++)
+    {
+        SetTextColor( hdc, colors[col][0] );
+        SetBkColor( hdc, colors[col][1] );
+
+        for (i = 0; i < 256; i++)
+        {
+            HPALETTE pal = GetCurrentObject( hdc, OBJ_PAL );
+            PALETTEENTRY ent;
+
+            if (!GetPaletteEntries( pal, i, 1, &ent )) GetPaletteEntries( pal, 0, 1, &ent );
+            test_color( hdc, PALETTEINDEX(i), get_nearest( ent.peRed, ent.peGreen, ent.peBlue ));
+            test_color( hdc, DIBINDEX(i), (i == 1) ? 0xffffff : 0x000000 );
+        }
+        for (r = 0; r < 256; r += 15)
+            for (g = 0; g < 256; g += 15)
+                for (b = 0; b < 256; b += 15)
+                    test_bitmap_colors( hdc, colors[col][0], colors[col][1], r, g, b );
+    }
+
+    DeleteDC(hdc);
+    DeleteObject(hbmp);
+}
+
 static void test_bmBits(void)
 {
     BYTE bits[4];
@@ -3176,12 +3361,13 @@ static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *src
         dwRop, expected, *dstBuffer, line);
 }
 
-static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer,
+static INT check_StretchDIBits_stretch( HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer,
                                         int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest,
                                         int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc,
                                         UINT32 expected[4], int line)
 {
     BITMAPINFO bitmapInfo;
+    INT ret;
 
     memset(&bitmapInfo, 0, sizeof(BITMAPINFO));
     bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@@ -3192,9 +3378,9 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s
     bitmapInfo.bmiHeader.biCompression = BI_RGB;
 
     memset(dstBuffer, 0, 16);
-    StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
-                  nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc,
-                  srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY);
+    ret = StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest,
+                        nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc,
+                        srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY);
     ok(memcmp(dstBuffer, expected, 16) == 0,
         "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } "
         "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n",
@@ -3202,6 +3388,7 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s
         dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3],
         nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc,
         nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line);
+    return ret;
 }
 
 static void test_StretchDIBits(void)
@@ -3213,6 +3400,7 @@ static void test_StretchDIBits(void)
     HBRUSH hBrush, hOldBrush;
     BITMAPINFO biDst;
     UINT32 expected[4];
+    INT ret;
 
     memset(&biDst, 0, sizeof(BITMAPINFO));
     biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@@ -3258,43 +3446,63 @@ static void test_StretchDIBits(void)
 
     expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE;
     expected[2] = 0xFEDCBA98, expected[3] = 0x76543210;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
 
     expected[0] = 0xCAFED00D, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0x00000000;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__);
+    todo_wine ok( ret == 1, "got ret %d\n", ret );
 
     expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98;
     expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
 
     expected[0] = 0x42441000, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0x00000000;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
 
     expected[0] = 0x00000000, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0x00000000;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__);
+    ok( ret == 0, "got ret %d\n", ret );
 
     expected[0] = 0x00000000, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0x00000000;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__);
+    ok( ret == 0, "got ret %d\n", ret );
 
     expected[0] = 0x00000000, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0x00000000;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__);
+    ok( ret == 0, "got ret %d\n", ret );
 
     expected[0] = 0x00000000, expected[1] = 0x00000000;
     expected[2] = 0x00000000, expected[3] = 0xCAFED00D;
-    check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
-                                1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__);
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
+
+    expected[0] = 0x00000000, expected[1] = 0x00000000;
+    expected[2] = 0x00000000, expected[3] = 0x00000000;
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      2, 2, 4, 4, 0, 0, 2, 2, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
+
+    expected[0] = 0x00000000, expected[1] = 0x00000000;
+    expected[2] = 0x00000000, expected[3] = 0x00000000;
+    ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer,
+                                      -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__);
+    ok( ret == 2, "got ret %d\n", ret );
 
     SelectObject(hdcDst, oldDst);
     DeleteObject(bmpDst);
@@ -3323,7 +3531,6 @@ static void test_GdiAlphaBlend(void)
     HDC hdcNull;
     HDC hdcDst;
     HBITMAP bmpDst;
-    HBITMAP oldDst;
     BITMAPINFO *bmi;
     HDC hdcSrc;
     HBITMAP bmpSrc;
@@ -3353,7 +3560,7 @@ static void test_GdiAlphaBlend(void)
     bmpSrc = CreateDIBSection(hdcDst, bmi, DIB_RGB_COLORS, &bits, NULL, 0);
     ok(bmpSrc != NULL, "Couldn't create source bitmap\n");
 
-    oldDst = SelectObject(hdcDst, bmpDst);
+    SelectObject(hdcDst, bmpDst);
     oldSrc = SelectObject(hdcSrc, bmpSrc);
 
     blend.BlendOp = AC_SRC_OVER;
@@ -3399,6 +3606,7 @@ static void test_GdiAlphaBlend(void)
     SetViewportExtEx(hdcDst, -1, -1, NULL);
     SetLastError(0xdeadbeef);
     ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend);
+    todo_wine
     ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() );
     SetLastError(0xdeadbeef);
     ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend);
@@ -3535,15 +3743,13 @@ static void test_GdiAlphaBlend(void)
     ok( !ret, "GdiAlphaBlend succeeded\n" );
     ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
 
-    SelectObject(hdcDst, oldDst);
-    SelectObject(hdcSrc, oldSrc);
-    DeleteObject(bmpSrc);
-    DeleteObject(bmpDst);
     DeleteDC(hdcDst);
     DeleteDC(hdcSrc);
+    DeleteObject(bmpSrc);
+    DeleteObject(bmpDst);
 
     ReleaseDC(NULL, hdcNull);
-
+    HeapFree(GetProcessHeap(), 0, bmi);
 }
 
 static void test_GdiGradientFill(void)
@@ -3656,6 +3862,7 @@ static void test_GdiGradientFill(void)
 
     DeleteDC( hdc );
     DeleteObject( bmp );
+    HeapFree(GetProcessHeap(), 0, bmi);
 }
 
 static void test_clipping(void)
@@ -5388,6 +5595,7 @@ START_TEST(bitmap)
     test_dib_formats();
     test_mono_dibsection();
     test_bitmap();
+    test_mono_bitmap();
     test_bmBits();
     test_GetDIBits_selected_DIB(1);
     test_GetDIBits_selected_DIB(4);
diff --git a/rostests/winetests/gdi32/clipping.c b/rostests/winetests/gdi32/clipping.c
index 04b2785eae1..0247bbb175d 100644
--- a/rostests/winetests/gdi32/clipping.c
+++ b/rostests/winetests/gdi32/clipping.c
@@ -401,6 +401,14 @@ static void test_memory_dc_clipping(void)
     ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100,
        "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom);
 
+    SetRect( &rc, 10, 10, 20, 20 );
+    ret = RectVisible( hdc, &rc );
+    ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom );
+
+    SetRect( &rc, 20, 20, 10, 10 );
+    ret = RectVisible( hdc, &rc );
+    ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom );
+
     DeleteDC(hdc);
     DeleteObject(hrgn);
     DeleteObject(hrgn_empty);
@@ -446,6 +454,14 @@ static void test_window_dc_clipping(void)
        "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height,
         rc.left, rc.top, rc.right, rc.bottom);
 
+    SetRect( &rc, 10, 10, 20, 20 );
+    ret = RectVisible( hdc, &rc );
+    ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom );
+
+    SetRect( &rc, 20, 20, 10, 10 );
+    ret = RectVisible( hdc, &rc );
+    ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom );
+
     ret = ExtSelectClipRgn(hdc, 0, RGN_COPY);
     ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),
        "expected SIMPLEREGION, got %d\n", ret);
diff --git a/rostests/winetests/gdi32/dc.c b/rostests/winetests/gdi32/dc.c
index e2860449a16..5f193705e9b 100644
--- a/rostests/winetests/gdi32/dc.c
+++ b/rostests/winetests/gdi32/dc.c
@@ -19,7 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+
 #define WINVER 0x0501 /* request latest DEVMODE */
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
 
 #include <assert.h>
 #include <stdio.h>
@@ -31,6 +34,10 @@
 #include "winspool.h"
 #include "winerror.h"
 
+#ifndef LAYOUT_LTR
+#define LAYOUT_LTR 0
+#endif
+
 static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout);
 
 static void dump_region(HRGN hrgn)
@@ -58,6 +65,7 @@ static void test_dc_values(void)
 {
     HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL);
     COLORREF color;
+    int extra;
 
     ok( hdc != NULL, "CreateDC failed\n" );
     color = SetBkColor( hdc, 0x12345678 );
@@ -86,6 +94,18 @@ static void test_dc_values(void)
     color = GetTextColor( hdc );
     ok( color == 0, "wrong color %08x\n", color );
 
+    extra = GetTextCharacterExtra( hdc );
+    ok( extra == 0, "initial extra %d\n", extra );
+    SetTextCharacterExtra( hdc, 123 );
+    extra = GetTextCharacterExtra( hdc );
+    ok( extra == 123, "initial extra %d\n", extra );
+    SetMapMode( hdc, MM_LOMETRIC );
+    extra = GetTextCharacterExtra( hdc );
+    ok( extra == 123, "initial extra %d\n", extra );
+    SetMapMode( hdc, MM_TEXT );
+    extra = GetTextCharacterExtra( hdc );
+    ok( extra == 123, "initial extra %d\n", extra );
+
     DeleteDC( hdc );
 }
 
@@ -124,10 +144,7 @@ static void test_savedc_2(void)
        rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom);
 
     ret = SaveDC(hdc);
-todo_wine
-{
     ok(ret == 1, "ret = %d\n", ret);
-}
 
     ret = IntersectClipRect(hdc, 0, 0, 50, 50);
     if (ret == COMPLEXREGION)
@@ -298,7 +315,7 @@ static void test_GdiConvertToDevmodeW(void)
     HeapFree(GetProcessHeap(), 0, dmW);
 }
 
-static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
+static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale )
 {
     static const int caps[] =
     {
@@ -374,27 +391,59 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
     else
     {
         for (i = 0; i < sizeof(caps)/sizeof(caps[0]); i++)
-            ok( GetDeviceCaps( hdc, caps[i] ) == GetDeviceCaps( ref_dc, caps[i] ),
-                "mismatched caps on %s for %u: %u/%u\n", descr, caps[i],
-                GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) );
+        {
+            INT precision = 0;
+            INT hdc_caps = GetDeviceCaps( hdc, caps[i] );
+
+            switch (caps[i])
+            {
+            case HORZSIZE:
+            case VERTSIZE:
+                hdc_caps /= scale;
+                precision = 1;
+                break;
+            case LOGPIXELSX:
+            case LOGPIXELSY:
+                hdc_caps *= scale;
+                break;
+            }
+
+            ok( abs(hdc_caps - GetDeviceCaps( ref_dc, caps[i] )) <= precision,
+                "mismatched caps on %s for %u: %u/%u (scale %d)\n", descr, caps[i],
+                hdc_caps, GetDeviceCaps( ref_dc, caps[i] ), scale );
+        }
 
         SetLastError( 0xdeadbeef );
         ret = GetDeviceGammaRamp( hdc, &ramp );
-        ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr );
-        ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */
-            "wrong error %u on %s\n", GetLastError(), descr );
+        if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER)
+        {
+            ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) );
+            ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */
+                "wrong error %u on %s\n", GetLastError(), descr );
+        }
+        else
+            ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() );
         type = GetClipBox( hdc, &rect );
         if (GetObjectType( hdc ) == OBJ_ENHMETADC)
             todo_wine ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr );
         else
             ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr );
 
+        type = GetBoundsRect( hdc, &rect, 0 );
+        ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */,
+            "GetBoundsRect returned type %x for %s\n", type, descr );
+        if (type == DCB_RESET)
+            ok( rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0,
+                "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n",
+                rect.left, rect.top, rect.right, rect.bottom, type, descr );
         type = SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE );
-        ok( type == (DCB_RESET | DCB_DISABLE), "SetBoundsRect returned %x\n", type );
+        ok( type == (DCB_RESET | DCB_DISABLE) || broken(type == (DCB_SET | DCB_ENABLE)) /* XP */,
+            "SetBoundsRect returned %x for %s (hdc type %d)\n", type, descr, GetObjectType( hdc ) );
+
         SetMapMode( hdc, MM_TEXT );
         Rectangle( hdc, 2, 2, 4, 4 );
         type = GetBoundsRect( hdc, &rect, DCB_RESET );
-        if (GetObjectType( hdc ) == OBJ_ENHMETADC)
+        if (GetObjectType( hdc ) == OBJ_ENHMETADC || (GetObjectType( hdc ) == OBJ_DC && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER))
             todo_wine
             ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET,
                 "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n",
@@ -406,7 +455,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
     }
 
     type = GetClipBox( ref_dc, &rect );
-    if (type != COMPLEXREGION)  /* region can be complex on multi-monitor setups */
+    if (type != COMPLEXREGION && type != ERROR)  /* region can be complex on multi-monitor setups */
     {
         ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr );
         ok( rect.left == 0 && rect.top == 0 &&
@@ -470,6 +519,10 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr )
         SelectObject( hdc, old );
         DeleteObject( dib );
     }
+
+    /* restore hdc state */
+    SetBoundsRect( hdc, NULL, DCB_RESET | DCB_DISABLE );
+    SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE );
 }
 
 static void test_CreateCompatibleDC(void)
@@ -478,9 +531,21 @@ static void test_CreateCompatibleDC(void)
     HDC hdc, hNewDC, hdcMetafile, screen_dc;
     HBITMAP bitmap;
     INT caps;
+    DEVMODE dm;
+
+    bitmap = CreateBitmap( 10, 10, 1, 1, NULL );
+
+    bRet = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm);
+    ok(bRet, "EnumDisplaySettingsEx failed\n");
+    dm.u1.s1.dmScale = 200;
+    dm.dmFields |= DM_SCALE;
+    hdc = CreateDC( "DISPLAY", NULL, NULL, &dm );
 
     screen_dc = CreateDC( "DISPLAY", NULL, NULL, NULL );
-    bitmap = CreateBitmap( 10, 10, 1, 1, NULL );
+    test_device_caps( hdc, screen_dc, "display dc", 1 );
+    ResetDC( hdc, &dm );
+    test_device_caps( hdc, screen_dc, "display dc", 1 );
+    DeleteDC( hdc );
 
     /* Create a DC compatible with the screen */
     hdc = CreateCompatibleDC(NULL);
@@ -489,7 +554,7 @@ static void test_CreateCompatibleDC(void)
     caps = GetDeviceCaps( hdc, TECHNOLOGY );
     ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps );
 
-    test_device_caps( hdc, screen_dc, "display dc" );
+    test_device_caps( hdc, screen_dc, "display dc", 1 );
 
     /* Delete this DC, this should succeed */
     bRet = DeleteDC(hdc);
@@ -507,7 +572,9 @@ static void test_CreateCompatibleDC(void)
     ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" );
     caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY );
     ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps );
-    test_device_caps( hdcMetafile, hdc, "enhmetafile dc" );
+    test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 );
+    ResetDC( hdcMetafile, &dm );
+    test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 );
     DeleteDC( hNewDC );
     DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile ));
     ReleaseDC( 0, hdc );
@@ -518,7 +585,9 @@ static void test_CreateCompatibleDC(void)
     ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n");
     caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY );
     ok( caps == DT_METAFILE, "wrong caps %u\n", caps );
-    test_device_caps( hdcMetafile, screen_dc, "metafile dc" );
+    test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 );
+    ResetDC( hdcMetafile, &dm );
+    test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 );
     DeleteMetaFile( CloseMetaFile( hdcMetafile ));
 
     DeleteObject( bitmap );
@@ -1139,7 +1208,17 @@ done:
     ReleaseDC(NULL, hdc);
 }
 
-static HDC create_printer_dc(void)
+static BOOL is_postscript_printer(HDC hdc)
+{
+    char tech[256];
+
+    if (ExtEscape(hdc, GETTECHNOLOGY, 0, NULL, sizeof(tech), tech) > 0)
+        return strcmp(tech, "PostScript") == 0;
+
+    return FALSE;
+}
+
+static HDC create_printer_dc(int scale, BOOL reset)
 {
     char buffer[260];
     DWORD len;
@@ -1175,9 +1254,15 @@ static HDC create_printer_dc(void)
     dbuf = HeapAlloc( GetProcessHeap(), 0, len );
     if (!pGetPrinterDriverA( hprn, NULL, 3, (LPBYTE)dbuf, len, &len )) goto done;
 
+    pbuf->pDevMode->u1.s1.dmScale = scale;
+    pbuf->pDevMode->dmFields |= DM_SCALE;
+
     hdc = CreateDCA( dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode );
-    trace( "hdc %p for driver '%s' printer '%s' port '%s'\n", hdc,
-           dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName );
+    trace( "hdc %p for driver '%s' printer '%s' port '%s' is %sPostScript\n", hdc,
+           dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName,
+           is_postscript_printer(hdc) ? "" : "NOT " );
+
+    if (reset) ResetDC( hdc, pbuf->pDevMode );
 done:
     HeapFree( GetProcessHeap(), 0, dbuf );
     HeapFree( GetProcessHeap(), 0, pbuf );
@@ -1192,9 +1277,19 @@ static void test_printer_dc(void)
     HDC memdc, display_memdc, enhmf_dc;
     HBITMAP orig, bmp;
     DWORD ret;
-    HDC hdc = create_printer_dc();
+    HDC hdc, hdc_200;
 
-    if (!hdc) return;
+    hdc = create_printer_dc(100, FALSE);
+    hdc_200 = create_printer_dc(200, FALSE);
+
+    if (!hdc || !hdc_200) return;
+
+    test_device_caps( hdc, hdc_200, "printer dc", is_postscript_printer(hdc) ? 2 : 1 );
+    DeleteDC( hdc_200 );
+
+    hdc_200 = create_printer_dc(200, TRUE);
+    test_device_caps( hdc, hdc_200, "printer dc", is_postscript_printer(hdc) ? 2 : 1 );
+    DeleteDC( hdc_200 );
 
     memdc = CreateCompatibleDC( hdc );
     display_memdc = CreateCompatibleDC( 0 );
@@ -1216,7 +1311,7 @@ static void test_printer_dc(void)
     ok( orig != NULL, "SelectObject failed\n" );
     ok( BitBlt( hdc, 10, 10, 20, 20, memdc, 0, 0, SRCCOPY ), "BitBlt failed\n" );
 
-    test_device_caps( memdc, hdc, "printer dc" );
+    test_device_caps( memdc, hdc, "printer dc", 1 );
 
     ok( !SelectObject( display_memdc, bmp ), "SelectObject succeeded\n" );
     SelectObject( memdc, orig );
@@ -1235,7 +1330,12 @@ static void test_printer_dc(void)
 
     enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL );
     ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n");
-    test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc" );
+    test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc", 1 );
+    DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc ));
+
+    enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL );
+    ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n");
+    test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc", 1 );
     DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc ));
 
     DeleteDC( memdc );
diff --git a/rostests/winetests/gdi32/dib.c b/rostests/winetests/gdi32/dib.c
index 38d1ee8ef78..9a11405641f 100644
--- a/rostests/winetests/gdi32/dib.c
+++ b/rostests/winetests/gdi32/dib.c
@@ -1312,6 +1312,7 @@ static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const
         if(current_sha1[i] == NULL)
         {
             ok(current_sha1[i] != NULL, "missing hash, got \"%s\",\n", hash);
+            HeapFree(GetProcessHeap(), 0, hash);
             return;
         }
     }
@@ -1908,6 +1909,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits)
 
     DeleteObject(bmp);
     SelectObject(hdc, orig_brush);
+    DeleteObject( dib_brush );
     SetBrushOrgEx(hdc, 0, 0, NULL);
     SetTextColor(hdc, old_text);
     SetBkColor(hdc, old_bkgnd);
@@ -2660,7 +2662,6 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits)
 
     SelectObject(hdc, orig_brush);
     SelectObject(hdc, orig_pen);
-    DeleteObject(dib_brush);
     DeleteObject(solid_brush);
     DeleteObject(wide_pen);
     DeleteObject(dashed_pen);
diff --git a/rostests/winetests/gdi32/font.c b/rostests/winetests/gdi32/font.c
index a028c8209bf..9b2028183df 100644
--- a/rostests/winetests/gdi32/font.c
+++ b/rostests/winetests/gdi32/font.c
@@ -45,6 +45,8 @@ static BOOL  (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, L
 static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs);
 static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags);
 static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags);
+static BOOL  (WINAPI *pGetTextExtentExPointI)(HDC hdc, const WORD *indices, INT count, INT max_ext,
+                                              LPINT nfit, LPINT dxs, LPSIZE size );
 static BOOL  (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *);
 static HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDV *);
 static HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *);
@@ -54,6 +56,7 @@ static BOOL  (WINAPI *pRemoveFontResourceExA)(LPCSTR, DWORD, PVOID);
 
 static HMODULE hgdi32 = 0;
 static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} };
+static WORD system_lang_id;
 
 static void init(void)
 {
@@ -68,12 +71,15 @@ static void init(void)
     pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges");
     pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA");
     pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW");
+    pGetTextExtentExPointI = (void *)GetProcAddress(hgdi32, "GetTextExtentExPointI");
     pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo");
     pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA");
     pAddFontMemResourceEx = (void *)GetProcAddress(hgdi32, "AddFontMemResourceEx");
     pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx");
     pAddFontResourceExA = (void *)GetProcAddress(hgdi32, "AddFontResourceExA");
     pRemoveFontResourceExA = (void *)GetProcAddress(hgdi32, "RemoveFontResourceExA");
+
+    system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID());
 }
 
 static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam)
@@ -680,6 +686,11 @@ static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW
     return 1; /* continue enumeration */
 }
 
+static BOOL is_CJK(void)
+{
+    return (system_lang_id == LANG_CHINESE || system_lang_id == LANG_JAPANESE || system_lang_id == LANG_KOREAN);
+}
+
 #define FH_SCALE 0x80000000
 static void test_bitmap_font_metrics(void)
 {
@@ -694,15 +705,15 @@ static void test_bitmap_font_metrics(void)
         int scaled_height;
     } fd[] =
     {
-        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 },
+        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 },
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 },
-        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 },
+        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 },
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 8, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 },
-        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 },
+        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 },
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 10, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 },
-        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 13 },
+        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 13 },
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 14, 11, 2, 2, 0, 5, 11, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 13 },
-        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 },
+        { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC, 16 },
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 18, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x7f, 0x20, FS_CYRILLIC, 0, 16 },
 
         { "MS Sans Serif", FW_NORMAL, FH_SCALE | 6, 13, 3, 3, 0, 7, 14, 120, 0x20, 0xff, 0x81, 0x20, FS_LATIN1 | FS_LATIN2, 0, 16 },
@@ -786,32 +797,32 @@ static void test_bitmap_font_metrics(void)
 
         { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 },
         { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
-        { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
 
         { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 14, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 },
         { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 17, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
 
         { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 },
         { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
-        { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC },
         { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
-        { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC },
         { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
-        { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0, 0, 0, 0, FS_ARABIC },
-        { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC },
+        { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1, LANG_ARABIC },
         { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
-        { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0, 0, 0, 0, FS_ARABIC },
-        { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC },
+        { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2, LANG_ARABIC },
         { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC },
-        { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0, 0, 0, 0, FS_ARABIC },
-        { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC },
+        { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC },
-        { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0, 0, 0, 0, FS_ARABIC },
-        { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, 0x00, 0xff, 0x60, 0x00, FS_ARABIC },
+        { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, 0x20, 0xff, 0x80, 0x20, FS_JISJAPAN },
 
         { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_JISJAPAN },
         { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN2 | FS_CYRILLIC },
@@ -828,7 +839,7 @@ static void test_bitmap_font_metrics(void)
 
         { "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 },
         { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, 96, 0x20, 0xff, 0x80, 0x20, FS_CYRILLIC },
-        { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0, 0, 0, 0, FS_JISJAPAN },
+        { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, 96, 0x20, 0xff, 0xa0, 0x20, FS_JISJAPAN },
 
         { "Fixedsys", FW_NORMAL, 20, 16, 4, 2, 0, 10, 10, 120, 0x20, 0xff, 0x80, 0x20, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }
 
@@ -840,11 +851,9 @@ static void test_bitmap_font_metrics(void)
     HFONT hfont, old_hfont;
     TEXTMETRIC tm;
     INT ret, i, expected_cs, screen_log_pixels, diff, font_res;
-    WORD system_lang_id;
     char face_name[LF_FACESIZE];
     CHARSETINFO csi;
 
-    system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID());
     trace("system language id %04x\n", system_lang_id);
 
     expected_cs = GetACP();
@@ -888,6 +897,7 @@ static void test_bitmap_font_metrics(void)
 
         for(bit = 0; bit < 32; bit++)
         {
+            GLYPHMETRICS gm;
             DWORD fs[2];
             BOOL bRet;
 
@@ -916,16 +926,11 @@ static void test_bitmap_font_metrics(void)
 
             hfont = create_font(lf.lfFaceName, &lf);
             old_hfont = SelectObject(hdc, hfont);
-            bRet = GetTextMetrics(hdc, &tm);
-            ok(bRet, "GetTextMetrics error %d\n", GetLastError());
 
             SetLastError(0xdeadbeef);
             ret = GetTextFace(hdc, sizeof(face_name), face_name);
             ok(ret, "GetTextFace error %u\n", GetLastError());
 
-            SetLastError(0xdeadbeef);
-            ret = GetTextCharset(hdc);
-
             if (lstrcmp(face_name, fd[i].face_name) != 0)
             {
                 ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n");
@@ -936,7 +941,23 @@ static void test_bitmap_font_metrics(void)
                 continue;
             }
 
-            ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs);
+            memset(&gm, 0, sizeof(gm));
+            SetLastError(0xdeadbeef);
+            ret = GetGlyphOutline(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat);
+            todo_wine {
+            ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n");
+            ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError());
+            }
+
+            bRet = GetTextMetrics(hdc, &tm);
+            ok(bRet, "GetTextMetrics error %d\n", GetLastError());
+
+            SetLastError(0xdeadbeef);
+            ret = GetTextCharset(hdc);
+            if (is_CJK() && lf.lfCharSet == ANSI_CHARSET)
+                ok(ret == ANSI_CHARSET, "got charset %d, expected ANSI_CHARSETd\n", ret);
+            else
+                ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs);
 
             trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX);
             trace("expected %s, height %d scaled_hight %d, dpi %d\n", fd[i].face_name, height, fd[i].scaled_height, fd[i].dpi);
@@ -1288,20 +1309,20 @@ static void test_text_extents(void)
     fit1 = fit2 = -215;
     ret = GetTextExtentExPointA(hdc, "One", 3, -1, &fit1, NULL, &sz);
     ok(ret == TRUE, "got %d\n", ret);
-    todo_wine ok(fit1 == 3, "fit = %d\n", fit1);
+    ok(fit1 == 3, "fit = %d\n", fit1);
     ret = GetTextExtentExPointW(hdc, wt, 3, -1, &fit2, NULL, &sz);
     ok(ret == TRUE, "got %d\n", ret);
-    todo_wine ok(fit2 == 3, "fit = %d\n", fit2);
+    ok(fit2 == 3, "fit = %d\n", fit2);
 
     /* max_extent = -2 is interpreted similarly, but the Ansi version
      * rejects it while the Unicode one accepts it */
     fit1 = fit2 = -215;
     ret = GetTextExtentExPointA(hdc, "One", 3, -2, &fit1, NULL, &sz);
-    todo_wine ok(ret == FALSE, "got %d\n", ret);
-    todo_wine ok(fit1 == -215, "fit = %d\n", fit1);
+    ok(ret == FALSE, "got %d\n", ret);
+    ok(fit1 == -215, "fit = %d\n", fit1);
     ret = GetTextExtentExPointW(hdc, wt, 3, -2, &fit2, NULL, &sz);
     ok(ret == TRUE, "got %d\n", ret);
-    todo_wine ok(fit2 == 3, "fit = %d\n", fit2);
+    ok(fit2 == 3, "fit = %d\n", fit2);
 
     hfont = SelectObject(hdc, hfont);
     DeleteObject(hfont);
@@ -1747,18 +1768,17 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea)
 {
     INT         y,
                 breakCount,
-                justifiedWidth = 0, /* to test GetTextExtentExPointW() */
                 areaWidth = clientArea->right - clientArea->left,
                 nErrors = 0, e;
-    BOOL        lastExtent = FALSE;
     PSTR        pFirstChar, pLastChar;
     SIZE        size;
     TEXTMETRICA tm;
     struct err
     {
-        char extent[100];
+        char *start;
+        int  len;
         int  GetTextExtentExPointWWidth;
-    } error[10];
+    } error[20];
 
     GetTextMetricsA(hdc, &tm);
     y = clientArea->top;
@@ -1797,18 +1817,16 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea)
         {
             SetTextJustification(hdc, areaWidth - size.cx, breakCount);
             GetTextExtentPoint32(hdc, pFirstChar, pLastChar - pFirstChar, &size);
-            justifiedWidth = size.cx;
+            if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1)
+            {
+                error[nErrors].start = pFirstChar;
+                error[nErrors].len = pLastChar - pFirstChar;
+                error[nErrors].GetTextExtentExPointWWidth = size.cx;
+                nErrors++;
+            }
         }
-        else lastExtent = TRUE;
 
-        /* catch errors and report them */
-        if (!lastExtent && (justifiedWidth != areaWidth))
-        {
-            memset(error[nErrors].extent, 0, 100);
-            memcpy(error[nErrors].extent, pFirstChar, pLastChar - pFirstChar);
-            error[nErrors].GetTextExtentExPointWWidth = justifiedWidth;
-            nErrors++;
-        }
+        trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar);
 
         y += size.cy;
         str = pLastChar;
@@ -1819,8 +1837,8 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea)
         /* The width returned by GetTextExtentPoint32() is exactly the same
            returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */
         ok(error[e].GetTextExtentExPointWWidth == areaWidth,
-            "GetTextExtentPointW() for \"%s\" should have returned a width of %d, not %d.\n",
-            error[e].extent, areaWidth, error[e].GetTextExtentExPointWWidth);
+            "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n",
+           error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth);
     }
 }
 
@@ -1831,6 +1849,9 @@ static void test_SetTextJustification(void)
     LOGFONTA lf;
     HFONT hfont;
     HWND hwnd;
+    SIZE size, expect;
+    int i;
+    WORD indices[2];
     static char testText[] =
             "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do "
             "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut "
@@ -1856,6 +1877,74 @@ static void test_SetTextJustification(void)
 
     testJustification(hdc, testText, &clientArea);
 
+    if (!pGetGlyphIndicesA || !pGetTextExtentExPointI) goto done;
+    pGetGlyphIndicesA( hdc, "A ", 2, indices, 0 );
+
+    SetTextJustification(hdc, 0, 0);
+    GetTextExtentPoint32(hdc, " ", 1, &expect);
+    GetTextExtentPoint32(hdc, "   ", 3, &size);
+    ok( size.cx == 3 * expect.cx, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 4, 1);
+    GetTextExtentPoint32(hdc, " ", 1, &size);
+    ok( size.cx == expect.cx + 4, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 9, 2);
+    GetTextExtentPoint32(hdc, "  ", 2, &size);
+    ok( size.cx == 2 * expect.cx + 9, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 7, 3);
+    GetTextExtentPoint32(hdc, "   ", 3, &size);
+    ok( size.cx == 3 * expect.cx + 7, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 7, 3);
+    SetTextCharacterExtra(hdc, 2 );
+    GetTextExtentPoint32(hdc, "   ", 3, &size);
+    ok( size.cx == 3 * (expect.cx + 2) + 7, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 0, 0);
+    SetTextCharacterExtra(hdc, 0);
+    size.cx = size.cy = 1234;
+    GetTextExtentPoint32(hdc, " ", 0, &size);
+    ok( size.cx == 0 && size.cy == 0, "wrong size %d,%d\n", size.cx, size.cy );
+    pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &expect);
+    SetTextJustification(hdc, 5, 1);
+    pGetTextExtentExPointI(hdc, indices, 2, -1, NULL, NULL, &size);
+    ok( size.cx == expect.cx + 5, "wrong size %d/%d\n", size.cx, expect.cx );
+    SetTextJustification(hdc, 0, 0);
+
+    SetMapMode( hdc, MM_ANISOTROPIC );
+    SetWindowExtEx( hdc, 2, 2, NULL );
+    GetClientRect( hwnd, &clientArea );
+    DPtoLP( hdc, (POINT *)&clientArea, 2 );
+    testJustification(hdc, testText, &clientArea);
+
+    GetTextExtentPoint32(hdc, "A", 1, &expect);
+    for (i = 0; i < 10; i++)
+    {
+        SetTextCharacterExtra(hdc, i);
+        GetTextExtentPoint32(hdc, "A", 1, &size);
+        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+    }
+    SetTextCharacterExtra(hdc, 0);
+    pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &expect);
+    for (i = 0; i < 10; i++)
+    {
+        SetTextCharacterExtra(hdc, i);
+        pGetTextExtentExPointI(hdc, indices, 1, -1, NULL, NULL, &size);
+        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+    }
+    SetTextCharacterExtra(hdc, 0);
+
+    SetViewportExtEx( hdc, 3, 3, NULL );
+    GetClientRect( hwnd, &clientArea );
+    DPtoLP( hdc, (POINT *)&clientArea, 2 );
+    testJustification(hdc, testText, &clientArea);
+
+    GetTextExtentPoint32(hdc, "A", 1, &expect);
+    for (i = 0; i < 10; i++)
+    {
+        SetTextCharacterExtra(hdc, i);
+        GetTextExtentPoint32(hdc, "A", 1, &size);
+        ok( size.cx == expect.cx + i, "wrong size %d/%d+%d\n", size.cx, expect.cx, i );
+    }
+
+done:
     DeleteObject(hfont);
     ReleaseDC(hwnd, hdc);
     DestroyWindow(hwnd);
@@ -2006,6 +2095,90 @@ static void test_font_charset(void)
         skip("Symbol or Wingdings is not installed\n");
 }
 
+static void test_GdiGetCodePage(void)
+{
+    static const struct _matching_data
+    {
+        UINT   current_codepage;
+        LPCSTR lfFaceName;
+        UCHAR  lfCharSet;
+        UINT   expected_codepage;
+    } matching_data[] = {
+        {1251, "Arial", ANSI_CHARSET, 1252},
+        {1251, "Tahoma", ANSI_CHARSET, 1252},
+
+        {1252, "Arial", ANSI_CHARSET, 1252},
+        {1252, "Tahoma", ANSI_CHARSET, 1252},
+
+        {1253, "Arial", ANSI_CHARSET, 1252},
+        {1253, "Tahoma", ANSI_CHARSET, 1252},
+
+        { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */
+        { 932, "Tahoma", ANSI_CHARSET, 1252},
+        { 932, "MS UI Gothic", ANSI_CHARSET, 1252},
+
+        { 936, "Arial", ANSI_CHARSET, 936},
+        { 936, "Tahoma", ANSI_CHARSET, 936},
+        { 936, "Simsun", ANSI_CHARSET, 936},
+
+        { 949, "Arial", ANSI_CHARSET, 949},
+        { 949, "Tahoma", ANSI_CHARSET, 949},
+        { 949, "Gulim",  ANSI_CHARSET, 949},
+
+        { 950, "Arial", ANSI_CHARSET, 950},
+        { 950, "Tahoma", ANSI_CHARSET, 950},
+        { 950, "PMingLiU", ANSI_CHARSET, 950},
+    };
+    HDC         hdc;
+    LOGFONT     lf;
+    HFONT       hfont;
+    UINT        charset, acp;
+    DWORD       codepage;
+    int         i;
+
+    if (!pGdiGetCodePage)
+    {
+        skip("GdiGetCodePage not available on this platform\n");
+        return;
+    }
+
+    acp = GetACP();
+
+    for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++)
+    {
+        /* only test data matched current locale codepage */
+        if (matching_data[i].current_codepage != acp)
+            continue;
+
+        if (!is_font_installed(matching_data[i].lfFaceName))
+        {
+            skip("%s is not installed\n", matching_data[i].lfFaceName);
+            continue;
+        }
+
+        hdc = GetDC(0);
+
+        memset(&lf, 0, sizeof(lf));
+        lf.lfHeight = -16;
+        lf.lfCharSet = matching_data[i].lfCharSet;
+        lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName);
+        hfont = CreateFontIndirectA(&lf);
+        ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError());
+
+        hfont = SelectObject(hdc, hfont);
+        charset = GetTextCharset(hdc);
+        codepage = pGdiGetCodePage(hdc);
+        trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n",
+              acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage);
+        ok(codepage == matching_data[i].expected_codepage,
+           "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage);
+
+        hfont = SelectObject(hdc, hfont);
+        DeleteObject(hfont);
+        ReleaseDC(NULL, hdc);
+    }
+}
+
 static void test_GetFontUnicodeRanges(void)
 {
     LOGFONTA lf;
@@ -2059,6 +2232,12 @@ struct enum_font_data
     LOGFONT lf[MAX_ENUM_FONTS];
 };
 
+struct enum_fullname_data
+{
+    int total;
+    ENUMLOGFONT elf[MAX_ENUM_FONTS];
+};
+
 struct enum_font_dataW
 {
     int total;
@@ -2389,6 +2568,20 @@ static INT CALLBACK enum_font_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm
     return 1;
 }
 
+static INT CALLBACK enum_fullname_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam)
+{
+    struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam;
+
+    if (type != TRUETYPE_FONTTYPE) return 1;
+
+    if (efnd->total < MAX_ENUM_FONTS)
+        efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf;
+    else
+        trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS);
+
+    return 1;
+}
+
 static void test_EnumFontFamiliesEx_default_charset(void)
 {
     struct enum_font_data efd;
@@ -2416,7 +2609,7 @@ static void test_EnumFontFamiliesEx_default_charset(void)
     }
     trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total);
 
-    ok(efd.lf[0].lfCharSet == gui_font.lfCharSet,
+    ok(efd.lf[0].lfCharSet == gui_font.lfCharSet || broken(system_lang_id == LANG_ARABIC),
        "(%s) got charset %d expected %d\n",
        efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet);
 
@@ -2760,11 +2953,15 @@ end:
 }
 
 #define TT_PLATFORM_MICROSOFT 3
+#define TT_MS_ID_SYMBOL_CS 0
 #define TT_MS_ID_UNICODE_CS 1
 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409
+#define TT_NAME_ID_FONT_FAMILY 1
+#define TT_NAME_ID_FONT_SUBFAMILY 2
+#define TT_NAME_ID_UNIQUE_ID 3
 #define TT_NAME_ID_FULL_NAME 4
 
-static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, char *out_buf, SIZE_T out_size)
+static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size, LCID language_id)
 {
     struct sfnt_name_header
     {
@@ -2820,8 +3017,8 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, char *out_buf, SIZE_T
     for (i = 0; i < header->number_of_record; i++)
     {
         if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT ||
-            GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS ||
-            GET_BE_WORD(entry[i].language_id) != TT_MS_LANGID_ENGLISH_UNITED_STATES ||
+            (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) ||
+            GET_BE_WORD(entry[i].language_id) != language_id ||
             GET_BE_WORD(entry[i].name_id) != name_id)
         {
             continue;
@@ -3451,6 +3648,38 @@ todo_wine
     DeleteDC(hdc);
 }
 
+static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe,
+                                                 const TEXTMETRIC *lpntme,
+                                                 DWORD FontType, LPARAM lParam)
+{
+    const NEWTEXTMETRICEX *lpntmex = (const NEWTEXTMETRICEX *)lpntme;
+    CHARSETINFO csi;
+    LOGFONT lf = *lpelfe;
+    HFONT hfont;
+
+    /* skip bitmap, proportional or vertical font */
+    if ((FontType & TRUETYPE_FONTTYPE) == 0 ||
+        (lf.lfPitchAndFamily & 0xf) != FIXED_PITCH ||
+        lf.lfFaceName[0] == '@')
+        return 1;
+
+    /* skip linked font */
+    if (!TranslateCharsetInfo((DWORD*)(INT_PTR)lpelfe->lfCharSet, &csi, TCI_SRCCHARSET) ||
+        (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0)
+        return 1;
+
+    /* test with an odd height */
+    lf.lfHeight = -19;
+    lf.lfWidth = 0;
+    hfont = CreateFontIndirect(&lf);
+    if (hfont)
+    {
+        *(HFONT *)lParam = hfont;
+        return 0;
+    }
+    return 1;
+}
+
 static void test_GetGlyphOutline(void)
 {
     HDC hdc;
@@ -3539,6 +3768,8 @@ static void test_GetGlyphOutline(void)
 
     for (i = 0; i < sizeof c / sizeof c[0]; ++i)
     {
+        static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}};
+
         lf.lfFaceName[0] = '\0';
         lf.lfCharSet = c[i].cs;
         lf.lfPitchAndFamily = 0;
@@ -3569,6 +3800,60 @@ static void test_GetGlyphOutline(void)
         ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat);
         ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2);
 
+        if (EnumFontFamiliesEx(hdc, &lf, create_fixed_pitch_font_proc, (LPARAM)&hfont, 0))
+        {
+            skip("Fixed-pitch TrueType font for charset %u is not available\n", c[i].cs);
+            continue;
+        }
+        DeleteObject(SelectObject(hdc, hfont));
+        if (c[i].a <= 0xff)
+        {
+            DeleteObject(SelectObject(hdc, old_hfont));
+            continue;
+        }
+
+        ret = GetObject(hfont, sizeof lf, &lf);
+        ok(ret > 0, "GetObject error %u\n", GetLastError());
+
+        ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n",
+              -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet);
+        ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight),
+           "expected %d, got %d (%s:%d)\n",
+           gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet);
+
+        ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        ok(gm2.gmCellIncY == -lf.lfHeight,
+           "expected %d, got %d (%s:%d)\n",
+           -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet);
+
+        lf.lfItalic = TRUE;
+        hfont = CreateFontIndirect(&lf);
+        ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError());
+        DeleteObject(SelectObject(hdc, hfont));
+        ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight),
+           "expected %d, got %d (%s:%d)\n",
+           gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet);
+
+        lf.lfItalic = FALSE;
+        lf.lfEscapement = lf.lfOrientation = 2700;
+        hfont = CreateFontIndirect(&lf);
+        ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError());
+        DeleteObject(SelectObject(hdc, hfont));
+        ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat);
+        ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError());
+        ok(gm2.gmCellIncY == -lf.lfHeight,
+           "expected %d, got %d (%s:%d)\n",
+           -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet);
+
         hfont = SelectObject(hdc, old_hfont);
         DeleteObject(hfont);
     }
@@ -3980,11 +4265,13 @@ static BOOL is_font_installed_fullname(const char *family, const char *fullname)
 static void test_fullname(void)
 {
     static const char *TestName[] = {"Lucida Sans Demibold Roman", "Lucida Sans Italic", "Lucida Sans Regular"};
-    char buf[LF_FULLFACESIZE];
+    WCHAR bufW[LF_FULLFACESIZE];
+    char bufA[LF_FULLFACESIZE];
     HFONT hfont, of;
     LOGFONTA lf;
     HDC hdc;
     int i;
+    DWORD ret;
 
     hdc = CreateCompatibleDC(0);
     ok(hdc != NULL, "CreateCompatibleDC failed\n");
@@ -4011,16 +4298,198 @@ static void test_fullname(void)
         ok(hfont != 0, "CreateFontIndirectA failed\n");
 
         of = SelectObject(hdc, hfont);
-        buf[0] = 0;
-        ok(get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, buf, sizeof(buf)),
-           "face full name could not be read\n");
-        ok(!lstrcmpA(buf, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], buf);
+        bufW[0] = 0;
+        bufA[0] = 0;
+        ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, sizeof(bufW), TT_MS_LANGID_ENGLISH_UNITED_STATES);
+        ok(ret, "face full name could not be read\n");
+        WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, sizeof(bufA), NULL, FALSE);
+        ok(!lstrcmpA(bufA, TestName[i]), "font full names don't match: %s != %s\n", TestName[i], bufA);
         SelectObject(hdc, of);
         DeleteObject(hfont);
     }
     DeleteDC(hdc);
 }
 
+static WCHAR *prepend_at(WCHAR *family)
+{
+    if (!family)
+        return NULL;
+
+    memmove(family + 1, family, (lstrlenW(family) + 1) * sizeof(WCHAR));
+    family[0] = '@';
+    return family;
+}
+
+static void test_fullname2_helper(const char *Family)
+{
+    char *FamilyName, *FaceName, *StyleName, *otmStr;
+    struct enum_fullname_data efnd;
+    WCHAR *bufW;
+    char *bufA;
+    HFONT hfont, of;
+    LOGFONTA lf;
+    HDC hdc;
+    int i;
+    DWORD otm_size, ret, buf_size;
+    OUTLINETEXTMETRICA *otm;
+    BOOL want_vertical, get_vertical;
+    want_vertical = ( Family[0] == '@' );
+
+    hdc = CreateCompatibleDC(0);
+    ok(hdc != NULL, "CreateCompatibleDC failed\n");
+
+    memset(&lf, 0, sizeof(lf));
+    lf.lfCharSet = DEFAULT_CHARSET;
+    lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+    lf.lfHeight = 16;
+    lf.lfWidth = 16;
+    lf.lfQuality = DEFAULT_QUALITY;
+    lf.lfItalic = FALSE;
+    lf.lfWeight = FW_DONTCARE;
+    lstrcpy(lf.lfFaceName, Family);
+    efnd.total = 0;
+    EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0);
+    if (efnd.total == 0)
+        skip("%s is not installed\n", lf.lfFaceName);
+
+    for (i = 0; i < efnd.total; i++)
+    {
+        FamilyName = (char *)efnd.elf[i].elfLogFont.lfFaceName;
+        FaceName = (char *)efnd.elf[i].elfFullName;
+        StyleName = (char *)efnd.elf[i].elfStyle;
+
+        trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName);
+
+        get_vertical = ( FamilyName[0] == '@' );
+        ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName);
+
+        lstrcpyA(lf.lfFaceName, FaceName);
+        hfont = CreateFontIndirectA(&lf);
+        ok(hfont != 0, "CreateFontIndirectA failed\n");
+
+        of = SelectObject(hdc, hfont);
+        buf_size = GetFontData(hdc, MS_NAME_TAG, 0, NULL, 0);
+        ok(buf_size != GDI_ERROR, "no name table found\n");
+        if (buf_size == GDI_ERROR) continue;
+
+        bufW = HeapAlloc(GetProcessHeap(), 0, buf_size);
+        bufA = HeapAlloc(GetProcessHeap(), 0, buf_size);
+
+        otm_size = GetOutlineTextMetricsA(hdc, 0, NULL);
+        otm = HeapAlloc(GetProcessHeap(), 0, otm_size);
+        memset(otm, 0, otm_size);
+        ret = GetOutlineTextMetrics(hdc, otm_size, otm);
+        ok(ret != 0, "GetOutlineTextMetrics fails!\n");
+        if (ret == 0) continue;
+
+        bufW[0] = 0;
+        bufA[0] = 0;
+        ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID());
+        if (!ret)
+        {
+            trace("no localized FONT_FAMILY found.\n");
+            ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES);
+        }
+        ok(ret, "FAMILY (family name) could not be read\n");
+        if (want_vertical) bufW = prepend_at(bufW);
+        WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
+        ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA);
+        otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFamilyName;
+        ok(!lstrcmpA(FamilyName, otmStr), "FamilyName %s doesn't match otmpFamilyName %s\n", FamilyName, otmStr);
+
+        bufW[0] = 0;
+        bufA[0] = 0;
+        ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID());
+        if (!ret)
+        {
+            trace("no localized FULL_NAME found.\n");
+            ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES);
+        }
+        ok(ret, "FULL_NAME (face name) could not be read\n");
+        if (want_vertical) bufW = prepend_at(bufW);
+        WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
+        ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA);
+        otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName;
+        ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr);
+
+        bufW[0] = 0;
+        bufA[0] = 0;
+        ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID());
+        if (!ret)
+        {
+            trace("no localized FONT_SUBFAMILY found.\n");
+            ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES);
+        }
+        ok(ret, "SUBFAMILY (style name) could not be read\n");
+        WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
+        ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA);
+        otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName;
+        ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr);
+
+        bufW[0] = 0;
+        bufA[0] = 0;
+        ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID());
+        if (!ret)
+        {
+            trace("no localized UNIQUE_ID found.\n");
+            ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES);
+        }
+        ok(ret, "UNIQUE_ID (full name) could not be read\n");
+        WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE);
+        otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName;
+        ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA);
+
+        SelectObject(hdc, of);
+        DeleteObject(hfont);
+
+        HeapFree(GetProcessHeap(), 0, otm);
+        HeapFree(GetProcessHeap(), 0, bufW);
+        HeapFree(GetProcessHeap(), 0, bufA);
+    }
+    DeleteDC(hdc);
+}
+
+static void test_fullname2(void)
+{
+    test_fullname2_helper("Arial");
+    test_fullname2_helper("DejaVu Sans");
+    test_fullname2_helper("Lucida Sans");
+    test_fullname2_helper("Tahoma");
+    test_fullname2_helper("Webdings");
+    test_fullname2_helper("Wingdings");
+    test_fullname2_helper("SimSun");
+    test_fullname2_helper("NSimSun");
+    test_fullname2_helper("MingLiu");
+    test_fullname2_helper("PMingLiu");
+    test_fullname2_helper("WenQuanYi Micro Hei");
+    test_fullname2_helper("MS UI Gothic");
+    test_fullname2_helper("Ume UI Gothic");
+    test_fullname2_helper("MS Gothic");
+    test_fullname2_helper("Ume Gothic");
+    test_fullname2_helper("MS PGothic");
+    test_fullname2_helper("Ume P Gothic");
+    test_fullname2_helper("Gulim");
+    test_fullname2_helper("Batang");
+    test_fullname2_helper("UnBatang");
+    test_fullname2_helper("UnDotum");
+    test_fullname2_helper("@SimSun");
+    test_fullname2_helper("@NSimSun");
+    test_fullname2_helper("@MingLiu");
+    test_fullname2_helper("@PMingLiu");
+    test_fullname2_helper("@WenQuanYi Micro Hei");
+    test_fullname2_helper("@MS UI Gothic");
+    test_fullname2_helper("@Ume UI Gothic");
+    test_fullname2_helper("@MS Gothic");
+    test_fullname2_helper("@Ume Gothic");
+    test_fullname2_helper("@MS PGothic");
+    test_fullname2_helper("@Ume P Gothic");
+    test_fullname2_helper("@Gulim");
+    test_fullname2_helper("@Batang");
+    test_fullname2_helper("@UnBatang");
+    test_fullname2_helper("@UnDotum");
+
+}
+
 static BOOL write_ttf_file(const char *fontname, char *tmp_name)
 {
     char tmp_path[MAX_PATH];
@@ -4063,6 +4532,46 @@ static BOOL write_ttf_file(const char *fontname, char *tmp_name)
     return ret;
 }
 
+static void test_GetGlyphOutline_empty_contour(void)
+{
+    HDC hdc;
+    LOGFONTA lf;
+    HFONT hfont, hfont_prev;
+    TTPOLYGONHEADER *header;
+    GLYPHMETRICS gm;
+    char buf[1024];
+    DWORD ret;
+
+    memset(&lf, 0, sizeof(lf));
+    lf.lfHeight = 72;
+    lstrcpyA(lf.lfFaceName, "wine_test");
+
+    hfont = CreateFontIndirectA(&lf);
+    ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError());
+
+    hdc = GetDC(NULL);
+
+    hfont_prev = SelectObject(hdc, hfont);
+    ok(hfont_prev != NULL, "SelectObject failed\n");
+
+    ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, 0, NULL, &mat);
+    ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret);
+
+    header = (TTPOLYGONHEADER*)buf;
+    ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, sizeof(buf), buf, &mat);
+    ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret);
+    ok(header->cb == 36, "header->cb = %d, expected 36\n", header->cb);
+    ok(header->dwType == TT_POLYGON_TYPE, "header->dwType = %d, expected TT_POLYGON_TYPE\n", header->dwType);
+    header = (TTPOLYGONHEADER*)((char*)header+header->cb);
+    ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb);
+    header = (TTPOLYGONHEADER*)((char*)header+header->cb);
+    ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb);
+
+    SelectObject(hdc, hfont_prev);
+    DeleteObject(hfont);
+    ReleaseDC(NULL, hdc);
+}
+
 static void test_CreateScalableFontResource(void)
 {
     char ttf_name[MAX_PATH];
@@ -4070,6 +4579,7 @@ static void test_CreateScalableFontResource(void)
     char fot_name[MAX_PATH];
     char *file_part;
     DWORD ret;
+    int i;
 
     if (!pAddFontResourceExA || !pRemoveFontResourceExA)
     {
@@ -4126,7 +4636,6 @@ static void test_CreateScalableFontResource(void)
     ok(ret, "DeleteFile() error %d\n", GetLastError());
 
     ret = pRemoveFontResourceExA(fot_name, 0, 0);
-todo_wine
     ok(!ret, "RemoveFontResourceEx() should fail\n");
 
     /* test public font resource */
@@ -4144,8 +4653,9 @@ todo_wine
     ret = is_truetype_font_installed("wine_test");
     ok(ret, "font wine_test should be enumerated\n");
 
+    test_GetGlyphOutline_empty_contour();
+
     ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0);
-todo_wine
     ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n");
 
     SetLastError(0xdeadbeef);
@@ -4153,18 +4663,24 @@ todo_wine
     ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());
 
     ret = is_truetype_font_installed("wine_test");
-todo_wine
     ok(!ret, "font wine_test should not be enumerated\n");
 
-    /* FIXME: since RemoveFontResource is a stub correct testing is impossible */
-    if (ret)
-    {
-        /* remove once RemoveFontResource is implemented */
-        DeleteFile(fot_name);
-        DeleteFile(ttf_name);
-        return;
-    }
+    ret = pRemoveFontResourceExA(fot_name, 0, 0);
+    ok(!ret, "RemoveFontResourceEx() should fail\n");
 
+    /* test refcounting */
+    for (i = 0; i < 5; i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = pAddFontResourceExA(fot_name, 0, 0);
+        ok(ret, "AddFontResourceEx() error %d\n", GetLastError());
+    }
+    for (i = 0; i < 5; i++)
+    {
+        SetLastError(0xdeadbeef);
+        ret = pRemoveFontResourceExA(fot_name, 0, 0);
+        ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError());
+    }
     ret = pRemoveFontResourceExA(fot_name, 0, 0);
     ok(!ret, "RemoveFontResourceEx() should fail\n");
 
@@ -4183,6 +4699,7 @@ todo_wine
     ok(ret, "AddFontResourceEx() error %d\n", GetLastError());
 
     ret = is_truetype_font_installed("wine_test");
+    todo_wine
     ok(!ret, "font wine_test should not be enumerated\n");
 
     /* XP allows removing a private font added with 0 flags */
@@ -4353,10 +4870,139 @@ static void test_east_asian_font_selection(void)
     ReleaseDC(NULL, hdc);
 }
 
+static int get_font_dpi(const LOGFONT *lf)
+{
+    HDC hdc = CreateCompatibleDC(0);
+    HFONT hfont;
+    TEXTMETRIC tm;
+    int ret;
+
+    hfont = CreateFontIndirect(lf);
+    ok(hfont != 0, "CreateFontIndirect failed\n");
+
+    SelectObject(hdc, hfont);
+    ret = GetTextMetrics(hdc, &tm);
+    ok(ret, "GetTextMetrics failed\n");
+    ret = tm.tmDigitizedAspectX;
+
+    DeleteDC(hdc);
+    DeleteObject(hfont);
+
+    return ret;
+}
+
+static void test_stock_fonts(void)
+{
+    static const int font[] =
+    {
+        ANSI_FIXED_FONT, ANSI_VAR_FONT, SYSTEM_FONT, DEVICE_DEFAULT_FONT, DEFAULT_GUI_FONT
+        /* SYSTEM_FIXED_FONT, OEM_FIXED_FONT */
+    };
+    static const struct test_data
+    {
+        int charset, weight, height, dpi;
+        const char face_name[LF_FACESIZE];
+    } td[][11] =
+    {
+        { /* ANSI_FIXED_FONT */
+            { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "Courier" },
+            { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "Courier" },
+            { 0 }
+        },
+        { /* ANSI_VAR_FONT */
+            { DEFAULT_CHARSET, FW_NORMAL, 12, 96, "MS Sans Serif" },
+            { DEFAULT_CHARSET, FW_NORMAL, 12, 120, "MS Sans Serif" },
+            { 0 }
+        },
+        { /* SYSTEM_FONT */
+            { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" },
+            { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" },
+            { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" },
+            { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" },
+            { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" },
+            { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" },
+            { 0 }
+        },
+        { /* DEVICE_DEFAULT_FONT */
+            { SHIFTJIS_CHARSET, FW_NORMAL, 18, 96, "System" },
+            { SHIFTJIS_CHARSET, FW_NORMAL, 22, 120, "System" },
+            { HANGEUL_CHARSET, FW_NORMAL, 16, 96, "System" },
+            { HANGEUL_CHARSET, FW_NORMAL, 20, 120, "System" },
+            { DEFAULT_CHARSET, FW_BOLD, 16, 96, "System" },
+            { DEFAULT_CHARSET, FW_BOLD, 20, 120, "System" },
+            { 0 }
+        },
+        { /* DEFAULT_GUI_FONT */
+            { SHIFTJIS_CHARSET, FW_NORMAL, -12, 96, "?MS UI Gothic" },
+            { SHIFTJIS_CHARSET, FW_NORMAL, -15, 120, "?MS UI Gothic" },
+            { HANGEUL_CHARSET, FW_NORMAL, -12, 96, "?Gulim" },
+            { HANGEUL_CHARSET, FW_NORMAL, -15, 120, "?Gulim" },
+            { GB2312_CHARSET, FW_NORMAL, -12, 96, "?SimHei" },
+            { GB2312_CHARSET, FW_NORMAL, -15, 120, "?SimHei" },
+            { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 96, "?MingLiU" },
+            { CHINESEBIG5_CHARSET, FW_NORMAL, -15, 120, "?MingLiU" },
+            { DEFAULT_CHARSET, FW_NORMAL, -11, 96, "MS Shell Dlg" },
+            { DEFAULT_CHARSET, FW_NORMAL, -13, 120, "MS Shell Dlg" },
+            { 0 }
+        }
+    };
+    int i, j;
+
+    for (i = 0; i < sizeof(font)/sizeof(font[0]); i++)
+    {
+        HFONT hfont;
+        LOGFONT lf;
+        int ret;
+
+        hfont = GetStockObject(font[i]);
+        ok(hfont != 0, "%d: GetStockObject(%d) failed\n", i, font[i]);
+
+        ret = GetObject(hfont, sizeof(lf), &lf);
+        if (ret != sizeof(lf))
+        {
+            /* NT4 */
+            win_skip("%d: GetObject returned %d instead of sizeof(LOGFONT)\n", i, ret);
+            continue;
+        }
+
+        for (j = 0; td[i][j].face_name[0] != 0; j++)
+        {
+            if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET)
+            {
+                continue;
+            }
+
+            ret = get_font_dpi(&lf);
+            if (ret != td[i][j].dpi)
+            {
+                trace("%d(%d): font %s %d dpi doesn't match test data %d\n",
+                      i, j, lf.lfFaceName, ret, td[i][j].dpi);
+                continue;
+            }
+
+            ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight);
+            ok(td[i][j].height == lf.lfHeight, "%d(%d): expected lfHeight %d, got %d\n", i, j, td[i][j].height, lf.lfHeight);
+            if (td[i][j].face_name[0] == '?')
+            {
+                /* Wine doesn't have this font, skip this case for now.
+                   Actually, the face name is localized on Windows and varies
+                   dpending on Windows versions (e.g. Japanese NT4 vs win2k). */
+                trace("%d(%d): default gui font is %s\n", i, j, lf.lfFaceName);
+            }
+            else
+            {
+                ok(!lstrcmp(td[i][j].face_name, lf.lfFaceName), "%d(%d): expected lfFaceName %s, got %s\n", i, j, td[i][j].face_name, lf.lfFaceName);
+            }
+            break;
+        }
+    }
+}
+
 START_TEST(font)
 {
     init();
 
+    test_stock_fonts();
     test_logfont();
     test_bitmap_font();
     test_outline_font();
@@ -4369,6 +5015,7 @@ START_TEST(font)
     test_GetOutlineTextMetrics();
     test_SetTextJustification();
     test_font_charset();
+    test_GdiGetCodePage();
     test_GetFontUnicodeRanges();
     test_nonexistent_font();
     test_orientation();
@@ -4405,6 +5052,7 @@ START_TEST(font)
     test_CreateFontIndirectEx();
     test_oemcharset();
     test_fullname();
+    test_fullname2();
     test_east_asian_font_selection();
 
     /* These tests should be last test until RemoveFontResource
diff --git a/rostests/winetests/gdi32/gdiobj.c b/rostests/winetests/gdi32/gdiobj.c
index c85431182b9..3b9f73441ef 100755
--- a/rostests/winetests/gdi32/gdiobj.c
+++ b/rostests/winetests/gdi32/gdiobj.c
@@ -319,10 +319,54 @@ static void test_region(void)
     DeleteObject(hrgn);
 }
 
+static void test_handles_on_win64(void)
+{
+    int i;
+    BOOL ret;
+    DWORD type;
+    HRGN hrgn, hrgn_test;
+
+    static const struct
+    {
+        ULONG high;
+        ULONG low;
+        BOOL  ret;
+    } cases[] =
+    {
+        { 0x00000000, 0x00000000, TRUE  },
+        { 0x00000000, 0x0000ffe0, FALSE }, /* just over MAX_LARGE_HANDLES */
+        { 0x00000000, 0x0000ffb0, FALSE }, /* just under MAX_LARGE_HANDLES */
+        { 0xffffffff, 0xffff0000, FALSE },
+        { 0xffffffff, 0x00000000, TRUE  },
+        { 0xdeadbeef, 0x00000000, TRUE  },
+        { 0xcccccccc, 0xcccccccc, FALSE }
+    };
+
+    if (sizeof(void*) != 8)
+        return;
+
+    for (i = 0; i < sizeof(cases)/sizeof(cases[0]); i++)
+    {
+        hrgn = CreateRectRgn(10, 10, 20, 20);
+        hrgn_test = (HRGN)(ULONG_PTR)((ULONG_PTR)hrgn | ((ULONGLONG)cases[i].high << 32) | cases[i].low);
+        type = GetObjectType( hrgn_test );
+        if (cases[i].ret)
+            ok( type == OBJ_REGION, "wrong type %u\n", type );
+        else
+            ok( type == 0, "wrong type %u\n", type );
+        ret = DeleteObject(hrgn_test);
+        ok( cases[i].ret == ret, "DeleteObject should return %s (%p)\n",
+            cases[i].ret ? "TRUE" : "FALSE", hrgn_test);
+        /* actually free it if above is expected to fail */
+        if (!ret) DeleteObject(hrgn);
+    }
+}
+
 START_TEST(gdiobj)
 {
     test_gdi_objects();
     test_thread_objects();
     test_GetCurrentObject();
     test_region();
+    test_handles_on_win64();
 }
diff --git a/rostests/winetests/gdi32/metafile.c b/rostests/winetests/gdi32/metafile.c
index 61be7405a9f..870ff2f5b40 100755
--- a/rostests/winetests/gdi32/metafile.c
+++ b/rostests/winetests/gdi32/metafile.c
@@ -60,6 +60,20 @@ static void init_function_pointers(void)
     GDI_GET_PROC(SetDCPenColor);
 }
 
+static DWORD rgn_rect_count(HRGN hrgn)
+{
+    DWORD size;
+    RGNDATA *data;
+
+    if (!hrgn) return 0;
+    if (!(size = GetRegionData(hrgn, 0, NULL))) return 0;
+    if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0;
+    GetRegionData(hrgn, size, data);
+    size = data->rdh.nCount;
+    HeapFree(GetProcessHeap(), 0, data);
+    return size;
+}
+
 static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
     const ENHMETARECORD *emr, int n_objs, LPARAM param)
 {
@@ -2483,19 +2497,183 @@ static void test_emf_clipping(void)
     SetRect(&rc_sclip, 100, 100, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
     hrgn = CreateRectRgn(rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom);
     SelectClipRgn(hdc, hrgn);
+    SetRect(&rc_res, -1, -1, -1, -1);
     ret = GetClipBox(hdc, &rc_res);
-todo_wine
     ok(ret == SIMPLEREGION, "got %d\n", ret);
-    if(ret == SIMPLEREGION)
-        ok(EqualRect(&rc_res, &rc_sclip),
-                 "expected rc_res (%d, %d) - (%d, %d), got (%d, %d) - (%d, %d)\n",
-                 rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,
-                 rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
+    ok(EqualRect(&rc_res, &rc_sclip),
+       "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n",
+       rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,
+       rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
+
+    OffsetRect(&rc_sclip, -100, -100);
+    ret = OffsetClipRgn(hdc, -100, -100);
+    ok(ret == SIMPLEREGION, "got %d\n", ret);
+    SetRect(&rc_res, -1, -1, -1, -1);
+    ret = GetClipBox(hdc, &rc_res);
+    ok(ret == SIMPLEREGION, "got %d\n", ret);
+    ok(EqualRect(&rc_res, &rc_sclip),
+       "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n",
+       rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,
+       rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
+
+    ret = IntersectClipRect(hdc, 0, 0, 100, 100);
+    ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret);
+    if (ret == COMPLEXREGION)
+    {
+        /* XP returns COMPLEXREGION although region contains only 1 rect */
+        ret = GetClipRgn(hdc, hrgn);
+        ok(ret == 1, "expected 1, got %d\n", ret);
+        ret = rgn_rect_count(hrgn);
+        ok(ret == 1, "expected 1, got %d\n", ret);
+    }
+    SetRect(&rc_res, -1, -1, -1, -1);
+    ret = GetClipBox(hdc, &rc_res);
+    ok(ret == SIMPLEREGION, "got %d\n", ret);
+    ok(EqualRect(&rc_res, &rc),
+       "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n",
+       rc.left, rc.top, rc.right, rc.bottom,
+       rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
+
+    SetRect(&rc_sclip, 0, 0, 100, 50);
+    ret = ExcludeClipRect(hdc, 0, 50, 100, 100);
+    ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret);
+    if (ret == COMPLEXREGION)
+    {
+        /* XP returns COMPLEXREGION although region contains only 1 rect */
+        ret = GetClipRgn(hdc, hrgn);
+        ok(ret == 1, "expected 1, got %d\n", ret);
+        ret = rgn_rect_count(hrgn);
+        ok(ret == 1, "expected 1, got %d\n", ret);
+    }
+    SetRect(&rc_res, -1, -1, -1, -1);
+    ret = GetClipBox(hdc, &rc_res);
+    ok(ret == SIMPLEREGION, "got %d\n", ret);
+    ok(EqualRect(&rc_res, &rc_sclip),
+       "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n",
+       rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,
+       rc_res.left, rc_res.top, rc_res.right, rc_res.bottom);
 
     hemf = CloseEnhMetaFile(hdc);
     DeleteEnhMetaFile(hemf);
     DeleteObject(hrgn);
-    DeleteDC(hdc);
+}
+
+static const unsigned char MF_CLIP_BITS[] = {
+    /* METAHEADER */
+    0x01, 0x00,             /* mtType */
+    0x09, 0x00,             /* mtHeaderSize */
+    0x00, 0x03,             /* mtVersion */
+    0x32, 0x00, 0x00, 0x00, /* mtSize */
+    0x01, 0x00,             /* mtNoObjects */
+    0x14, 0x00, 0x00, 0x00, /* mtMaxRecord (size in words of longest record) */
+    0x00, 0x00,             /* reserved */
+
+    /* METARECORD for CreateRectRgn(0x11, 0x22, 0x33, 0x44) */
+    0x14, 0x00, 0x00, 0x00, /* rdSize in words */
+    0xff, 0x06,             /* META_CREATEREGION */
+    0x00, 0x00, 0x06, 0x00, 0xf6, 0x02, 0x00, 0x00,
+    0x24, 0x00, 0x01, 0x00, 0x02, 0x00, 0x11, 0x00,
+    0x22, 0x00, 0x33, 0x00, 0x44, 0x00, 0x02, 0x00,
+    0x22, 0x00, 0x44, 0x00, 0x11, 0x00, 0x33, 0x00,
+    0x02, 0x00,
+
+    /* METARECORD for SelectObject */
+    0x04, 0x00, 0x00, 0x00,
+    0x2d, 0x01,             /* META_SELECTOBJECT (not META_SELECTCLIPREGION?!) */
+    0x00, 0x00,
+
+    /* METARECORD */
+    0x04, 0x00, 0x00, 0x00,
+    0xf0, 0x01,             /* META_DELETEOBJECT */
+    0x00, 0x00,
+
+    /* METARECORD for MoveTo(1,0x30) */
+    0x05, 0x00, 0x00, 0x00, /* rdSize in words */
+    0x14, 0x02,             /* META_MOVETO */
+    0x30, 0x00,             /* y */
+    0x01, 0x00,             /* x */
+
+    /* METARECORD for LineTo(0x20, 0x30) */
+    0x05, 0x00, 0x00, 0x00, /* rdSize in words */
+    0x13, 0x02,             /* META_LINETO */
+    0x30, 0x00,             /* y */
+    0x20, 0x00,             /* x */
+
+    /* EOF */
+    0x03, 0x00, 0x00, 0x00,
+    0x00, 0x00
+};
+
+static int clip_mf_enum_proc_seen_selectclipregion;
+static int clip_mf_enum_proc_seen_selectobject;
+
+static int CALLBACK clip_mf_enum_proc(HDC hdc, HANDLETABLE *handle_table,
+                                       METARECORD *mr, int n_objs, LPARAM param)
+{
+    switch (mr->rdFunction) {
+    case META_SELECTCLIPREGION:
+        clip_mf_enum_proc_seen_selectclipregion++;
+        break;
+    case META_SELECTOBJECT:
+        clip_mf_enum_proc_seen_selectobject++;
+        break;
+    }
+    return 1;
+}
+
+static void test_mf_clipping(void)
+{
+                          /* left top right bottom */
+    static RECT rc_clip = { 0x11, 0x22, 0x33, 0x44 };
+    HWND hwnd;
+    HDC hdc;
+    HMETAFILE hmf;
+    HRGN hrgn;
+    INT ret;
+
+    SetLastError(0xdeadbeef);
+    hdc = CreateMetaFileA(NULL);
+    ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError());
+
+    hrgn = CreateRectRgn(rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom);
+    ret = SelectClipRgn(hdc, hrgn);
+    /* Seems like it should be SIMPLEREGION, but windows returns NULLREGION? */
+    ok(ret == NULLREGION, "expected NULLREGION, got %d\n", ret);
+
+    /* Draw a line that starts off left of the clip region and ends inside it */
+    MoveToEx(hdc, 0x1, 0x30, NULL);
+    LineTo(hdc,  0x20, 0x30);
+
+    SetLastError(0xdeadbeef);
+    hmf = CloseMetaFile(hdc);
+    ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError());
+
+    if (compare_mf_bits(hmf, MF_CLIP_BITS, sizeof(MF_CLIP_BITS),
+        "mf_clipping") != 0)
+    {
+        dump_mf_bits(hmf, "mf_clipping");
+    }
+
+    DeleteObject(hrgn);
+
+    hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE,
+                           0, 0, 200, 200, 0, 0, 0, NULL);
+    ok(hwnd != 0, "CreateWindowExA error %d\n", GetLastError());
+
+    hdc = GetDC(hwnd);
+
+    ret = EnumMetaFile(hdc, hmf, clip_mf_enum_proc, (LPARAM)&rc_clip);
+    ok(ret, "EnumMetaFile error %d\n", GetLastError());
+
+    /* Oddly, windows doesn't seem to use META_SELECTCLIPREGION */
+    ok(clip_mf_enum_proc_seen_selectclipregion == 0,
+       "expected 0 selectclipregion, saw %d\n", clip_mf_enum_proc_seen_selectclipregion);
+    ok(clip_mf_enum_proc_seen_selectobject == 1,
+       "expected 1 selectobject, saw %d\n", clip_mf_enum_proc_seen_selectobject);
+
+    DeleteMetaFile(hmf);
+    ReleaseDC(hwnd, hdc);
+    DestroyWindow(hwnd);
 }
 
 static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData)
@@ -3211,6 +3389,9 @@ START_TEST(metafile)
     test_SaveDC();
     test_emf_BitBlt();
     test_emf_DCBrush();
+    test_emf_ExtTextOut_on_path();
+    test_emf_clipping();
+    test_emf_polybezier();
 
     /* For win-format metafiles (mfdrv) */
     test_mf_SaveDC();
@@ -3221,9 +3402,7 @@ START_TEST(metafile)
     test_CopyMetaFile();
     test_SetMetaFileBits();
     test_mf_ExtTextOut_on_path();
-    test_emf_ExtTextOut_on_path();
-    test_emf_clipping();
-    test_emf_polybezier();
+    test_mf_clipping();
 
     /* For metafile conversions */
     test_mf_conversions();
diff --git a/rostests/winetests/gdi32/wine_test.sfd b/rostests/winetests/gdi32/wine_test.sfd
index 5b735458940..5adf7cf0bc4 100644
--- a/rostests/winetests/gdi32/wine_test.sfd
+++ b/rostests/winetests/gdi32/wine_test.sfd
@@ -20,7 +20,7 @@ OS2Version: 2
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1288336343
-ModificationTime: 1288336873
+ModificationTime: 1352483620
 PfmFamily: 17
 TTFWeight: 500
 TTFWidth: 5
@@ -86,7 +86,7 @@ DisplaySize: -24
 AntiAlias: 1
 FitToEm: 1
 WinInfo: 65 65 19
-BeginChars: 65539 4
+BeginChars: 65539 5
 
 StartChar: .notdef
 Encoding: 65536 -1 0
@@ -176,5 +176,30 @@ Width: 0
 Flags: W
 LayerCount: 2
 EndChar
+
+StartChar: dieresis
+Encoding: 168 168 0
+Width: 1000
+VWidth: 0
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+620.215 824.429 m 1,0,1
+ 760.84 777.554 760.84 777.554 713.965 636.929 c 1,2,-1
+ 620.215 824.429 l 1,0,1
+154.883 324.971 m 0,3,-1
+254.492 773.213 m 1,4,5
+ 310.707 834.805 310.707 834.805 374.609 767.354 c 1,6,7
+ 410.471 728.672 410.471 728.672 374.609 691.182 c 0,8,9
+ 308.375 621.934 308.375 621.934 254.492 688.252 c 0,10,11
+ 216.406 735.127 216.406 735.127 254.492 773.213 c 1,4,5
+254.492 773.213 m 1,12,13
+ 216.406 735.127 216.406 735.127 254.492 688.252 c 0,14,15
+ 308.375 621.934 308.375 621.934 374.609 691.182 c 0,16,17
+ 410.471 728.672 410.471 728.672 374.609 767.354 c 1,18,19
+ 310.707 834.805 310.707 834.805 254.492 773.213 c 1,12,13
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/rostests/winetests/gdi32/wine_test.ttf b/rostests/winetests/gdi32/wine_test.ttf
index badef181fb4e909e6eb0558ea5df1a1966c33e5d..1e546eb5f76cd3065f6b69f7976fb40a33b82b5a 100644
GIT binary patch
delta 559
zcmXv~F>4e-7=1IdyLaLu%7smHk;sL)h(|W0*h?BclRXtJ1SNV(3YRtJiaWEALn4TQ
zlu9JBg@55di=ZGjf@Lgi&PGtgA`rEbV4<#WHahUl_r3S#dpu^-{o!tUYfcM5`E1xc
zgDOq{&LpwEc-fzNxR<;IM4R|V+>H_u78Zy<u+GPKdZP&KBY+yGZY@PCNtQuz-{9g>
z=kBfb_x;z@r-`@Pi_y*NPo7@l{FN27Nff`R?}#DBNQ||+z10Kvg-`Qs;-SuR9HE6R
z8q|p0ZnT=<0-Ds%5s%)Ex{J?0KG4*609i_wS9+O?J;44&y#~RX_3il7+T))iR|oby
zi6SI#b13D^E3;06LB3$d|HsZ58$+;i%4~|9YhYrZQ9EfzoD%)?nW%*{+9k~|$gBL%
zFeEZr%Cs40ci07E97CTUhW(y>&KAt8^ssy>tn{?Jl8&fDqLtRvwRsD>@}3;18Ez>Y
zM2R`Pf+z*UUcssAx-;z6gQ}LD4gdGMc&1UQ%mtb!n5$G8YI<Vh&$f7TGSs>`>uc@L
kHnk4%VqMi`)n)(_#=;{rF_6r|x<nq1=19OwKiQLi0e{M9rvLx|

delta 459
zcmX|-y-Nc@5XIl_-AT~k2STb-5{L<gpdum>1Vv6wrJzWnRgNT@A|Hnd5-S@kZ6XI^
zVXvSdD2RW6g@qtk*$H-njS|H!zFX8?W_Et>?JRTG^f&yCz>d)bV9r~!bBH1a829AJ
z;_~q5{#SVc5Cw83Te2N=X%FNl#!Pmr7KCN=0Gdf(->|Drs|Ahyw`AW&aeF;_{CGk?
zPEHr{c5ZFpY>D+7W4u7Yw<+I|g$Pp!7fQ9daR`f#-;ukEm8^|4H?$zRy=2!NBr!oh
zNe-6nQvULJFG7D8kiAZ&T5ENH!x~5QV-U=Yi_?$KgYUjn&RC(~gJkv=Ev4K@Zyv~;
zYVgXxr7K1M@9{c?(xx$_E=kdJi(*QI+;b66P~zvSFn=GLBzbd~&=KURb9)@(uTr`7
u0^yqS+Rez6JE(OExCw3b>Qx()QJq%==k-ojY>}$jPYR%4k$~n}Z6iNVF;8d!


From 4b5de9adbb587e4cbdec19bd6f8a91045bf18356 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 16 Mar 2013 15:25:15 +0000
Subject: [PATCH 53/61] [PSDK] * Add some missing definitions.

svn path=/trunk/; revision=58519
---
 reactos/include/psdk/commctrl.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index 64326f99065..7ac0ef1895a 100644
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -656,6 +656,10 @@ extern "C" {
 #define HDN_ENDDRAG (HDN_FIRST-11)
 #define HDN_FILTERCHANGE (HDN_FIRST-12)
 #define HDN_FILTERBTNCLICK (HDN_FIRST-13)
+#define HDN_BEGINFILTEREDIT (HDN_FIRST-14)
+#define HDN_ENDFILTEREDIT (HDN_FIRST-15)
+#define HDN_ITEMSTATEICONCLICK (HDN_FIRST-16)
+#define HDN_ITEMKEYDOWN (HDN_FIRST-17)
 
 #define HDN_ITEMCHANGING __MINGW_NAME_AW(HDN_ITEMCHANGING)
 #define HDN_ITEMCHANGED __MINGW_NAME_AW(HDN_ITEMCHANGED)

From 92de840cb7bf00f17401b5000f753bf7951d46e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 15:39:08 +0000
Subject: [PATCH 54/61] [ADVAPI32-SERVICES] Put an event name into a macro
 (shared between advapi32.dll and services.exe)

[BOOTDATA]
Remove two reactos-specific and unused values in HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon : StartLsass and StartServices.

svn path=/trunk/; revision=58520
---
 reactos/boot/bootdata/hivesft.inf           | 4 +---
 reactos/dll/win32/advapi32/service/scm.c    | 6 +++---
 reactos/include/reactos/services/services.h | 6 ++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/hivesft.inf
index 80fb969952b..d8a76a7718c 100644
--- a/reactos/boot/bootdata/hivesft.inf
+++ b/reactos/boot/bootdata/hivesft.inf
@@ -1059,14 +1059,12 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll"
 
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret"
 
-;Time Zone Servers
+; Time Zone Servers
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","2",0x00000000,"asia.pool.ntp.org"
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","3",0x00000000,"europe.pool.ntp.org"
diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c
index f8cc95a7310..29ecebe13e2 100644
--- a/reactos/dll/win32/advapi32/service/scm.c
+++ b/reactos/dll/win32/advapi32/service/scm.c
@@ -1675,7 +1675,7 @@ WaitForSCManager(VOID)
     /* Try to open the existing event */
     hEvent = OpenEventW(SYNCHRONIZE,
                         FALSE,
-                        L"SvcctrlStartEvent_A3752DX");
+                        SCM_START_EVENT);
     if (hEvent == NULL)
     {
         if (GetLastError() != ERROR_FILE_NOT_FOUND)
@@ -1685,13 +1685,13 @@ WaitForSCManager(VOID)
         hEvent = CreateEventW(NULL,
                               TRUE,
                               FALSE,
-                              L"SvcctrlStartEvent_A3752DX");
+                              SCM_START_EVENT);
         if (hEvent == NULL)
         {
             /* Try to open the existing event again */
             hEvent = OpenEventW(SYNCHRONIZE,
                                 FALSE,
-                                L"SvcctrlStartEvent_A3752DX");
+                                SCM_START_EVENT);
             if (hEvent == NULL)
                 return;
         }
diff --git a/reactos/include/reactos/services/services.h b/reactos/include/reactos/services/services.h
index b30854eae4f..c513a291c3d 100644
--- a/reactos/include/reactos/services/services.h
+++ b/reactos/include/reactos/services/services.h
@@ -19,6 +19,12 @@
 /* Start a service that runs in its own process */
 #define SERVICE_CONTROL_START_OWN   81
 
+/*
+ * Start event name used by OpenSCManager
+ * to know whether the SCM is initialized.
+ */
+#define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX"
+
 typedef struct _SCM_CONTROL_PACKET
 {
     DWORD dwSize;

From bb286fcb5a5964913148e486cdf3f5c2082e52e7 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 16 Mar 2013 17:06:48 +0000
Subject: [PATCH 55/61] [COMCTL32] * Sync with Wine 1.5.26.

svn path=/trunk/; revision=58521
---
 reactos/dll/win32/comctl32/comctl32undoc.c |   4 +-
 reactos/dll/win32/comctl32/datetime.c      |  20 +-
 reactos/dll/win32/comctl32/dpa.c           |   2 +-
 reactos/dll/win32/comctl32/imagelist.c     |  31 +-
 reactos/dll/win32/comctl32/listview.c      | 693 +++++++++++----------
 reactos/dll/win32/comctl32/monthcal.c      |   6 +-
 reactos/dll/win32/comctl32/propsheet.c     |  47 +-
 reactos/dll/win32/comctl32/rebar.c         |   2 +-
 reactos/dll/win32/comctl32/status.c        |  10 +-
 reactos/dll/win32/comctl32/toolbar.c       |   6 +-
 reactos/dll/win32/comctl32/tooltips.c      |  14 +-
 reactos/dll/win32/comctl32/treeview.c      |  54 +-
 reactos/dll/win32/comctl32/updown.c        |   4 +-
 reactos/media/doc/README.WINE              |   2 +-
 14 files changed, 492 insertions(+), 403 deletions(-)

diff --git a/reactos/dll/win32/comctl32/comctl32undoc.c b/reactos/dll/win32/comctl32/comctl32undoc.c
index 54d5ca8a643..bdf20f554c8 100644
--- a/reactos/dll/win32/comctl32/comctl32undoc.c
+++ b/reactos/dll/win32/comctl32/comctl32undoc.c
@@ -147,8 +147,8 @@ DWORD WINAPI GetSize (LPVOID lpMem)
  * MRU-Functions  {COMCTL32}
  *
  * NOTES
- * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently
- * Used) items. It is an undocumented Api that is used (at least) by the shell
+ * The MRU-API is a set of functions to manipulate lists of M.R.U. (Most Recently
+ * Used) items. It is an undocumented API that is used (at least) by the shell
  * and explorer to implement their recent documents feature.
  *
  * Since these functions are undocumented, they are unsupported by MS and
diff --git a/reactos/dll/win32/comctl32/datetime.c b/reactos/dll/win32/comctl32/datetime.c
index ff2edede88f..825b4427d1e 100644
--- a/reactos/dll/win32/comctl32/datetime.c
+++ b/reactos/dll/win32/comctl32/datetime.c
@@ -205,16 +205,16 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy
           systime->wHour, systime->wMinute, systime->wSecond);
 
     if (flag == GDT_VALID) {
-      if (systime->wYear == 0 ||
-          systime->wMonth < 1 || systime->wMonth > 12 ||
-          systime->wDay < 1 ||
-          systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) ||
-          systime->wHour > 23 ||
-          systime->wMinute > 59 ||
-          systime->wSecond > 59 ||
-          systime->wMilliseconds > 999
-          )
-        return FALSE;
+        if (systime->wYear == 0 ||
+            systime->wMonth < 1 || systime->wMonth > 12 ||
+            systime->wDay < 1 ||
+            systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) ||
+            systime->wHour > 23 ||
+            systime->wMinute > 59 ||
+            systime->wSecond > 59 ||
+            systime->wMilliseconds > 999
+           )
+            return FALSE;
 
         /* Windows returns true if the date is valid but outside the limits set */
         if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE)
diff --git a/reactos/dll/win32/comctl32/dpa.c b/reactos/dll/win32/comctl32/dpa.c
index 9566c610658..eceabca1ef4 100644
--- a/reactos/dll/win32/comctl32/dpa.c
+++ b/reactos/dll/win32/comctl32/dpa.c
@@ -459,7 +459,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow)
 /**************************************************************************
  * DPA_Clone [COMCTL32.331]
  *
- * Copies a pointer array to an other one or creates a copy
+ * Copies a pointer array to another one or creates a copy
  *
  * PARAMS
  *     hdpa    [I] handle (pointer) to the existing (source) pointer array
diff --git a/reactos/dll/win32/comctl32/imagelist.c b/reactos/dll/win32/comctl32/imagelist.c
index 75825764618..dfce617c3bb 100644
--- a/reactos/dll/win32/comctl32/imagelist.c
+++ b/reactos/dll/win32/comctl32/imagelist.c
@@ -118,6 +118,7 @@ typedef struct
 {
     HWND	hwnd;
     HIMAGELIST	himl;
+    HIMAGELIST	himlNoCursor;
     /* position of the drag image relative to the window */
     INT		x;
     INT		y;
@@ -130,7 +131,7 @@ typedef struct
     HBITMAP	hbmBg;
 } INTERNALDRAG;
 
-static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 };
+static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, 0, FALSE, 0 };
 
 static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count);
 static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv);
@@ -611,7 +612,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
     cx = himlTrack->cx;
     cy = himlTrack->cy;
 
-    InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1);
+    InternalDrag.himlNoCursor = InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1);
     if (InternalDrag.himl == NULL) {
         WARN("Error creating drag image list!\n");
         return FALSE;
@@ -1639,8 +1640,10 @@ ImageList_EndDrag (void)
 {
     /* cleanup the InternalDrag struct */
     InternalDrag.hwnd = 0;
+    if (InternalDrag.himl != InternalDrag.himlNoCursor)
+        ImageList_Destroy (InternalDrag.himlNoCursor);
     ImageList_Destroy (InternalDrag.himl);
-    InternalDrag.himl = 0;
+    InternalDrag.himlNoCursor = InternalDrag.himl = 0;
     InternalDrag.x= 0;
     InternalDrag.y= 0;
     InternalDrag.dxHotspot = 0;
@@ -2083,6 +2086,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
     INT      cxDst, cyDst;
     INT      xOff1, yOff1, xOff2, yOff2;
     POINT    pt1, pt2;
+    INT      newFlags;
 
     TRACE("(himl1=%p i1=%d himl2=%p i2=%d dx=%d dy=%d)\n", himl1, i1, himl2,
 	   i2, dx, dy);
@@ -2122,7 +2126,10 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
         yOff2 = 0;
     }
 
-    himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | ILC_COLOR, 1, 1);
+    newFlags = (himl1->flags > himl2->flags ? himl1->flags : himl2->flags) & ILC_COLORDDB;
+    if (newFlags == ILC_COLORDDB && (himl1->flags & ILC_COLORDDB) == ILC_COLOR16)
+        newFlags = ILC_COLOR16; /* this is what native (at least v5) does, don't know why */
+    himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | newFlags, 1, 1);
 
     if (himlDst)
     {
@@ -2135,8 +2142,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
             BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY);
         if (i2 >= 0 && i2 < himl2->cCurImage)
         {
-            BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND);
-            BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT);
+            if (himl2->flags & ILC_MASK)
+            {
+                BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND);
+                BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT);
+            }
+            else
+                BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCCOPY);
         }
 
         /* copy mask */
@@ -2239,7 +2251,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
     void *image_bits, *mask_bits = NULL;
     ILHEAD	ilHead;
     HIMAGELIST	himl;
-    int		i;
+    unsigned int i;
 
     TRACE("%p\n", pstm);
 
@@ -2703,7 +2715,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
 
     visible = InternalDrag.bShow;
 
-    himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag,
+    himlTemp = ImageList_Merge (InternalDrag.himlNoCursor, 0, himlDrag, iDrag,
                                 dxHotspot, dyHotspot);
 
     if (visible) {
@@ -2717,7 +2729,8 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
 	InternalDrag.hbmBg = 0;
     }
 
-    ImageList_Destroy (InternalDrag.himl);
+    if (InternalDrag.himl != InternalDrag.himlNoCursor)
+        ImageList_Destroy (InternalDrag.himl);
     InternalDrag.himl = himlTemp;
 
     if (visible) {
diff --git a/reactos/dll/win32/comctl32/listview.c b/reactos/dll/win32/comctl32/listview.c
index c2869528c0e..675169b326c 100644
--- a/reactos/dll/win32/comctl32/listview.c
+++ b/reactos/dll/win32/comctl32/listview.c
@@ -6,8 +6,9 @@
  * Copyright 2000 Jason Mawdsley
  * Copyright 2001 CodeWeavers Inc.
  * Copyright 2002 Dimitrie O. Paun
- * Copyright 2009-2012 Nikolay Sivov
+ * Copyright 2009-2013 Nikolay Sivov
  * Copyright 2009 Owen Rudge for CodeWeavers
+ * Copyright 2012-2013 Daniel Jelinski
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -54,7 +55,6 @@
  *   -- LVA_SNAPTOGRID not implemented
  *   -- LISTVIEW_ApproximateViewRect partially implemented
  *   -- LISTVIEW_SetColumnWidth ignores header images & bitmap
- *   -- LISTVIEW_SetIconSpacing is incomplete
  *   -- LISTVIEW_StyleChanged doesn't handle some changes too well
  *
  * Speedups
@@ -75,7 +75,6 @@
  * States
  *   -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0)
  *   -- LVIS_DROPHILITED
- *   -- LVIS_OVERLAYMASK
  *
  * Styles
  *   -- LVS_NOLABELWRAP
@@ -99,7 +98,6 @@
  *   -- LVN_GETINFOTIP
  *   -- LVN_HOTTRACK
  *   -- LVN_SETDISPINFO
- *   -- LVN_BEGINRDRAG
  *
  * Messages:
  *   -- LVM_ENABLEGROUPVIEW
@@ -290,6 +288,7 @@ typedef struct tagLISTVIEW_INFO
   HIMAGELIST himlSmall;
   HIMAGELIST himlState;
   SIZE iconSize;
+  BOOL autoSpacing;
   SIZE iconSpacing;
   SIZE iconStateSize;
   POINT currIconPos;        /* this is the position next icon will be placed */
@@ -326,12 +325,12 @@ typedef struct tagLISTVIEW_INFO
 
   /* mouse operation */
   BOOL bLButtonDown;
-  BOOL bRButtonDown;
   BOOL bDragging;
   POINT ptClickPos;         /* point where the user clicked */
   INT nLButtonDownItem;     /* tracks item to reset multiselection on WM_LBUTTONUP */
   DWORD dwHoverTime;
   HCURSOR hHotCursor;
+  INT cWheelRemainder;
 
   /* keyboard operation */
   DWORD lastKeyPressTimestamp;
@@ -775,13 +774,11 @@ static int get_ansi_notification(UINT unicodeNotificationCode)
 }
 
 /* forwards header notifications to listview parent */
-static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh)
+static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lpnmhW)
 {
-    NMHEADERA nmhA;
-    HDITEMA hditema;
-    HD_TEXTFILTERA textfilter;
-    LPSTR text = NULL, filter = NULL;
+    LPCWSTR text = NULL, filter = NULL;
     LRESULT ret;
+    NMHEADERA *lpnmh = (NMHEADERA*) lpnmhW;
 
     /* on unicode format exit earlier */
     if (infoPtr->notifyFormat == NFR_UNICODE)
@@ -790,37 +787,38 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE
 
     /* header always supplies unicode notifications,
        all we have to do is to convert strings to ANSI */
-    nmhA = *(const NMHEADERA*)lpnmh;
     if (lpnmh->pitem)
     {
-        hditema = *(HDITEMA*)lpnmh->pitem;
-        nmhA.pitem = &hditema;
         /* convert item text */
         if (lpnmh->pitem->mask & HDI_TEXT)
         {
-            hditema.pszText = NULL;
-            Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText);
-            text = hditema.pszText;
+            text = (LPCWSTR)lpnmh->pitem->pszText;
+            Str_SetPtrWtoA(&lpnmh->pitem->pszText, text);
         }
         /* convert filter text */
         if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) &&
              lpnmh->pitem->pvFilter)
         {
-            hditema.pvFilter = &textfilter;
-            textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter);
-            textfilter.pszText = NULL;
-            Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText);
-            filter = textfilter.pszText;
+            filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText;
+            Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter);
         }
     }
-    nmhA.hdr.code = get_ansi_notification(lpnmh->hdr.code);
+    lpnmh->hdr.code = get_ansi_notification(lpnmh->hdr.code);
 
-    ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhA.hdr.idFrom,
-                       (LPARAM)&nmhA);
+    ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmh->hdr.idFrom,
+                       (LPARAM)lpnmh);
 
     /* cleanup */
-    Free(text);
-    Free(filter);
+    if(text)
+    {
+        Free(lpnmh->pitem->pszText);
+        lpnmh->pitem->pszText = (LPSTR)text;
+    }
+    if(filter)
+    {
+        Free(((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText);
+        ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = (LPSTR)filter;
+    }
 
     return ret;
 }
@@ -888,11 +886,13 @@ static inline LRESULT notify_listview(const LISTVIEW_INFO *infoPtr, INT code, LP
     return notify_hdr(infoPtr, code, (LPNMHDR)plvnm);
 }
 
+/* Handles NM_DBLCLK, NM_CLICK, NM_RDBLCLK, NM_RCLICK. Only NM_RCLICK return value is used. */
 static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTESTINFO *lvht)
 {
     NMITEMACTIVATE nmia;
     LVITEMW item;
     HWND hwnd = infoPtr->hwndSelf;
+    LRESULT ret;
 
     TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); 
     ZeroMemory(&nmia, sizeof(nmia));
@@ -903,8 +903,8 @@ static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTEST
     item.iItem = lvht->iItem;
     item.iSubItem = 0;
     if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmia.lParam = item.lParam;
-    notify_hdr(infoPtr, code, (LPNMHDR)&nmia);
-    return IsWindow(hwnd);
+    ret = notify_hdr(infoPtr, code, (NMHDR*)&nmia);
+    return IsWindow(hwnd) && (code == NM_RCLICK ? !ret : TRUE);
 }
 
 static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem)
@@ -1672,6 +1672,10 @@ static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr)
     /* set header font */
     SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, TRUE);
 
+    /* set header image list */
+    if (infoPtr->himlSmall)
+        SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)infoPtr->himlSmall);
+
     LISTVIEW_UpdateSize(infoPtr);
 
     return 0;
@@ -1847,9 +1851,9 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr)
 static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData)
 {
     WCHAR buffer[MAX_PATH];
-    INT endidx, startidx;
     DWORD prevTime;
     LVITEMW item;
+    int startidx;
     INT nItem;
     INT diff;
 
@@ -1889,15 +1893,16 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L
         infoPtr->nSearchParamLength = 1;
     }
 
-    /* and search from the current position */
-    nItem = -1;
-    endidx = infoPtr->nItemCount;
-
     /* should start from next after focused item, so next item that matches
        will be selected, if there isn't any and focused matches it will be selected
        on second search stage from beginning of the list */
     if (infoPtr->nFocusedItem >= 0 && infoPtr->nItemCount > 1)
-        startidx = infoPtr->nFocusedItem + 1;
+    {
+        /* with some accumulated search data available start with current focus, otherwise
+           it's excluded from search */
+        startidx = infoPtr->nSearchParamLength > 1 ? infoPtr->nFocusedItem : infoPtr->nFocusedItem + 1;
+        if (startidx == infoPtr->nItemCount) startidx = 0;
+    }
     else
         startidx = 0;
 
@@ -1917,7 +1922,11 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L
     }
     else
     {
-        INT i = startidx;
+        int i = startidx, endidx;
+
+        /* and search from the current position */
+        nItem = -1;
+        endidx = infoPtr->nItemCount;
 
         /* first search in [startidx, endidx), on failure continue in [0, startidx) */
         while (1)
@@ -1939,12 +1948,15 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L
                 item.cchTextMax = MAX_PATH;
                 if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0;
 
-                if (lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength) == 0)
+                if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength))
                 {
                     nItem = i;
                     break;
                 }
-                else if (nItem == -1 && lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1) == 0)
+                /* this is used to find first char match when search string is not available yet,
+                   otherwise every WM_CHAR will search to next item by first char, ignoring that we're
+                   already waiting for user to complete a string */
+                else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1))
                 {
                     /* this would work but we must keep looking for a longer match */
                     nItem = i;
@@ -2376,7 +2388,7 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW
 	    Icon.top    = Box.top;
 	    Icon.right  = Icon.left;
 	    if (infoPtr->himlSmall &&
-                (!lpColumnInfo || lpLVItem->iSubItem == 0 || (lpColumnInfo->fmt & LVCFMT_IMAGE) ||
+                (!lpColumnInfo || lpLVItem->iSubItem == 0 ||
                  ((infoPtr->dwLvExStyle & LVS_EX_SUBITEMIMAGES) && lpLVItem->iImage != I_IMAGECALLBACK)))
 		Icon.right += infoPtr->iconSize.cx;
 	    Icon.bottom = Icon.top + infoPtr->iconSize.cy;
@@ -2967,15 +2979,12 @@ static INT LISTVIEW_CalculateItemHeight(const LISTVIEW_INFO *infoPtr)
 	nItemHeight = infoPtr->iconSpacing.cy;
     else
     {
-	nItemHeight = infoPtr->ntmHeight; 
-        if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES)
-            nItemHeight++;
+	nItemHeight = infoPtr->ntmHeight;
 	if (infoPtr->himlState)
 	    nItemHeight = max(nItemHeight, infoPtr->iconStateSize.cy);
 	if (infoPtr->himlSmall)
 	    nItemHeight = max(nItemHeight, infoPtr->iconSize.cy);
-	if (infoPtr->himlState || infoPtr->himlSmall)
-	    nItemHeight += HEIGHT_PADDING;
+	nItemHeight += HEIGHT_PADDING;
     if (infoPtr->nMeasureItemHeight > 0)
         nItemHeight = infoPtr->nMeasureItemHeight;
     }
@@ -3459,7 +3468,6 @@ static inline BOOL LISTVIEW_SetItemFocus(LISTVIEW_INFO *infoPtr, INT nItem)
     return oldFocus != infoPtr->nFocusedItem;
 }
 
-/* Helper function for LISTVIEW_ShiftIndices *only* */
 static INT shift_item(const LISTVIEW_INFO *infoPtr, INT nShiftItem, INT nItem, INT direction)
 {
     if (nShiftItem < nItem) return nShiftItem;
@@ -3471,6 +3479,24 @@ static INT shift_item(const LISTVIEW_INFO *infoPtr, INT nShiftItem, INT nItem, I
     return min(nShiftItem, infoPtr->nItemCount - 1);
 }
 
+/* This function updates focus index.
+
+Parameters:
+   focus : current focus index
+   item : index of item to be added/removed
+   direction : add/remove flag
+*/
+static void LISTVIEW_ShiftFocus(LISTVIEW_INFO *infoPtr, INT focus, INT item, INT direction)
+{
+    BOOL old_change = infoPtr->bDoChangeNotify;
+
+    infoPtr->bDoChangeNotify = FALSE;
+    focus = shift_item(infoPtr, focus, item, direction);
+    if (focus != infoPtr->nFocusedItem)
+        LISTVIEW_SetItemFocus(infoPtr, focus);
+    infoPtr->bDoChangeNotify = old_change;
+}
+
 /**
 * DESCRIPTION:
 * Updates the various indices after an item has been inserted or deleted.
@@ -3485,31 +3511,15 @@ static INT shift_item(const LISTVIEW_INFO *infoPtr, INT nShiftItem, INT nItem, I
 */
 static void LISTVIEW_ShiftIndices(LISTVIEW_INFO *infoPtr, INT nItem, INT direction)
 {
-    INT nNewFocus;
-    BOOL bOldChange;
-
-    /* temporarily disable change notification while shifting items */
-    bOldChange = infoPtr->bDoChangeNotify;
-    infoPtr->bDoChangeNotify = FALSE;
-
-    TRACE("Shifting %iu, %i steps\n", nItem, direction);
+    TRACE("Shifting %i, %i steps\n", nItem, direction);
 
     ranges_shift(infoPtr->selectionRanges, nItem, direction, infoPtr->nItemCount);
-
     assert(abs(direction) == 1);
-
     infoPtr->nSelectionMark = shift_item(infoPtr, infoPtr->nSelectionMark, nItem, direction);
 
-    nNewFocus = shift_item(infoPtr, infoPtr->nFocusedItem, nItem, direction);
-    if (nNewFocus != infoPtr->nFocusedItem)
-        LISTVIEW_SetItemFocus(infoPtr, nNewFocus);
-    
     /* But we are not supposed to modify nHotItem! */
-
-    infoPtr->bDoChangeNotify = bOldChange;
 }
 
-
 /**
  * DESCRIPTION:
  * Adds a block of selections.
@@ -3550,8 +3560,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
     ZeroMemory(&nmlv, sizeof(nmlv));
     nmlv.iFrom = nFirst;
     nmlv.iTo = nLast;
-    nmlv.uNewState = 0;
-    nmlv.uOldState = item.state;
+    nmlv.uOldState = 0;
+    nmlv.uNewState = item.state;
 
     notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv);
     if (!IsWindow(hwndSelf))
@@ -3606,9 +3616,15 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem)
 	POINT ptItem;
 	
 	rcItem.left = LVIR_BOUNDS;
-	if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) return;
+	if (!LISTVIEW_GetItemRect(infoPtr, nItem, &rcItem)) {
+	     ranges_destroy (selection);
+	     return;
+	}
 	rcSelMark.left = LVIR_BOUNDS;
-	if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) return;
+	if (!LISTVIEW_GetItemRect(infoPtr, infoPtr->nSelectionMark, &rcSelMark)) {
+	     ranges_destroy (selection);
+	     return;
+	}
 	UnionRect(&rcSel, &rcItem, &rcSelMark);
 	iterator_frameditems(&i, infoPtr, &rcSel);
 	while(iterator_next(&i))
@@ -3989,17 +4005,23 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent
  */
 static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y)
 {
+    LVHITTESTINFO ht;
+    RECT rect;
+    POINT pt;
+
     if (!(fwKeys & MK_LBUTTON))
         infoPtr->bLButtonDown = FALSE;
 
     if (infoPtr->bLButtonDown)
     {
-        POINT tmp;
-        RECT rect;
-        LVHITTESTINFO lvHitTestInfo;
-        WORD wDragWidth = GetSystemMetrics(SM_CXDRAG);
-        WORD wDragHeight= GetSystemMetrics(SM_CYDRAG);
+        rect.left = rect.right = infoPtr->ptClickPos.x;
+        rect.top = rect.bottom = infoPtr->ptClickPos.y;
 
+        InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG));
+    }
+
+    if (infoPtr->bLButtonDown)
+    {
         if (infoPtr->bMarqueeSelect)
         {
             POINT coords_orig;
@@ -4042,22 +4064,17 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
             return 0;
         }
 
-        rect.left = infoPtr->ptClickPos.x - wDragWidth;
-        rect.right = infoPtr->ptClickPos.x + wDragWidth;
-        rect.top = infoPtr->ptClickPos.y - wDragHeight;
-        rect.bottom = infoPtr->ptClickPos.y + wDragHeight;
+        pt.x = x;
+        pt.y = y;
 
-        tmp.x = x;
-        tmp.y = y;
-
-        lvHitTestInfo.pt = tmp;
-        LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
+        ht.pt = pt;
+        LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);
 
         /* reset item marker */
-        if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem)
+        if (infoPtr->nLButtonDownItem != ht.iItem)
             infoPtr->nLButtonDownItem = -1;
 
-        if (!PtInRect(&rect, tmp))
+        if (!PtInRect(&rect, pt))
         {
             /* this path covers the following:
                1. WM_LBUTTONDOWN over selected item (sets focus on it)
@@ -4077,12 +4094,12 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
 
             if (!infoPtr->bDragging)
             {
-                lvHitTestInfo.pt = infoPtr->ptClickPos;
-                LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
+                ht.pt = infoPtr->ptClickPos;
+                LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);
 
                 /* If the click is outside the range of an item, begin a
                    highlight. If not, begin an item drag. */
-                if (lvHitTestInfo.iItem == -1)
+                if (ht.iItem == -1)
                 {
                     NMHDR hdr;
 
@@ -4107,7 +4124,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
                     NMLISTVIEW nmlv;
 
                     ZeroMemory(&nmlv, sizeof(nmlv));
-                    nmlv.iItem = lvHitTestInfo.iItem;
+                    nmlv.iItem = ht.iItem;
                     nmlv.ptAction = infoPtr->ptClickPos;
 
                     notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv);
@@ -4158,7 +4175,7 @@ static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle)
 
 /***
  * DESCRIPTION:
- * Helper for LISTVIEW_SetItemT *only*: sets item attributes.
+ * Helper for LISTVIEW_SetItemT and LISTVIEW_InsertItemT: sets item attributes.
  *
  * PARAMETER(S):
  * [I] infoPtr : valid pointer to the listview structure
@@ -4227,20 +4244,19 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
     if ((lpLVItem->mask & LVIF_TEXT) && textcmpWT(lpItem->hdr.pszText, lpLVItem->pszText, isW))
 	uChanged |= LVIF_TEXT;
    
-    TRACE("uChanged=0x%x\n", uChanged); 
-    if (!uChanged) return TRUE;
-    *bChanged = TRUE;
+    TRACE("change mask=0x%x\n", uChanged);
     
-    ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
+    memset(&nmlv, 0, sizeof(NMLISTVIEW));
     nmlv.iItem = lpLVItem->iItem;
     nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask);
     nmlv.uOldState = item.state;
-    nmlv.uChanged = uChanged;
+    nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask;
     nmlv.lParam = item.lParam;
-    
-    /* send LVN_ITEMCHANGING notification, if the item is not being inserted */
-    /* and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications */
-    /* are enabled */
+
+    /* Send LVN_ITEMCHANGING notification, if the item is not being inserted
+       and we are _NOT_ virtual (LVS_OWNERDATA), and change notifications
+       are enabled. Even nothing really changed we still need to send this,
+       in this case uChanged mask is just set to passed item mask. */
     if(lpItem && !isNew && infoPtr->bDoChangeNotify)
     {
       HWND hwndSelf = infoPtr->hwndSelf;
@@ -4251,6 +4267,18 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
 	return FALSE;
     }
 
+    /* When item is inserted we need to shift existing focus index if new item has lower index. */
+    if (isNew && (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) &&
+        /* this means we won't hit a focus change path later */
+        ((uChanged & LVIF_STATE) == 0 || (!(lpLVItem->state & LVIS_FOCUSED) && (infoPtr->nFocusedItem != lpLVItem->iItem))))
+    {
+        if (infoPtr->nFocusedItem != -1 && (lpLVItem->iItem <= infoPtr->nFocusedItem))
+            infoPtr->nFocusedItem++;
+    }
+
+    if (!uChanged) return TRUE;
+    *bChanged = TRUE;
+
     /* copy information */
     if (lpLVItem->mask & LVIF_TEXT)
         textsetptrT(&lpItem->hdr.pszText, lpLVItem->pszText, isW);
@@ -4280,7 +4308,14 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
 	{
 	    ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem);
 	}
-	/* if we are asked to change focus, and we manage it, do it */
+	/* If we are asked to change focus, and we manage it, do it.
+           It's important to have all new item data stored at this point,
+           because changing existing focus could result in a redrawing operation,
+           which in turn could ask for disp data, application should see all data
+           for inserted item when processing LVN_GETDISPINFO.
+
+           The way this works application will see nested item change notifications -
+           changed item notifications interrupted by ones from item losing focus. */
 	if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED)
 	{
 	    if (lpLVItem->state & LVIS_FOCUSED)
@@ -4312,7 +4347,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL
 
     /* if we're inserting the item, we're done */
     if (isNew) return TRUE;
-    
+
     /* send LVN_ITEMCHANGED notification */
     if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam;
     if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv);
@@ -4554,7 +4589,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
     NMLVCUSTOMDRAW nmlvcd;
     HIMAGELIST himl;
     LVITEMW lvItem;
-    HFONT hOldFont;
 
     TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos));
 
@@ -4562,7 +4596,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
     lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
     if (nSubItem == 0) lvItem.mask |= LVIF_STATE;
     if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT;
-    lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT;
+    lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK;
     lvItem.iItem = nItem;
     lvItem.iSubItem = nSubItem;
     lvItem.state = 0;
@@ -4592,7 +4626,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
     /* fill in the custom draw structure */
     customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem);
 
-    hOldFont = GetCurrentObject(hdc, OBJ_FONT);
     if (nSubItem > 0) cdmode = infoPtr->cditemmode;
     if (cdmode & CDRF_SKIPDEFAULT) goto postpaint;
     if (cdmode & CDRF_NOTIFYITEMDRAW)
@@ -4600,7 +4633,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
     if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode;
     if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;
     /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */
-    if (nSubItem == 0 && cdsubitemmode == CDRF_NOTIFYITEMDRAW)
+    if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0)
     {
         cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd);
         if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint;
@@ -4610,21 +4643,25 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
     else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE)
         prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE);
 
-    /* in full row select, subitems, will just use main item's colors */
-    if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
-	nmlvcd.clrTextBk = CLR_NONE;
-
     /* FIXME: temporary hack */
     rcSelect.left = rcLabel.left;
 
-    /* draw the selection background, if we're drawing the main item */
-    if (nSubItem == 0)
-    {
-        /* in icon mode, the label rect is really what we want to draw the
-         * background for */
-        if (infoPtr->uView == LV_VIEW_ICON)
-	    rcSelect = rcLabel;
+    /* in icon mode, the label rect is really what we want to draw the
+     * background for */
+    /* in detail mode, we want to paint background for label rect when
+     * item is not selected or listview has full row select; otherwise paint
+     * background for text only */
+    if (infoPtr->uView == LV_VIEW_ICON ||
+        (infoPtr->uView == LV_VIEW_DETAILS &&
+        (!(lvItem.state & LVIS_SELECTED) ||
+        (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0)))
+        rcSelect = rcLabel;
 
+    if (nmlvcd.clrTextBk != CLR_NONE)
+        ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL);
+
+    if(nSubItem == 0 && infoPtr->nFocusedItem == nItem)
+    {
 	if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
 	{
 	    /* we have to update left focus bound too if item isn't in leftmost column
@@ -4647,10 +4684,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
 	    rcSelect.right = rcBox.right;
 	}
 
-	if (nmlvcd.clrTextBk != CLR_NONE)
-	    ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL);
 	/* store new focus rectangle */
-	if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect;
+        infoPtr->rcFocus = rcSelect;
     }
 
     /* state icons */
@@ -4681,7 +4716,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
         ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
                          rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk,
                          lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT,
-                         style);
+                         style | (lvItem.state & LVIS_OVERLAYMASK));
     }
 
     /* Don't bother painting item being edited */
@@ -4719,8 +4754,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
 postpaint:
     if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT)
         notify_postpaint(infoPtr, &nmlvcd);
-    if (cdsubitemmode & CDRF_NEWFONT)
-        SelectObject(hdc, hOldFont);
     return TRUE;
 }
 
@@ -4847,6 +4880,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc,
     /* iterate through the invalidated rows */
     while(iterator_next(i))
     {
+        SelectObject(hdc, infoPtr->hFont);
 	LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position);
 	Position.y += Origin.y;
 
@@ -4969,6 +5003,8 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc)
         SelectObject( hdc, hOldPen );
         DeleteObject( hPen );
     }
+    else
+        ranges_destroy(colRanges);
 }
 
 /***
@@ -4992,6 +5028,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D
     
     while(iterator_prev(i))
     {
+        SelectObject(hdc, infoPtr->hFont);
 	LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position);
 	Position.x += Origin.x;
 	Position.y += Origin.y;
@@ -5015,7 +5052,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D
  */
 static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcErase)
 {
-    COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText;
+    COLORREF oldTextColor = 0, oldBkColor = 0;
     NMLVCUSTOMDRAW nmlvcd;
     HFONT hOldFont = 0;
     DWORD cdmode;
@@ -5072,21 +5109,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra
                hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY);
     }
 
-    /* FIXME: Shouldn't need to do this */
-    oldClrTextBk = infoPtr->clrTextBk;
-    oldClrText   = infoPtr->clrText;
-   
     infoPtr->cditemmode = CDRF_DODEFAULT;
 
     GetClientRect(infoPtr->hwndSelf, &rcClient);
     customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0);
     cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd);
     if (cdmode & CDRF_SKIPDEFAULT) goto enddraw;
-    prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE);
-
-    /* Use these colors to draw the items */
-    infoPtr->clrTextBk = nmlvcd.clrTextBk;
-    infoPtr->clrText = nmlvcd.clrText;
 
     /* nothing to draw */
     if(infoPtr->nItemCount == 0) goto enddraw;
@@ -5139,9 +5167,6 @@ enddraw:
     if (cdmode & CDRF_NOTIFYPOSTPAINT)
 	notify_postpaint(infoPtr, &nmlvcd);
 
-    infoPtr->clrTextBk = oldClrTextBk;
-    infoPtr->clrText = oldClrText;
-
     if(hbmp) {
         BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top,
                infoPtr->rcList.right - infoPtr->rcList.left,
@@ -5322,6 +5347,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP
     POINT pos;
     HDC hdc, hdcOrig;
     HBITMAP hbmp, hOldbmp;
+    HFONT hOldFont;
     HIMAGELIST dragList = 0;
     TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount);
 
@@ -5342,6 +5368,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP
     hdc = CreateCompatibleDC(hdcOrig);
     hbmp = CreateCompatibleBitmap(hdcOrig, size.cx, size.cy);
     hOldbmp = SelectObject(hdc, hbmp);
+    hOldFont = SelectObject(hdc, infoPtr->hFont);
 
     rcItem.left = rcItem.top = 0;
     rcItem.right = size.cx;
@@ -5358,6 +5385,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP
     else
         SelectObject(hdc, hOldbmp);
 
+    SelectObject(hdc, hOldFont);
     DeleteObject(hbmp);
     DeleteDC(hdc);
     ReleaseDC(infoPtr->hwndSelf, hdcOrig);
@@ -5642,9 +5670,8 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir)
     TRACE("rcScroll=%s, dx=%d\n", wine_dbgstr_rect(&rcScroll), dir * infoPtr->nItemHeight);
     if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList))
     {
-	TRACE("Scrolling rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList));
-	ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, 
-		       &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE);
+	TRACE("Invalidating rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList));
+	InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE);
     }
 
     /* report has only that column, so we're done */
@@ -5657,8 +5684,7 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir)
     rcScroll.bottom = nPerCol * infoPtr->nItemHeight;
     OffsetRect(&rcScroll, Origin.x, Origin.y);
     if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList))
-	ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight,
-		       &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE);
+	InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE);
 }
 
 /***
@@ -5677,6 +5703,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem)
 {
     LVITEMW item;
     const BOOL is_icon = (infoPtr->uView == LV_VIEW_SMALLICON || infoPtr->uView == LV_VIEW_ICON);
+    INT focus = infoPtr->nFocusedItem;
 
     TRACE("(nItem=%d)\n", nItem);
 
@@ -5686,7 +5713,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem)
     item.state = 0;
     item.stateMask = LVIS_SELECTED | LVIS_FOCUSED;
     LISTVIEW_SetItemState(infoPtr, nItem, &item);
-	    
+
     /* send LVN_DELETEITEM notification. */
     if (!notify_deleteitem(infoPtr, nItem)) return FALSE;
 
@@ -5727,6 +5754,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem)
 
     infoPtr->nItemCount--;
     LISTVIEW_ShiftIndices(infoPtr, nItem, -1);
+    LISTVIEW_ShiftFocus(infoPtr, focus, nItem, -1);
 
     /* now is the invalidation fun */
     if (!is_icon)
@@ -6554,7 +6582,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem,
     HDPA hdpaSubItems;
     INT isubitem;
 
-    TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
+    TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
 
     if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iItem >= infoPtr->nItemCount)
 	return FALSE;
@@ -7045,65 +7073,61 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT
  * 
  * NOTE: for subItem = 0, we should return the bounds of the _entire_ item,
  *       not only those of the first column.
- *       Fortunately, LISTVIEW_GetItemMetrics does the right thing.
  * 
  * RETURN:
  *     TRUE: success
  *     FALSE: failure
  */
-static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc)
+static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT item, LPRECT lprc)
 {
-    POINT Position, Origin;
-    LVITEMW lvItem;
-    INT nColumn;
+    RECT rect = { 0, 0, 0, 0 };
+    POINT origin;
+    INT y;
     
     if (!lprc) return FALSE;
 
-    nColumn = lprc->top;
-
-    TRACE("(nItem=%d, nSubItem=%d, type=%d)\n", nItem, lprc->top, lprc->left);
-    /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */
+    TRACE("(item=%d, subitem=%d, type=%d)\n", item, lprc->top, lprc->left);
+    /* Subitem of '0' means item itself, and this works for all control view modes */
     if (lprc->top == 0)
-        return LISTVIEW_GetItemRect(infoPtr, nItem, lprc);
+        return LISTVIEW_GetItemRect(infoPtr, item, lprc);
 
     if (infoPtr->uView != LV_VIEW_DETAILS) return FALSE;
 
-    /* special case for header items */
-    if (nItem == -1)
-    {
-        if (lprc->left != LVIR_BOUNDS)
-        {
-            FIXME("Only LVIR_BOUNDS is implemented for header, got %d\n", lprc->left);
-            return FALSE;
-        }
+    LISTVIEW_GetOrigin(infoPtr, &origin);
+    /* this works for any item index, no matter if it exists or not */
+    y = item * infoPtr->nItemHeight + origin.y;
 
-        if (infoPtr->hwndHeader)
-            return SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)lprc);
-        else
-        {
-            memset(lprc, 0, sizeof(RECT));
-            return TRUE;
-        }
+    if (infoPtr->hwndHeader && SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)&rect))
+    {
+        rect.top = 0;
+        rect.bottom = infoPtr->nItemHeight;
+    }
+    else
+    {
+        /* Native implementation is broken for this case and garbage is left for left and right fields,
+           we zero them to get predictable output */
+        lprc->left = lprc->right = lprc->top = 0;
+        lprc->bottom = infoPtr->nItemHeight;
+        OffsetRect(lprc, origin.x, y);
+        TRACE("return rect %s\n", wine_dbgstr_rect(lprc));
+        return TRUE;
     }
 
-    if (!LISTVIEW_GetItemPosition(infoPtr, nItem, &Position)) return FALSE;
-    LISTVIEW_GetOrigin(infoPtr, &Origin);
-
-    if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE;
-
-    lvItem.mask = 0;
-    lvItem.iItem = nItem;
-    lvItem.iSubItem = nColumn;
-    
-    switch(lprc->left)
+    switch (lprc->left)
     {
     case LVIR_ICON:
-	LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL, NULL);
-        break;
+    {
+        /* it doesn't matter if main item actually has an icon, if imagelist is set icon width is returned */
+        if (infoPtr->himlSmall)
+            rect.right = rect.left + infoPtr->iconSize.cx;
+        else
+            rect.right = rect.left;
 
+        rect.bottom = rect.top + infoPtr->iconSize.cy;
+        break;
+    }
     case LVIR_LABEL:
     case LVIR_BOUNDS:
-	LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL, NULL);
         break;
 
     default:
@@ -7111,7 +7135,8 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR
 	return FALSE;
     }
 
-    OffsetRect(lprc, Origin.x, Position.y);
+    OffsetRect(&rect, origin.x, y);
+    *lprc = rect;
     TRACE("return rect %s\n", wine_dbgstr_rect(lprc));
 
     return TRUE;
@@ -7680,7 +7705,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
     LVITEMW item;
     HWND hwndSelf = infoPtr->hwndSelf;
 
-    TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
+    TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW);
 
     if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++;
 
@@ -7730,7 +7755,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
     else
         nItem = min(lpLVItem->iItem, infoPtr->nItemCount);
 
-    TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem);
+    TRACE("inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem);
     nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems );
     if (nItem == -1) goto fail;
     infoPtr->nItemCount++;
@@ -7762,6 +7787,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
         item.state &= ~LVIS_STATEIMAGEMASK;
         item.state |= INDEXTOSTATEIMAGEMASK(1);
     }
+
     if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;
 
     /* make room for the position, if we are in the right mode */
@@ -7775,9 +7801,9 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
 	    goto undo;
 	}
     }
-    
+
     /* send LVN_INSERTITEM notification */
-    ZeroMemory(&nmlv, sizeof(NMLISTVIEW));
+    memset(&nmlv, 0, sizeof(NMLISTVIEW));
     nmlv.iItem = nItem;
     nmlv.lParam = lpItem->lParam;
     notify_listview(infoPtr, LVN_INSERTITEM, &nmlv);
@@ -7803,6 +7829,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem,
 
 undo:
     LISTVIEW_ShiftIndices(infoPtr, nItem, -1);
+    LISTVIEW_ShiftFocus(infoPtr, infoPtr->nFocusedItem, nItem, -1);
     DPA_DeletePtr(infoPtr->hdpaItems, nItem);
     infoPtr->nItemCount--;
 fail:
@@ -8283,10 +8310,10 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx)
 	lvItem.mask = LVIF_TEXT;	
 	lvItem.iItem = 0;
 	lvItem.iSubItem = nColumn;
-	lvItem.pszText = szDispText;
 	lvItem.cchTextMax = DISP_TEXT_SIZE;
 	for (; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++)
 	{
+            lvItem.pszText = szDispText;
 	    if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue;
 	    nLabelWidth = LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE);
 	    if (max_cx < nLabelWidth) max_cx = nLabelWidth;
@@ -8570,36 +8597,33 @@ static DWORD LISTVIEW_SetHoverTime(LISTVIEW_INFO *infoPtr, DWORD dwHoverTime)
  */
 static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy)
 {
+    INT iconWidth = 0, iconHeight = 0;
     DWORD oldspacing = MAKELONG(infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy);
 
     TRACE("requested=(%d,%d)\n", cx, cy);
-    
-    /* this is supported only for LVS_ICON style */
-    if (infoPtr->uView != LV_VIEW_ICON) return oldspacing;
-  
+
     /* set to defaults, if instructed to */
-    if (cx == -1) cx = GetSystemMetrics(SM_CXICONSPACING);
-    if (cy == -1) cy = GetSystemMetrics(SM_CYICONSPACING);
-
-    /* if 0 then compute width
-     * FIXME: computed cx and cy is not matching native behaviour */
-    if (cx == 0) {
-        cx = GetSystemMetrics(SM_CXICONSPACING);
-        if (infoPtr->iconSize.cx + ICON_LR_PADDING > cx)
-            cx = infoPtr->iconSize.cx + ICON_LR_PADDING;
+    if (cx == -1 && cy == -1)
+    {
+        infoPtr->autoSpacing = TRUE;
+        if (infoPtr->himlNormal)
+            ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight);
+        cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth;
+        cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight;
     }
+    else
+        infoPtr->autoSpacing = FALSE;
 
-    /* if 0 then compute height */
-    if (cy == 0) 
-	cy = infoPtr->iconSize.cy + 2 * infoPtr->ntmHeight +
-	     ICON_BOTTOM_PADDING + ICON_TOP_PADDING + LABEL_VERT_PADDING;
-    
+    /* if 0 then keep width */
+    if (cx != 0)
+        infoPtr->iconSpacing.cx = cx;
 
-    infoPtr->iconSpacing.cx = cx;
-    infoPtr->iconSpacing.cy = cy;
+    /* if 0 then keep height */
+    if (cy != 0)
+        infoPtr->iconSpacing.cy = cy;
 
     TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%d,%d), ntmH=%d\n",
-	  LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, 
+          LOWORD(oldspacing), HIWORD(oldspacing), infoPtr->iconSpacing.cx, infoPtr->iconSpacing.cy,
 	  infoPtr->iconSize.cx, infoPtr->iconSize.cy,
 	  infoPtr->ntmHeight);
 
@@ -8651,13 +8675,16 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG
         himlOld = infoPtr->himlNormal;
         infoPtr->himlNormal = himl;
         if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE);
-        LISTVIEW_SetIconSpacing(infoPtr, 0, 0);
+        if (infoPtr->autoSpacing)
+            LISTVIEW_SetIconSpacing(infoPtr, -1, -1);
     break;
 
     case LVSIL_SMALL:
         himlOld = infoPtr->himlSmall;
         infoPtr->himlSmall = himl;
         if (infoPtr->uView != LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, TRUE);
+        if (infoPtr->hwndHeader)
+            SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)himl);
     break;
 
     case LVSIL_STATE:
@@ -8854,6 +8881,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE
         UINT oldstate = 0;
         BOOL notify;
 
+        /* special case optimization for recurring attempt to deselect all */
+        if (lvItem.state == 0 && lvItem.stateMask == LVIS_SELECTED && !LISTVIEW_GetSelectedCount(infoPtr))
+            return TRUE;
+
 	/* select all isn't allowed in LVS_SINGLESEL */
 	if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL))
 	    return FALSE;
@@ -9039,7 +9070,6 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL unicode)
  */
 static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView)
 {
-  SIZE oldIconSize = infoPtr->iconSize;
   HIMAGELIST himl;
 
   if (infoPtr->uView == nView) return 1;
@@ -9065,14 +9095,6 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView)
   switch (nView)
   {
   case LV_VIEW_ICON:
-      if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy))
-      {
-            TRACE("icon old size=(%d,%d), new size=(%d,%d)\n",
-                   oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy);
-	    LISTVIEW_SetIconSpacing(infoPtr, 0, 0);
-      }
-      LISTVIEW_Arrange(infoPtr, LVA_DEFAULT);
-      break;
   case LV_VIEW_SMALLICON:
       LISTVIEW_Arrange(infoPtr, LVA_DEFAULT);
       break;
@@ -9369,11 +9391,13 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs)
   infoPtr->bRedraw = TRUE;
   infoPtr->bNoItemMetrics = TRUE;
   infoPtr->bDoChangeNotify = TRUE;
-  infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING);
-  infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING);
+  infoPtr->autoSpacing = TRUE;
+  infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON);
+  infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON);
   infoPtr->nEditLabelItem = -1;
   infoPtr->nLButtonDownItem = -1;
   infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */
+  infoPtr->cWheelRemainder = 0;
   infoPtr->nMeasureItemHeight = 0;
   infoPtr->xTrackLine = -1;  /* no track line */
   infoPtr->itemEdit.fEnabled = FALSE;
@@ -9774,14 +9798,10 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode,
 
 static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta)
 {
-    INT gcWheelDelta = 0;
-    INT pulScrollLines = 3;
+    UINT pulScrollLines = 3;
 
     TRACE("(wheelDelta=%d)\n", wheelDelta);
 
-    SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
-    gcWheelDelta -= wheelDelta;
-
     switch(infoPtr->uView)
     {
     case LV_VIEW_ICON:
@@ -9790,21 +9810,31 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta)
         *  listview should be scrolled by a multiple of 37 dependently on its dimension or its visible item number
         *  should be fixed in the future.
         */
-        LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (gcWheelDelta < 0) ?
+        LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (wheelDelta > 0) ?
                 -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE);
         break;
 
     case LV_VIEW_DETAILS:
-        if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
+        SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0);
+
+        /* if scrolling changes direction, ignore left overs */
+        if ((wheelDelta < 0 && infoPtr->cWheelRemainder < 0) ||
+            (wheelDelta > 0 && infoPtr->cWheelRemainder > 0))
+            infoPtr->cWheelRemainder += wheelDelta;
+        else
+            infoPtr->cWheelRemainder = wheelDelta;
+        if (infoPtr->cWheelRemainder && pulScrollLines)
         {
-            int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines);
-            cLineScroll *= (gcWheelDelta / WHEEL_DELTA);
-            LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll);
+            int cLineScroll;
+            pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines);
+            cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA;
+            infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines;
+            LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll);
         }
         break;
 
     case LV_VIEW_LIST:
-        LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0);
+        LISTVIEW_HScroll(infoPtr, (wheelDelta > 0) ? SB_LINELEFT : SB_LINERIGHT, 0);
         break;
     }
     return 0;
@@ -9931,7 +9961,10 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr)
 {
     TRACE("()\n");
 
-    /* if we did not have the focus, there's nothing to do */
+    /* drop any left over scroll amount */
+    infoPtr->cWheelRemainder = 0;
+
+    /* if we did not have the focus, there's nothing more to do */
     if (!infoPtr->bFocus) return 0;
    
     /* send NM_KILLFOCUS notification */
@@ -10004,6 +10037,52 @@ static LRESULT LISTVIEW_LButtonDblClk(LISTVIEW_INFO *infoPtr, WORD wKey, INT x,
     return 0;
 }
 
+static LRESULT LISTVIEW_TrackMouse(const LISTVIEW_INFO *infoPtr, POINT pt)
+{
+    MSG msg;
+    RECT r;
+
+    r.top = r.bottom = pt.y;
+    r.left = r.right = pt.x;
+
+    InflateRect(&r, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG));
+
+    SetCapture(infoPtr->hwndSelf);
+
+    while (1)
+    {
+	if (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD))
+	{
+	    if (msg.message == WM_MOUSEMOVE)
+	    {
+		pt.x = (short)LOWORD(msg.lParam);
+		pt.y = (short)HIWORD(msg.lParam);
+		if (PtInRect(&r, pt))
+		    continue;
+		else
+		{
+		    ReleaseCapture();
+		    return 1;
+		}
+	    }
+	    else if (msg.message >= WM_LBUTTONDOWN &&
+		     msg.message <= WM_RBUTTONDBLCLK)
+	    {
+		break;
+	    }
+
+	    DispatchMessageW(&msg);
+	}
+
+	if (GetCapture() != infoPtr->hwndSelf)
+	    return 0;
+    }
+
+    ReleaseCapture();
+    return 0;
+}
+
+
 /***
  * DESCRIPTION:
  * Processes mouse down messages (left mouse button).
@@ -10257,9 +10336,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr)
  * RETURN:
  * Zero
  */
-static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
+static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr)
 {
-    const NMHEADERW *lpnmh;
+    NMHEADERW *lpnmh;
     
     TRACE("(lpnmhdr=%p)\n", lpnmhdr);
 
@@ -10267,7 +10346,7 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
 
     /* remember: HDN_LAST < HDN_FIRST */
     if (lpnmhdr->code > HDN_FIRST || lpnmhdr->code < HDN_LAST) return 0;
-    lpnmh = (const NMHEADERW *)lpnmhdr;
+    lpnmh = (NMHEADERW *)lpnmhdr;
 
     if (lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0;
 
@@ -10292,26 +10371,25 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
             LISTVIEW_GetOrigin(infoPtr, &ptOrigin);
             infoPtr->xTrackLine = x + ptOrigin.x;
             LISTVIEW_DrawTrackLine(infoPtr);
-            break;
+            return notify_forward_header(infoPtr, lpnmh);
 	}
-	
+
 	case HDN_ENDTRACKA:
 	case HDN_ENDTRACKW:
 	    /* remove the track line (if any) */
 	    LISTVIEW_DrawTrackLine(infoPtr);
 	    infoPtr->xTrackLine = -1;
-	    break;
+            return notify_forward_header(infoPtr, lpnmh);
 
         case HDN_BEGINDRAG:
-            notify_forward_header(infoPtr, lpnmh);
-            return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0;
+            if ((infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0) return 1;
+            return notify_forward_header(infoPtr, lpnmh);
 
         case HDN_ENDDRAG:
             infoPtr->colRectsDirty = TRUE;
             LISTVIEW_InvalidateList(infoPtr);
-            notify_forward_header(infoPtr, lpnmh);
-            return FALSE;
-            
+            return notify_forward_header(infoPtr, lpnmh);
+
 	case HDN_ITEMCHANGEDW:
 	case HDN_ITEMCHANGEDA:
 	{
@@ -10391,8 +10469,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
 		    LISTVIEW_InvalidateRect(infoPtr, &rcCol);
 		}
 	    }
-	}
-	break;
+	    break;
+        }
 
 	case HDN_ITEMCLICKW:
 	case HDN_ITEMCLICKA:
@@ -10404,9 +10482,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
             nmlv.iItem = -1;
             nmlv.iSubItem = lpnmh->iItem;
             notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv);
-            notify_forward_header(infoPtr, lpnmh);
+            return notify_forward_header(infoPtr, lpnmh);
         }
-	break;
 
 	case HDN_DIVIDERDBLCLICKW:
 	case HDN_DIVIDERDBLCLICKA:
@@ -10414,10 +10491,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr)
                       we should use LVSCW_AUTOSIZE_USEHEADER, helper rework or
                       split needed for that */
             LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE);
-            notify_forward_header(infoPtr, lpnmh);
-            break;
+            return notify_forward_header(infoPtr, lpnmh);
     }
-
     return 0;
 }
 
@@ -10612,94 +10687,76 @@ static LRESULT LISTVIEW_RButtonDblClk(const LISTVIEW_INFO *infoPtr, WORD wKey, I
 
 /***
  * DESCRIPTION:
- * Processes mouse down messages (right mouse button).
+ * Processes WM_RBUTTONDOWN message and corresponding drag operation.
  *
  * PARAMETER(S):
  * [I] infoPtr : valid pointer to the listview structure
  * [I] wKey : key flag
- * [I] x,y : mouse coordinate
+ * [I] x, y : mouse coordinate
  *
  * RETURN:
  * Zero
  */
 static LRESULT LISTVIEW_RButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y)
 {
-    LVHITTESTINFO lvHitTestInfo;
-    INT nItem;
+    LVHITTESTINFO ht;
+    INT item;
 
-    TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y);
+    TRACE("(key=%hu, x=%d, y=%d)\n", wKey, x, y);
 
     /* send NM_RELEASEDCAPTURE notification */
     if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0;
 
+    /* determine the index of the selected item */
+    ht.pt.x = x;
+    ht.pt.y = y;
+    item = LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);
+
     /* make sure the listview control window has the focus */
     if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf);
 
-    /* set right button down flag */
-    infoPtr->bRButtonDown = TRUE;
-
-    /* determine the index of the selected item */
-    lvHitTestInfo.pt.x = x;
-    lvHitTestInfo.pt.y = y;
-    nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
-  
-    if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
+    if ((item >= 0) && (item < infoPtr->nItemCount))
     {
-	LISTVIEW_SetItemFocus(infoPtr, nItem);
+	LISTVIEW_SetItemFocus(infoPtr, item);
 	if (!((wKey & MK_SHIFT) || (wKey & MK_CONTROL)) &&
-            !LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED))
-	    LISTVIEW_SetSelection(infoPtr, nItem);
+            !LISTVIEW_GetItemState(infoPtr, item, LVIS_SELECTED))
+	    LISTVIEW_SetSelection(infoPtr, item);
+    }
+    else
+	LISTVIEW_DeselectAll(infoPtr);
+
+    if (LISTVIEW_TrackMouse(infoPtr, ht.pt))
+    {
+	if (ht.iItem != -1)
+	{
+            NMLISTVIEW nmlv;
+
+            memset(&nmlv, 0, sizeof(nmlv));
+            nmlv.iItem = ht.iItem;
+            nmlv.ptAction = ht.pt;
+
+            notify_listview(infoPtr, LVN_BEGINRDRAG, &nmlv);
+	}
     }
     else
     {
-	LISTVIEW_DeselectAll(infoPtr);
+	SetFocus(infoPtr->hwndSelf);
+
+        ht.pt.x = x;
+        ht.pt.y = y;
+        LISTVIEW_HitTest(infoPtr, &ht, TRUE, FALSE);
+
+	if (notify_click(infoPtr, NM_RCLICK, &ht))
+	{
+	    /* Send a WM_CONTEXTMENU message in response to the WM_RBUTTONUP */
+	    SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU,
+		(WPARAM)infoPtr->hwndSelf, (LPARAM)GetMessagePos());
+	}
     }
 
     return 0;
 }
 
-/***
- * DESCRIPTION:
- * Processes mouse up messages (right mouse button).
- *
- * PARAMETER(S):
- * [I] infoPtr : valid pointer to the listview structure
- * [I] wKey : key flag
- * [I] x,y : mouse coordinate
- *
- * RETURN:
- * Zero
- */
-static LRESULT LISTVIEW_RButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT y)
-{
-    LVHITTESTINFO lvHitTestInfo;
-    POINT pt;
-
-    TRACE("(key=%hu,X=%u,Y=%u)\n", wKey, x, y);
-
-    if (!infoPtr->bRButtonDown) return 0;
- 
-    /* set button flag */
-    infoPtr->bRButtonDown = FALSE;
-
-    /* Send NM_RCLICK notification */
-    lvHitTestInfo.pt.x = x;
-    lvHitTestInfo.pt.y = y;
-    LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE);
-    if (!notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo)) return 0;
-
-    /* Change to screen coordinate for WM_CONTEXTMENU */
-    pt = lvHitTestInfo.pt;
-    ClientToScreen(infoPtr->hwndSelf, &pt);
-
-    /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */
-    SendMessageW(infoPtr->hwndSelf, WM_CONTEXTMENU,
-		 (WPARAM)infoPtr->hwndSelf, MAKELPARAM(pt.x, pt.y));
-
-    return 0;
-}
-
-
 /***
  * DESCRIPTION:
  * Sets the cursor.
@@ -10782,6 +10839,7 @@ static LRESULT LISTVIEW_SetFocus(LISTVIEW_INFO *infoPtr, HWND hwndLoseFocus)
 static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedraw)
 {
     HFONT oldFont = infoPtr->hFont;
+    INT oldHeight = infoPtr->nItemHeight;
 
     TRACE("(hfont=%p,redraw=%hu)\n", hFont, fRedraw);
 
@@ -10790,12 +10848,16 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedra
     
     LISTVIEW_SaveTextMetrics(infoPtr);
 
+    infoPtr->nItemHeight = LISTVIEW_CalculateItemHeight(infoPtr);
+
     if (infoPtr->uView == LV_VIEW_DETAILS)
     {
 	SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(fRedraw, 0));
         LISTVIEW_UpdateSize(infoPtr);
         LISTVIEW_UpdateScroll(infoPtr);
     }
+    else if (infoPtr->nItemHeight != oldHeight)
+        LISTVIEW_UpdateScroll(infoPtr);
 
     if (fRedraw) LISTVIEW_InvalidateList(infoPtr);
 
@@ -10973,7 +11035,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType,
 
     if (uNewView != uOldView)
     {
-    	SIZE oldIconSize = infoPtr->iconSize;
     	HIMAGELIST himl;
     
         SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0);
@@ -10984,17 +11045,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType,
 
         himl = (uNewView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall);
         set_icon_size(&infoPtr->iconSize, himl, uNewView != LVS_ICON);
-    
-        if (uNewView == LVS_ICON)
-        {
-            if ((infoPtr->iconSize.cx != oldIconSize.cx) || (infoPtr->iconSize.cy != oldIconSize.cy))
-            {
-                TRACE("icon old size=(%d,%d), new size=(%d,%d)\n",
-		      oldIconSize.cx, oldIconSize.cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy);
-	        LISTVIEW_SetIconSpacing(infoPtr, 0, 0);
-            }
-        }
-        else if (uNewView == LVS_REPORT)
+
+        if (uNewView == LVS_REPORT)
         {
             HDLAYOUT hl;
             WINDOWPOS wp;
@@ -11425,7 +11477,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     return LISTVIEW_SetHoverTime(infoPtr, (DWORD)lParam);
 
   case LVM_SETICONSPACING:
-    return LISTVIEW_SetIconSpacing(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
+    if(lParam == -1)
+        return LISTVIEW_SetIconSpacing(infoPtr, -1, -1);
+    return LISTVIEW_SetIconSpacing(infoPtr, LOWORD(lParam), HIWORD(lParam));
 
   case LVM_SETIMAGELIST:
     return (LRESULT)LISTVIEW_SetImageList(infoPtr, (INT)wParam, (HIMAGELIST)lParam);
@@ -11588,9 +11642,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
   case WM_RBUTTONDOWN:
     return LISTVIEW_RButtonDown(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam));
 
-  case WM_RBUTTONUP:
-    return LISTVIEW_RButtonUp(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam));
-
   case WM_SETCURSOR:
     return LISTVIEW_SetCursor(infoPtr, wParam, lParam);
 
diff --git a/reactos/dll/win32/comctl32/monthcal.c b/reactos/dll/win32/comctl32/monthcal.c
index a9b76d47627..3dba5401b3d 100644
--- a/reactos/dll/win32/comctl32/monthcal.c
+++ b/reactos/dll/win32/comctl32/monthcal.c
@@ -1076,7 +1076,8 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc,
 /* months before first calendar month and after last calendar month */
 static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps)
 {
-  INT mask, length, index;
+  INT mask, index;
+  UINT length;
   SYSTEMTIME st_max, st;
 
   if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return;
@@ -1116,7 +1117,8 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc,
 static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx)
 {
   const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month;
-  INT i, j, length;
+  INT i, j;
+  UINT length;
   RECT r, fill_bk_rect;
   SYSTEMTIME st;
   WCHAR buf[80];
diff --git a/reactos/dll/win32/comctl32/propsheet.c b/reactos/dll/win32/comctl32/propsheet.c
index a1c5673e58f..03b275f8033 100644
--- a/reactos/dll/win32/comctl32/propsheet.c
+++ b/reactos/dll/win32/comctl32/propsheet.c
@@ -168,7 +168,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
                                 int index,
                                 int skipdir,
                                 HPROPSHEETPAGE hpage);
-static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo);
+static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo, int original_index);
 static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo);
 static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
 static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage);
@@ -1998,9 +1998,8 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
   HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
 
   TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage);
-  /* hpage takes precedence over index */
-  if (hpage != NULL)
-    index = PROPSHEET_GetPageIndex(hpage, psInfo);
+
+  index = PROPSHEET_GetPageIndex(hpage, psInfo, index);
 
   if (index < 0 || index >= psInfo->nPages)
   {
@@ -2331,13 +2330,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
   if (!psInfo) {
     return FALSE;
   }
-  /*
-   * hpage takes precedence over index.
-   */
-  if (hpage != 0)
-  {
-    index = PROPSHEET_GetPageIndex(hpage, psInfo);
-  }
+
+  index = PROPSHEET_GetPageIndex(hpage, psInfo, index);
 
   /* Make sure that index is within range */
   if (index < 0 || index >= psInfo->nPages)
@@ -2575,16 +2569,11 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex)
  */
 static LRESULT PROPSHEET_PageToIndex(HWND hwndDlg, HPROPSHEETPAGE hPage)
 {
-    int index;
     PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr);
 
     TRACE("(%p, %p)\n", hwndDlg, hPage);
 
-    for (index = 0; index < psInfo->nPages; index++)
-        if (psInfo->proppage[index].hpage == hPage)
-            return index;
-    WARN("%p not found\n", hPage);
-    return -1;
+    return PROPSHEET_GetPageIndex(hPage, psInfo, -1);
 }
 
 /******************************************************************************
@@ -2660,26 +2649,20 @@ static BOOL PROPSHEET_RecalcPageSizes(HWND hwndDlg)
  *            PROPSHEET_GetPageIndex
  *
  * Given a HPROPSHEETPAGE, returns the index of the corresponding page from
- * the array of PropPageInfo.
+ * the array of PropPageInfo. If page is not found original index is used
+ * (page takes precedence over index).
  */
-static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo)
+static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psInfo, int original_index)
 {
-  BOOL found = FALSE;
-  int index = 0;
+    int index;
 
-  TRACE("hpage %p\n", hpage);
-  while ((index < psInfo->nPages) && (found == FALSE))
-  {
-    if (psInfo->proppage[index].hpage == hpage)
-      found = TRUE;
-    else
-      index++;
-  }
+    TRACE("page %p index %d\n", page, original_index);
 
-  if (found == FALSE)
-    index = -1;
+    for (index = 0; index < psInfo->nPages; index++)
+        if (psInfo->proppage[index].hpage == page)
+            return index;
 
-  return index;
+    return original_index;
 }
 
 /******************************************************************************
diff --git a/reactos/dll/win32/comctl32/rebar.c b/reactos/dll/win32/comctl32/rebar.c
index 2dc99cd784f..592e382cd15 100644
--- a/reactos/dll/win32/comctl32/rebar.c
+++ b/reactos/dll/win32/comctl32/rebar.c
@@ -1123,7 +1123,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus)
  * or infoPtr->uNumBands if none */
 static int next_visible(const REBAR_INFO *infoPtr, int i)
 {
-    int n;
+    unsigned int n;
     for (n = i + 1; n < infoPtr->uNumBands; n++)
         if (!HIDDENBAND(REBAR_GetBand(infoPtr, n)))
             break;
diff --git a/reactos/dll/win32/comctl32/status.c b/reactos/dll/win32/comctl32/status.c
index d16e16372a0..45df80305ea 100644
--- a/reactos/dll/win32/comctl32/status.c
+++ b/reactos/dll/win32/comctl32/status.c
@@ -285,7 +285,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA
 static LRESULT
 STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
 {
-    int      i;
     RECT   rect;
     HBRUSH hbrBk;
     HFONT  hOldFont;
@@ -319,6 +318,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
     if (infoPtr->simple) {
 	STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
     } else {
+        unsigned int i;
+
 	for (i = 0; i < infoPtr->numParts; i++) {
 	    STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
 	}
@@ -336,7 +337,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
 static int
 STATUSBAR_InternalHitTest(const STATUS_INFO *infoPtr, const POINT *pt)
 {
-    int i;
+    unsigned int i;
+
     if (infoPtr->simple)
         return 255;
 
@@ -352,7 +354,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr)
 {
     STATUSWINDOWPART *part;
     RECT rect, *r;
-    int	i;
+    UINT i;
 
     /* get our window size */
     GetClientRect (infoPtr->Self, &rect);
@@ -883,7 +885,7 @@ STATUSBAR_Simple (STATUS_INFO *infoPtr, BOOL simple)
 static LRESULT
 STATUSBAR_WMDestroy (STATUS_INFO *infoPtr)
 {
-    int	i;
+    unsigned int i;
 
     TRACE("\n");
     for (i = 0; i < infoPtr->numParts; i++) {
diff --git a/reactos/dll/win32/comctl32/toolbar.c b/reactos/dll/win32/comctl32/toolbar.c
index 9923cdb76ef..702694fbafd 100644
--- a/reactos/dll/win32/comctl32/toolbar.c
+++ b/reactos/dll/win32/comctl32/toolbar.c
@@ -5212,9 +5212,9 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr)
     if (infoPtr->himlInt)
 	ImageList_Destroy (infoPtr->himlInt);
 
-	TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef);
-	TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis);
-	TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot);
+    TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef);
+    TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis);
+    TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot);
 
     /* delete default font */
     DeleteObject (infoPtr->hDefaultFont);
diff --git a/reactos/dll/win32/comctl32/tooltips.c b/reactos/dll/win32/comctl32/tooltips.c
index 34da653c05f..a51fa35483a 100644
--- a/reactos/dll/win32/comctl32/tooltips.c
+++ b/reactos/dll/win32/comctl32/tooltips.c
@@ -991,9 +991,17 @@ TOOLTIPS_CheckTool (const TOOLTIPS_INFO *infoPtr, BOOL bShowTest)
     if (nTool == -1)
 	return -1;
 
-    if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) {
-	if (!TOOLTIPS_IsWindowActive (GetWindow (infoPtr->hwndSelf, GW_OWNER)))
-	    return -1;
+    if (!(GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest)
+    {
+        TTTOOL_INFO *ti = &infoPtr->tools[nTool];
+        HWND hwnd = (ti->uFlags & TTF_IDISHWND) ? (HWND)ti->uId : ti->hwnd;
+
+        if (!TOOLTIPS_IsWindowActive(hwnd))
+        {
+            TRACE("not active: hwnd %p, parent %p, active %p\n",
+                  hwnd, GetParent(hwnd), GetActiveWindow());
+            return -1;
+        }
     }
 
     TRACE("tool %d\n", nTool);
diff --git a/reactos/dll/win32/comctl32/treeview.c b/reactos/dll/win32/comctl32/treeview.c
index 8dd0dcabee4..d8a36ce2290 100644
--- a/reactos/dll/win32/comctl32/treeview.c
+++ b/reactos/dll/win32/comctl32/treeview.c
@@ -102,6 +102,7 @@ typedef struct tagTREEVIEW_INFO
   BOOL          insertBeforeorAfter; /* flag used by TVM_SETINSERTMARK */
   HIMAGELIST    dragList;       /* Bitmap of dragged item */
   LONG          scrollX;
+  INT           wheelRemainder;
   COLORREF      clrBk;
   COLORREF      clrText;
   COLORREF      clrLine;
@@ -110,6 +111,7 @@ typedef struct tagTREEVIEW_INFO
   HFONT         hDefaultFont;
   HFONT         hBoldFont;
   HFONT         hUnderlineFont;
+  HFONT         hBoldUnderlineFont;
   HCURSOR       hcurHand;
   HWND          hwndToolTip;
 
@@ -303,11 +305,22 @@ TREEVIEW_CreateUnderlineFont(HFONT hOrigFont)
     return CreateFontIndirectW(&font);
 }
 
+static HFONT
+TREEVIEW_CreateBoldUnderlineFont(HFONT hfont)
+{
+    LOGFONTW font;
+
+    GetObjectW(hfont, sizeof(font), &font);
+    font.lfWeight = FW_BOLD;
+    font.lfUnderline = TRUE;
+    return CreateFontIndirectW(&font);
+}
+
 static inline HFONT
 TREEVIEW_FontForItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item)
 {
     if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (item == infoPtr->hotItem))
-        return infoPtr->hUnderlineFont;
+        return item->state & TVIS_BOLD ? infoPtr->hBoldUnderlineFont : infoPtr->hUnderlineFont;
     if (item->state & TVIS_BOLD)
         return infoPtr->hBoldFont;
     return infoPtr->hFont;
@@ -1562,7 +1575,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item)
 	       newFirstVisible = item->prevSibling;
 	    else if (item->parent != infoPtr->root)
 	       newFirstVisible = item->parent;
-	       TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE);
+	    TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE);
 	}
 	else
 	    newFirstVisible = infoPtr->firstVisible;
@@ -1903,8 +1916,10 @@ TREEVIEW_SetFont(TREEVIEW_INFO *infoPtr, HFONT hFont, BOOL bRedraw)
 
     DeleteObject(infoPtr->hBoldFont);
     DeleteObject(infoPtr->hUnderlineFont);
+    DeleteObject(infoPtr->hBoldUnderlineFont);
     infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont);
     infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont);
+    infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont);
 
     if (!infoPtr->bHeightSet)
 	infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr);
@@ -3155,10 +3170,10 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent,
 	{
 	    int visOrder = infoPtr->firstVisible->visibleOrder;
 
-        if (parent == infoPtr->root)
-            TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL);
-        else
-            TREEVIEW_RecalculateVisibleOrder(infoPtr, parent);
+	    if (parent == infoPtr->root)
+	        TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL);
+	    else
+	        TREEVIEW_RecalculateVisibleOrder(infoPtr, parent);
 
 	    if (TREEVIEW_IsChildOf(parent, infoPtr->firstVisible))
 	    {
@@ -4916,7 +4931,7 @@ scroll:
 static LRESULT
 TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 {
-    short gcWheelDelta;
+    short wheelDelta;
     UINT pulScrollLines = 3;
 
     if (wParam & (MK_SHIFT | MK_CONTROL))
@@ -4927,13 +4942,25 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
 
     SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &pulScrollLines, 0);
 
-    gcWheelDelta = -(short)HIWORD(wParam);
-    pulScrollLines *= (gcWheelDelta / WHEEL_DELTA);
+    wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam);
+    /* if scrolling changes direction, ignore left overs */
+    if ((wheelDelta < 0 && infoPtr->wheelRemainder < 0) ||
+        (wheelDelta > 0 && infoPtr->wheelRemainder > 0))
+        infoPtr->wheelRemainder += wheelDelta;
+    else
+        infoPtr->wheelRemainder = wheelDelta;
 
-    if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines)
+    if (infoPtr->wheelRemainder && pulScrollLines)
     {
-	int newDy = infoPtr->firstVisible->visibleOrder + pulScrollLines;
-	int maxDy = infoPtr->maxVisibleOrder;
+	int newDy;
+	int maxDy;
+	int lineScroll;
+
+	lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA;
+	infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines;
+
+	newDy = infoPtr->firstVisible->visibleOrder - lineScroll;
+	maxDy = infoPtr->maxVisibleOrder;
 
 	if (newDy > maxDy)
 	    newDy = maxDy;
@@ -5038,6 +5065,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
     /* dragList */
 
     infoPtr->scrollX = 0;
+    infoPtr->wheelRemainder = 0;
 
     infoPtr->clrBk   = CLR_NONE; /* use system color */
     infoPtr->clrText = CLR_NONE; /* use system color */
@@ -5064,6 +5092,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
     infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW(&lf);
     infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont);
     infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont);
+    infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont);
     infoPtr->hcurHand = LoadCursorW(NULL, (LPWSTR)IDC_HAND);
 
     infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr);
@@ -5123,6 +5152,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr)
     DeleteObject(infoPtr->hDefaultFont);
     DeleteObject(infoPtr->hBoldFont);
     DeleteObject(infoPtr->hUnderlineFont);
+    DeleteObject(infoPtr->hBoldUnderlineFont);
     Free(infoPtr);
 
     return 0;
diff --git a/reactos/dll/win32/comctl32/updown.c b/reactos/dll/win32/comctl32/updown.c
index d3be2898c54..32162267a9f 100644
--- a/reactos/dll/win32/comctl32/updown.c
+++ b/reactos/dll/win32/comctl32/updown.c
@@ -1026,10 +1026,10 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
 
             if (TRACE_ON(updown))
             {
-                INT i;
+                UINT i;
 
                 for (i = 0; i < wParam; i++)
-                    TRACE("%d: nSec %u nInc %u\n", i,
+                    TRACE("%u: nSec %u nInc %u\n", i,
                         infoPtr->AccelVect[i].nSec, infoPtr->AccelVect[i].nInc);
             }
 
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index e2e8e019ac0..f1b19369251 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -48,7 +48,7 @@ reactos/dll/win32/browseui        # Out of sync
 reactos/dll/win32/cabinet         # Synced to Wine-1.5.19
 reactos/dll/win32/clusapi         # Synced to Wine-1.5.19
 reactos/dll/win32/comcat          # Synced to Wine-1.5.4
-reactos/dll/win32/comctl32        # Synced to Wine 1.5.19
+reactos/dll/win32/comctl32        # Synced to Wine 1.5.26
 reactos/dll/win32/comdlg32        # Synced to Wine 1.3.37
 reactos/dll/win32/compstui        # Synced to Wine-1.5.19
 reactos/dll/win32/credui          # Synced to Wine-1.5.4

From 017ba0c5a7648bb0241160c79a8d78baeedf2705 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 16 Mar 2013 17:07:05 +0000
Subject: [PATCH 56/61] [COMCTL32_WINETEST] * Sync with Wine 1.5.26.

svn path=/trunk/; revision=58522
---
 rostests/winetests/comctl32/comboex.c   |   8 +-
 rostests/winetests/comctl32/datetime.c  |  12 +-
 rostests/winetests/comctl32/dpa.c       |  17 +-
 rostests/winetests/comctl32/header.c    |  14 +-
 rostests/winetests/comctl32/imagelist.c | 115 +++-
 rostests/winetests/comctl32/ipaddress.c |   6 +-
 rostests/winetests/comctl32/listview.c  | 668 ++++++++++++++++++++++--
 rostests/winetests/comctl32/misc.c      |   6 +-
 rostests/winetests/comctl32/monthcal.c  |  25 +-
 rostests/winetests/comctl32/mru.c       |  18 +-
 rostests/winetests/comctl32/msg.h       |   4 +-
 rostests/winetests/comctl32/pager.c     |   7 +-
 rostests/winetests/comctl32/propsheet.c |  10 +-
 rostests/winetests/comctl32/rebar.c     |  12 +-
 rostests/winetests/comctl32/rsrc.rc     |   2 +-
 rostests/winetests/comctl32/status.c    |  12 +-
 rostests/winetests/comctl32/syslink.c   |   8 +-
 rostests/winetests/comctl32/tab.c       |   9 +-
 rostests/winetests/comctl32/testlist.c  |   5 +-
 rostests/winetests/comctl32/tooltips.c  |  11 +-
 rostests/winetests/comctl32/trackbar.c  |   8 +-
 rostests/winetests/comctl32/treeview.c  |  21 +-
 rostests/winetests/comctl32/updown.c    |   8 +-
 23 files changed, 856 insertions(+), 150 deletions(-)

diff --git a/rostests/winetests/comctl32/comboex.c b/rostests/winetests/comctl32/comboex.c
index 7cddbafdf08..ed331a58f88 100644
--- a/rostests/winetests/comctl32/comboex.c
+++ b/rostests/winetests/comctl32/comboex.c
@@ -18,10 +18,14 @@
  */
 
 #include <assert.h>
-#include <windows.h>
+//#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
+//#include "wine/test.h"
 #include "msg.h"
 
 #define EDITBOX_SEQ_INDEX  0
diff --git a/rostests/winetests/comctl32/datetime.c b/rostests/winetests/comctl32/datetime.c
index 24d339fc80d..dc75f9c93d8 100644
--- a/rostests/winetests/comctl32/datetime.c
+++ b/rostests/winetests/comctl32/datetime.c
@@ -17,10 +17,15 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
-#include <windows.h>
+//#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winnls.h>
 #include <commctrl.h>
-
-#include "wine/test.h"
+//#include "wine/test.h"
 #include "msg.h"
 
 #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT))
@@ -147,6 +152,7 @@ static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, DATETIME_SEQ_INDEX, &msg);
 
     defwndproc_counter++;
diff --git a/rostests/winetests/comctl32/dpa.c b/rostests/winetests/comctl32/dpa.c
index e3591397fd5..7c7f99b2dc7 100644
--- a/rostests/winetests/comctl32/dpa.c
+++ b/rostests/winetests/comctl32/dpa.c
@@ -19,17 +19,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "commctrl.h"
-#include "objidl.h"
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <commctrl.h>
+#include <objbase.h>
+//#include "objidl.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
 
diff --git a/rostests/winetests/comctl32/header.c b/rostests/winetests/comctl32/header.c
index 08d5065bbcb..ca34e41174e 100644
--- a/rostests/winetests/comctl32/header.c
+++ b/rostests/winetests/comctl32/header.c
@@ -18,12 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 
-#include <windows.h>
+//#include <windows.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <objbase.h>
 #include <commctrl.h>
 #include <assert.h>
 
-#include "wine/test.h"
+#include <wine/test.h>
 #include "v6util.h"
 #include "msg.h"
 
@@ -409,6 +418,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, HEADER_SEQ_INDEX, &msg);
 
     defwndproc_counter++;
diff --git a/rostests/winetests/comctl32/imagelist.c b/rostests/winetests/comctl32/imagelist.c
index 98b84a62d09..7559806a0d1 100644
--- a/rostests/winetests/comctl32/imagelist.c
+++ b/rostests/winetests/comctl32/imagelist.c
@@ -21,24 +21,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 #define CONST_VTABLE
 
-#include <stdarg.h>
+//#include <stdarg.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "objbase.h"
-#include "commctrl.h" /* must be included after objbase.h to get ImageList_Write */
-#include "initguid.h"
-#include "commoncontrols.h"
-#include "shellapi.h"
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+//#include "winuser.h"
+#include <objbase.h>
+#include <commctrl.h> /* must be included after objbase.h to get ImageList_Write */
+#include <initguid.h>
+#include <commoncontrols.h>
+#include <shellapi.h>
 
-#include "wine/test.h"
+#include <wine/test.h>
 #include "v6util.h"
 
 #undef VISIBLE
@@ -492,6 +496,70 @@ static void test_DrawIndirect(void)
     DestroyWindow(hwndfortest);
 }
 
+static int get_color_format(HBITMAP bmp)
+{
+    BITMAPINFO bmi;
+    HDC hdc = CreateCompatibleDC(0);
+    HBITMAP hOldBmp = SelectObject(hdc, bmp);
+    int ret;
+
+    memset(&bmi, 0, sizeof(bmi));
+    bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    ret = GetDIBits(hdc, bmp, 0, 0, 0, &bmi, DIB_RGB_COLORS);
+    ok(ret, "GetDIBits failed\n");
+
+    SelectObject(hdc, hOldBmp);
+    DeleteDC(hdc);
+    return bmi.bmiHeader.biBitCount;
+}
+
+static void test_merge_colors(void)
+{
+    HIMAGELIST himl[8], hmerge;
+    int sizes[] = { ILC_COLOR, ILC_COLOR | ILC_MASK, ILC_COLOR4, ILC_COLOR8, ILC_COLOR16, ILC_COLOR24, ILC_COLOR32, ILC_COLORDDB };
+    HICON hicon1;
+    IMAGEINFO info;
+    int bpp, i, j;
+
+    hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits);
+    ok(hicon1 != NULL, "failed to create hicon1\n");
+
+    for (i = 0; i < 8; i++)
+    {
+        himl[i] = ImageList_Create(32, 32, sizes[i], 0, 3);
+        ok(himl[i] != NULL, "failed to create himl[%d]\n", i);
+        ok(0 == ImageList_AddIcon(himl[i], hicon1), "add icon1 to himl[%d] failed\n", i);
+        if (i == 0 || i == 1 || i == 7)
+        {
+            ImageList_GetImageInfo(himl[i], 0, &info);
+            sizes[i] = get_color_format(info.hbmImage);
+        }
+    }
+    DestroyIcon(hicon1);
+    for (i = 0; i < 8; i++)
+        for (j = 0; j < 8; j++)
+        {
+            hmerge = ImageList_Merge(himl[i], 0, himl[j], 0, 0, 0);
+            ok(hmerge != NULL, "merge himl[%d], himl[%d] failed\n", i, j);
+
+            ImageList_GetImageInfo(hmerge, 0, &info);
+            bpp = get_color_format(info.hbmImage);
+            /* ILC_COLOR[X] is defined as [X] */
+            if (i == 4 && j == 7)
+                ok(bpp == 16, /* merging ILC_COLOR16 with ILC_COLORDDB seems to be a special case */
+                    "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]);
+            else
+                ok(bpp == (i > j ? sizes[i] : sizes[j]),
+                    "wrong biBitCount %d when merging lists %d (%d) and %d (%d)\n", bpp, i, sizes[i], j, sizes[j]);
+            ok(info.hbmMask != 0, "Imagelist merged from %d and %d had no mask\n", i, j);
+
+            if (hmerge) ImageList_Destroy(hmerge);
+        }
+
+    for (i = 0; i < 8; i++)
+        ImageList_Destroy(himl[i]);
+}
+
 static void test_merge(void)
 {
     HIMAGELIST himl1, himl2, hmerge;
@@ -782,22 +850,21 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT
 static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment)
 {
     HDC hdc;
-    char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)];
-    BITMAPINFO *bmi = (BITMAPINFO *)bmibuf;
+    BITMAPINFO bmi;
     HBITMAP hbmp, hbmp_old;
     HBRUSH hbrush;
     RECT rc = { 0, 0, cx, cy };
 
     hdc = CreateCompatibleDC(0);
 
-    memset(bmi, 0, sizeof(*bmi));
-    bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader);
-    bmi->bmiHeader.biHeight = cx;
-    bmi->bmiHeader.biWidth = cy;
-    bmi->bmiHeader.biBitCount = 24;
-    bmi->bmiHeader.biPlanes = 1;
-    bmi->bmiHeader.biCompression = BI_RGB;
-    hbmp = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0);
+    memset(&bmi, 0, sizeof(bmi));
+    bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
+    bmi.bmiHeader.biHeight = cx;
+    bmi.bmiHeader.biWidth = cy;
+    bmi.bmiHeader.biBitCount = 24;
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biCompression = BI_RGB;
+    hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0);
 
     hbmp_old = SelectObject(hdc, hbmp);
 
@@ -1161,6 +1228,7 @@ static void test_shell_imagelist(void)
     if (!pSHGetImageList)
     {
         win_skip("SHGetImageList not available, skipping test\n");
+        FreeLibrary(hShell32);
         return;
     }
 
@@ -1169,8 +1237,10 @@ static void test_shell_imagelist(void)
 
     ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr);
 
-    if (hr != S_OK)
+    if (hr != S_OK) {
+        FreeLibrary(hShell32);
         return;
+    }
 
     IImageList_GetImageCount(iml, &out);
     ok(out > 0, "IImageList_GetImageCount returned out <= 0\n");
@@ -2015,6 +2085,7 @@ START_TEST(imagelist)
     test_imagecount();
     test_DrawIndirect();
     test_merge();
+    test_merge_colors();
     test_imagelist_storage();
     test_iconsize();
 
diff --git a/rostests/winetests/comctl32/ipaddress.c b/rostests/winetests/comctl32/ipaddress.c
index 96540cbe68e..4acdd83cb06 100644
--- a/rostests/winetests/comctl32/ipaddress.c
+++ b/rostests/winetests/comctl32/ipaddress.c
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <wine/test.h>
 
-#include <windows.h>
+//#include <windows.h>
+#include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
-
 #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got)
 
 static HWND create_ipaddress_control (void)
diff --git a/rostests/winetests/comctl32/listview.c b/rostests/winetests/comctl32/listview.c
index 255ef50d140..62b9b779823 100644
--- a/rostests/winetests/comctl32/listview.c
+++ b/rostests/winetests/comctl32/listview.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2006 Mike McCormack for CodeWeavers
  * Copyright 2007 George Gov
- * Copyright 2009-2012 Nikolay Sivov
+ * Copyright 2009-2013 Nikolay Sivov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <stdio.h>
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
 #include "v6util.h"
 #include "msg.h"
 
@@ -52,6 +55,8 @@ static BOOL blockEdit;
 static BOOL g_block_hover;
 /* notification data for LVN_ITEMCHANGED */
 static NMLISTVIEW g_nmlistview;
+/* notification data for LVN_ITEMCHANGING */
+static NMLISTVIEW g_nmlistview_changing;
 /* format reported to control:
    -1 falls to defproc, anything else returned */
 static INT notifyFormat;
@@ -63,6 +68,8 @@ static LVITEMA g_itema;
 static BOOL g_disp_A_to_W;
 /* dispinfo data sent with LVN_LVN_ENDLABELEDIT */
 static NMLVDISPINFO g_editbox_disp_info;
+/* when this is set focus will be tested on LVN_DELETEITEM */
+static BOOL g_focus_test_LVN_DELETEITEM;
 
 static HWND subclass_editbox(HWND hwndListview);
 
@@ -207,7 +214,7 @@ static const struct message ownerdata_deselect_all_parent_seq[] = {
     { 0 }
 };
 
-static const struct message select_all_parent_seq[] = {
+static const struct message change_all_parent_seq[] = {
     { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
     { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED },
 
@@ -225,6 +232,15 @@ static const struct message select_all_parent_seq[] = {
     { 0 }
 };
 
+static const struct message changing_all_parent_seq[] = {
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { 0 }
+};
+
 static const struct message textcallback_set_again_parent_seq[] = {
     { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
     { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED  },
@@ -247,6 +263,18 @@ static const struct message getitemposition_seq2[] = {
     { 0 }
 };
 
+static const struct message getsubitemrect_seq[] = {
+    { LVM_GETSUBITEMRECT, sent|id|wparam, -1, 0, LISTVIEW_ID },
+    { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID },
+    { LVM_GETSUBITEMRECT, sent|id|wparam, 0, 0, LISTVIEW_ID },
+    { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID },
+    { LVM_GETSUBITEMRECT, sent|id|wparam, -10, 0, LISTVIEW_ID },
+    { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID },
+    { LVM_GETSUBITEMRECT, sent|id|wparam, 20, 0, LISTVIEW_ID },
+    { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID },
+    { 0 }
+};
+
 static const struct message editbox_create_pos[] = {
     /* sequence sent after LVN_BEGINLABELEDIT */
     /* next two are 4.7x specific */
@@ -312,6 +340,41 @@ static const struct message listview_header_changed_seq[] = {
     { 0 }
 };
 
+static const struct message parent_header_click_seq[] = {
+    { WM_NOTIFY, sent|id, 0, 0, LVN_COLUMNCLICK },
+    { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCLICKA },
+    { 0 }
+};
+
+static const struct message parent_header_divider_dclick_seq[] = {
+    { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGINGA },
+    { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW },
+    { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW },
+    { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGEDA },
+    { WM_NOTIFY, sent|id, 0, 0, HDN_DIVIDERDBLCLICKA },
+    { 0 }
+};
+
+static const struct message listview_set_imagelist[] = {
+    { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID },
+    { 0 }
+};
+
+static const struct message listview_header_set_imagelist[] = {
+    { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID },
+    { HDM_SETIMAGELIST, sent|id, 0, 0, HEADER_ID },
+    { 0 }
+};
+
+static const struct message parent_insert_focused_seq[] = {
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED },
+    { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM },
+    { 0 }
+};
+
 static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     static LONG defwndproc_counter = 0;
@@ -390,6 +453,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
                                                "BEGIN" : "END", pScroll->dx, pScroll->dy);
               }
               break;
+          case LVN_ITEMCHANGING:
+              {
+                  NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam;
+                  g_nmlistview_changing = *nmlv;
+              }
+              break;
           case LVN_ITEMCHANGED:
               {
                   NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam;
@@ -416,6 +485,16 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
                       "buffer size %d\n", dispinfo->item.cchTextMax);
               }
               break;
+          case LVN_DELETEITEM:
+              if (g_focus_test_LVN_DELETEITEM)
+              {
+                  NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam;
+                  UINT state;
+
+                  state = SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETITEMSTATE, nmlv->iItem, LVIS_FOCUSED);
+                  ok(state == 0, "got state %x\n", state);
+              }
+              break;
           case NM_HOVER:
               if (g_block_hover) return 1;
               break;
@@ -626,6 +705,7 @@ static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wPar
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
 
     /* all we need is sizing */
     if (message == WM_WINDOWPOSCHANGING ||
@@ -1586,6 +1666,8 @@ static void test_create(void)
     rect.top  = 1;
     rect.right = rect.bottom = -10;
     r = SendMessage(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect);
+    /* right value contains garbage, probably because header columns are not set up */
+    expect(0, rect.bottom);
     expect(1, r);
 
     hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0);
@@ -1686,7 +1768,10 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
                 return CDRF_NOTIFYSUBITEMDRAW;
             case CDDS_ITEMPREPAINT | CDDS_SUBITEM:
                 clr = GetBkColor(nmlvcd->nmcd.hdc);
-                todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+                if (nmlvcd->iSubItem)
+                    todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+                else
+                    ok(clr == c0ffee, "clr=%.8x\n", clr);
                 return CDRF_NOTIFYPOSTPAINT;
             case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM:
                 clr = GetBkColor(nmlvcd->nmcd.hdc);
@@ -2092,28 +2177,32 @@ static void test_multiselect(void)
 
     hwnd = create_listview_control(LVS_REPORT);
 
-    for (i=0;i<items;i++) {
-	    insert_item(hwnd, 0);
-    }
+    for (i = 0; i < items; i++)
+        insert_item(hwnd, 0);
 
     item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0);
+    expect(items, item_count);
 
-    expect(items,item_count);
+    for (i = 0; i < 4; i++) {
+        LVITEMA item;
 
-    for (i=0;i<4;i++) {
         task = task_list[i];
 
 	/* deselect all items */
-	ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED);
+        item.state = 0;
+        item.stateMask = LVIS_SELECTED;
+        SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
 	SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1);
 
 	/* set initial position */
 	SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos));
-	ListView_SetItemState(hwnd,(task.initPos == -1 ? item_count -1 : task.initPos),LVIS_SELECTED ,LVIS_SELECTED);
 
-	selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
+        item.state = LVIS_SELECTED;
+        item.stateMask = LVIS_SELECTED;
+        SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item);
 
-	ok(selected_count == 1, "There should be only one selected item at the beginning (is %d)\n",selected_count);
+	selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
+	ok(selected_count == 1, "expected 1, got %d\n", selected_count);
 
 	/* Set SHIFT key pressed */
         GetKeyboardState(kstate);
@@ -2151,7 +2240,9 @@ static void test_multiselect(void)
     expect(FALSE, r);
 
     /* select all, check notifications */
-    ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED);
+    item.state = 0;
+    item.stateMask = LVIS_SELECTED;
+    SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
 
     flush_sequences(sequences, NUM_MSG_SEQUENCES);
 
@@ -2160,14 +2251,65 @@ static void test_multiselect(void)
     r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
     expect(TRUE, r);
 
-    ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq,
+    ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq,
                 "select all notification", FALSE);
 
+    /* select all again (all selected already) */
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing));
+
+    item.stateMask = LVIS_SELECTED;
+    item.state     = LVIS_SELECTED;
+    r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
+    expect(TRUE, r);
+
+    ok(g_nmlistview_changing.uNewState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uNewState);
+    ok(g_nmlistview_changing.uOldState == LVIS_SELECTED, "got 0x%x\n", g_nmlistview_changing.uOldState);
+    ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged);
+
+    ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq,
+                "select all notification 2", FALSE);
+
     /* deselect all items */
-    ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    item.state = 0;
+    item.stateMask = LVIS_SELECTED;
+    SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
+
+    ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq,
+                "deselect all notification", FALSE);
+
+    /* deselect all items again */
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    item.state = 0;
+    item.stateMask = LVIS_SELECTED;
+    SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "deselect all notification 2", FALSE);
+
+    /* any non-zero state value does the same */
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    memset(&g_nmlistview_changing, 0xcc, sizeof(g_nmlistview_changing));
+
+    item.stateMask = LVIS_SELECTED;
+    item.state     = LVIS_CUT;
+    r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
+    expect(TRUE, r);
+
+    ok(g_nmlistview_changing.uNewState == 0, "got 0x%x\n", g_nmlistview_changing.uNewState);
+    ok(g_nmlistview_changing.uOldState == 0, "got 0x%x\n", g_nmlistview_changing.uOldState);
+    ok(g_nmlistview_changing.uChanged == LVIF_STATE, "got 0x%x\n", g_nmlistview_changing.uChanged);
+
+    ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq,
+                "set state all notification 3", FALSE);
+
     SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1);
-    for (i=0;i<3;i++) {
-        ListView_SetItemState(hwnd, i, LVIS_SELECTED, LVIS_SELECTED);
+    for (i = 0; i < 3; i++) {
+        item.state = LVIS_SELECTED;
+        item.stateMask = LVIS_SELECTED;
+        SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item);
     }
 
     r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
@@ -2192,7 +2334,9 @@ static void test_multiselect(void)
     expect(3, r);
 
     /* select one more */
-    ListView_SetItemState(hwnd, 3, LVIS_SELECTED, LVIS_SELECTED);
+    item.state = LVIS_SELECTED;
+    item.stateMask = LVIS_SELECTED;
+    SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item);
 
     for (i=0;i<3;i++) {
         r = ListView_GetItemState(hwnd, i, LVIS_SELECTED);
@@ -2402,7 +2546,6 @@ static void test_subitem_rect(void)
 
     expect(100, rect.left);
     expect(250, rect.right);
-todo_wine
     expect(3, rect.top);
 
     rect.left = LVIR_BOUNDS;
@@ -2413,7 +2556,6 @@ todo_wine
 
     expect(250, rect.left);
     expect(450, rect.right);
-todo_wine
     expect(3, rect.top);
 
     /* item LVS_REPORT padding isn't applied to subitems */
@@ -2457,6 +2599,36 @@ todo_wine
 
     SendMessage(hwnd, LVM_SCROLL, -10, 0);
 
+    /* test header interaction */
+    subclass_header(hwnd);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    rect.left = LVIR_BOUNDS;
+    rect.top  = 1;
+    rect.right = rect.bottom = 0;
+    r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect);
+    expect(1, r);
+
+    rect.left = LVIR_BOUNDS;
+    rect.top  = 1;
+    rect.right = rect.bottom = 0;
+    r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect);
+    expect(1, r);
+
+    rect.left = LVIR_BOUNDS;
+    rect.top  = 1;
+    rect.right = rect.bottom = 0;
+    r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -10, (LPARAM)&rect);
+    expect(1, r);
+
+    rect.left = LVIR_BOUNDS;
+    rect.top  = 1;
+    rect.right = rect.bottom = 0;
+    r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 20, (LPARAM)&rect);
+    expect(1, r);
+
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getsubitemrect_seq, "LVM_GETSUBITEMRECT negative index", FALSE);
+
     DestroyWindow(hwnd);
 
     /* test subitem rects after re-arranging columns */
@@ -2498,13 +2670,11 @@ todo_wine
     rect2.top  = 1;
     rect2.right = rect2.bottom = -1;
     r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 2, (LPARAM)&rect2);
-todo_wine {
     expect(TRUE, r);
     expect(rect.right, rect2.right);
     expect(rect.left, rect2.left);
     expect(rect.bottom, rect2.top);
     ok(rect2.bottom > rect2.top, "expected not zero height\n");
-}
 
     arr[0] = 1; arr[1] = 0; arr[2] = 2;
     r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 3, (LPARAM)arr);
@@ -2956,7 +3126,7 @@ static void test_ownerdata(void)
     res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item);
     expect(TRUE, res);
 
-    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", TRUE);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "ownerdata deselect all notification", FALSE);
 
     /* select one, then deselect all */
     item.stateMask = LVIS_SELECTED;
@@ -4434,9 +4604,7 @@ static void test_getitemspacing(void)
     HWND hwnd;
     DWORD ret;
     INT cx, cy;
-    HIMAGELIST himl;
-    HBITMAP hbmp;
-    LVITEMA itema;
+    HIMAGELIST himl40, himl80;
 
     cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON);
     cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON);
@@ -4444,56 +4612,113 @@ static void test_getitemspacing(void)
     /* LVS_ICON */
     hwnd = create_listview_control(LVS_ICON);
     ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
-todo_wine {
     expect(cx, LOWORD(ret));
     expect(cy, HIWORD(ret));
-}
+
     /* now try with icons */
-    himl = ImageList_Create(40, 40, 0, 4, 4);
-    ok(himl != NULL, "failed to create imagelist\n");
-    hbmp = CreateBitmap(40, 40, 1, 1, NULL);
-    ok(hbmp != NULL, "failed to create bitmap\n");
-    ret = ImageList_Add(himl, hbmp, 0);
-    expect(0, ret);
-    ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl);
+    himl40 = ImageList_Create(40, 40, 0, 4, 4);
+    ok(himl40 != NULL, "failed to create imagelist\n");
+    himl80 = ImageList_Create(80, 80, 0, 4, 4);
+    ok(himl80 != NULL, "failed to create imagelist\n");
+    ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40);
     expect(0, ret);
 
-    itema.mask = LVIF_IMAGE;
-    itema.iImage = 0;
-    itema.iItem = 0;
-    itema.iSubItem = 0;
-    ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema);
-    expect(0, ret);
     ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
-todo_wine {
     /* spacing + icon size returned */
     expect(cx + 40, LOWORD(ret));
     expect(cy + 40, HIWORD(ret));
-}
+    /* try changing icon size */
+    SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl80);
+
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    /* spacing + icon size returned */
+    expect(cx + 80, LOWORD(ret));
+    expect(cy + 80, HIWORD(ret));
+
+    /* set own icon spacing */
+    ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(100, 100));
+    expect(cx + 80, LOWORD(ret));
+    expect(cy + 80, HIWORD(ret));
+
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    /* set size returned */
+    expect(100, LOWORD(ret));
+    expect(100, HIWORD(ret));
+
+    /* now change image list - icon spacing should be unaffected */
+    SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40);
+
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    /* set size returned */
+    expect(100, LOWORD(ret));
+    expect(100, HIWORD(ret));
+
+    /* spacing = 0 - keep previous value */
+    ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1));
+    expect(100, LOWORD(ret));
+    expect(100, HIWORD(ret));
+
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    expect(100, LOWORD(ret));
+
+    expect(0xFFFF, HIWORD(ret));
+
+    if (sizeof(void*) == 8)
+    {
+        /* NOTE: -1 is not treated the same as (DWORD)-1 by 64bit listview */
+        ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, (DWORD)-1);
+        expect(100, LOWORD(ret));
+        expect(0xFFFF, HIWORD(ret));
+
+        ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1);
+        expect(0xFFFF, LOWORD(ret));
+        expect(0xFFFF, HIWORD(ret));
+    }
+    else
+    {
+        ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1);
+        expect(100, LOWORD(ret));
+        expect(0xFFFF, HIWORD(ret));
+    }
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    /* spacing + icon size returned */
+    expect(cx + 40, LOWORD(ret));
+    expect(cy + 40, HIWORD(ret));
+
+    SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0);
+    ImageList_Destroy(himl80);
     DestroyWindow(hwnd);
     /* LVS_SMALLICON */
     hwnd = create_listview_control(LVS_SMALLICON);
     ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
-todo_wine {
     expect(cx, LOWORD(ret));
     expect(cy, HIWORD(ret));
-}
+
+    /* spacing does not depend on selected view type */
+    ret = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40);
+    expect(0, ret);
+
+    ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
+    /* spacing + icon size returned */
+    expect(cx + 40, LOWORD(ret));
+    expect(cy + 40, HIWORD(ret));
+
+    SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0);
+    ImageList_Destroy(himl40);
     DestroyWindow(hwnd);
     /* LVS_REPORT */
     hwnd = create_listview_control(LVS_REPORT);
     ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
-todo_wine {
     expect(cx, LOWORD(ret));
     expect(cy, HIWORD(ret));
-}
+
     DestroyWindow(hwnd);
     /* LVS_LIST */
     hwnd = create_listview_control(LVS_LIST);
     ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0);
-todo_wine {
     expect(cx, LOWORD(ret));
     expect(cy, HIWORD(ret));
-}
+
     DestroyWindow(hwnd);
 }
 
@@ -4910,6 +5135,146 @@ static void test_header_notification(void)
     DestroyWindow(list);
 }
 
+static void test_header_notification2(void)
+{
+    static char textA[] = "newtext";
+    HWND list, header;
+    HDITEMW itemW;
+    NMHEADERW nmhdr;
+    LVCOLUMNA col;
+    DWORD ret;
+    WCHAR buffer[100];
+    struct message parent_header_notify_seq[] = {
+        { WM_NOTIFY, sent|id, 0, 0, 0 },
+        { 0 }
+    };
+
+    list = create_listview_control(LVS_REPORT);
+    ok(list != NULL, "failed to create listview window\n");
+
+    memset(&col, 0, sizeof(col));
+    col.mask = LVCF_WIDTH | LVCF_TEXT;
+    col.cx = 100;
+    col.pszText = textA;
+    ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col);
+    expect(0, ret);
+
+    header = ListView_GetHeader(list);
+    ok(header != 0, "No header\n");
+    memset(&itemW, 0, sizeof(itemW));
+    itemW.mask = HDI_WIDTH | HDI_ORDER | HDI_TEXT;
+    itemW.pszText = buffer;
+    itemW.cchTextMax = sizeof(buffer);
+    ret = SendMessageW(header, HDM_GETITEMW, 0, (LPARAM)&itemW);
+    expect(1, ret);
+
+    nmhdr.hdr.hwndFrom = header;
+    nmhdr.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID);
+    nmhdr.iItem = 0;
+    nmhdr.iButton = 0;
+    nmhdr.pitem = &itemW;
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMCHANGINGW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_ITEMCHANGINGA;
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", TRUE);
+    todo_wine
+    ok(nmhdr.hdr.code == HDN_ITEMCHANGINGA, "Expected ANSI notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMCHANGEDW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_ITEMCHANGEDA;
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", TRUE);
+    todo_wine
+    ok(nmhdr.hdr.code == HDN_ITEMCHANGEDA, "Expected ANSI notification code\n");
+    /* HDN_ITEMCLICK sets focus to list, which generates messages we don't want to check */
+    SetFocus(list);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMCLICKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_click_seq,
+                "header notify, parent", FALSE);
+    ok(nmhdr.hdr.code == HDN_ITEMCLICKA, "Expected ANSI notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMDBLCLICKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    ok(nmhdr.hdr.code == HDN_ITEMDBLCLICKW, "Expected Unicode notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_DIVIDERDBLCLICKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_divider_dclick_seq,
+                "header notify, parent", TRUE);
+    ok(nmhdr.hdr.code == HDN_DIVIDERDBLCLICKA, "Expected ANSI notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_BEGINTRACKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    ok(nmhdr.hdr.code == HDN_BEGINTRACKW, "Expected Unicode notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ENDTRACKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_ENDTRACKA;
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", FALSE);
+    ok(nmhdr.hdr.code == HDN_ENDTRACKA, "Expected ANSI notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_TRACKW;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_TRACKA;
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", FALSE);
+    ok(nmhdr.hdr.code == HDN_TRACKA, "Expected ANSI notification code\n");
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_BEGINDRAG;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ENDDRAG;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_ENDDRAG;
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", FALSE);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_FILTERCHANGE;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    parent_header_notify_seq[0].id = HDN_FILTERCHANGE;
+    parent_header_notify_seq[0].flags |= optional; /* NT4 does not send this message */
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq,
+                "header notify, parent", FALSE);
+    parent_header_notify_seq[0].flags &= ~optional;
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_BEGINFILTEREDIT;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ENDFILTEREDIT;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMSTATEICONCLICK;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    nmhdr.hdr.code = HDN_ITEMKEYDOWN;
+    ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq,
+                "header notify, parent", FALSE);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    DestroyWindow(list);
+}
+
 static void test_createdragimage(void)
 {
     HIMAGELIST himl;
@@ -4999,6 +5364,198 @@ static void test_LVM_SETITEMTEXT(void)
     DestroyWindow(hwnd);
 }
 
+static void test_imagelists(void)
+{
+    HWND hwnd, header;
+    HIMAGELIST himl1, himl2, himl3;
+    LRESULT ret;
+
+    himl1 = ImageList_Create(40, 40, 0, 4, 4);
+    himl2 = ImageList_Create(40, 40, 0, 4, 4);
+    himl3 = ImageList_Create(40, 40, 0, 4, 4);
+    ok(himl1 != NULL, "Failed to create imagelist\n");
+    ok(himl2 != NULL, "Failed to create imagelist\n");
+    ok(himl3 != NULL, "Failed to create imagelist\n");
+
+    hwnd = create_listview_control(LVS_REPORT | LVS_SHAREIMAGELISTS);
+    header = subclass_header(hwnd);
+
+    ok(header != NULL, "Expected header\n");
+    ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist,
+                "set normal image list", FALSE);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist,
+                "set state image list", TRUE);
+
+    ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_header_set_imagelist,
+                "set small image list", FALSE);
+
+    ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0);
+    ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret);
+    DestroyWindow(hwnd);
+
+    hwnd = create_listview_control(WS_VISIBLE | LVS_ICON);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist,
+                "set normal image list", FALSE);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist,
+                "set state image list", FALSE);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3);
+    ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret);
+    ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist,
+                "set small image list", FALSE);
+
+    header = ListView_GetHeader(hwnd);
+    ok(header == NULL, "Expected no header, got %p\n", header);
+
+    SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | LVS_REPORT);
+
+    header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0);
+    ok(header != NULL, "Expected header, got NULL\n");
+
+    ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0);
+    ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret);
+
+    DestroyWindow(hwnd);
+}
+
+static void test_deleteitem(void)
+{
+    LVITEMA item;
+    UINT state;
+    HWND hwnd;
+    BOOL ret;
+
+    hwnd = create_listview_control(LVS_REPORT);
+
+    insert_item(hwnd, 0);
+    insert_item(hwnd, 0);
+    insert_item(hwnd, 0);
+    insert_item(hwnd, 0);
+    insert_item(hwnd, 0);
+
+    g_focus_test_LVN_DELETEITEM = TRUE;
+
+    /* delete focused item (not the last index) */
+    item.stateMask = LVIS_FOCUSED;
+    item.state = LVIS_FOCUSED;
+    ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 2, (LPARAM)&item);
+    ok(ret == TRUE, "got %d\n", ret);
+    ret = SendMessageA(hwnd, LVM_DELETEITEM, 2, 0);
+    ok(ret == TRUE, "got %d\n", ret);
+    /* next item gets focus */
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 2, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    /* focus last item and delete it */
+    item.stateMask = LVIS_FOCUSED;
+    item.state = LVIS_FOCUSED;
+    ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item);
+    ok(ret == TRUE, "got %d\n", ret);
+    ret = SendMessageA(hwnd, LVM_DELETEITEM, 3, 0);
+    ok(ret == TRUE, "got %d\n", ret);
+    /* new last item gets focus */
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 2, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    /* focus first item and delete it */
+    item.stateMask = LVIS_FOCUSED;
+    item.state = LVIS_FOCUSED;
+    ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item);
+    ok(ret == TRUE, "got %d\n", ret);
+    ret = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0);
+    ok(ret == TRUE, "got %d\n", ret);
+    /* new first item gets focus */
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    g_focus_test_LVN_DELETEITEM = FALSE;
+
+    DestroyWindow(hwnd);
+}
+
+static void test_insertitem(void)
+{
+    LVITEMA item;
+    UINT state;
+    HWND hwnd;
+    INT ret;
+
+    hwnd = create_listview_control(LVS_REPORT);
+
+    /* insert item 0 focused */
+    item.mask = LVIF_STATE;
+    item.state = LVIS_FOCUSED;
+    item.stateMask = LVIS_FOCUSED;
+    item.iItem = 0;
+    item.iSubItem = 0;
+    ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item);
+    ok(ret == 0, "got %d\n", ret);
+
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    /* insert item 1, focus shift */
+    item.mask = LVIF_STATE;
+    item.state = LVIS_FOCUSED;
+    item.stateMask = LVIS_FOCUSED;
+    item.iItem = 1;
+    item.iSubItem = 0;
+    ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item);
+    ok(ret == 1, "got %d\n", ret);
+
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE);
+
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    /* insert item 2, no focus shift */
+    item.mask = LVIF_STATE;
+    item.state = 0;
+    item.stateMask = LVIS_FOCUSED;
+    item.iItem = 2;
+    item.iSubItem = 0;
+    ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item);
+    ok(ret == 2, "got %d\n", ret);
+
+    state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED);
+    ok(state == LVIS_FOCUSED, "got %x\n", state);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(listview)
 {
     HMODULE hComctl32;
@@ -5028,6 +5585,7 @@ START_TEST(listview)
     g_is_below_5 = is_below_comctl_5();
 
     test_header_notification();
+    test_header_notification2();
     test_images();
     test_checkboxes();
     test_items();
@@ -5064,6 +5622,9 @@ START_TEST(listview)
     test_createdragimage();
     test_dispinfo();
     test_LVM_SETITEMTEXT();
+    test_imagelists();
+    test_deleteitem();
+    test_insertitem();
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
     {
@@ -5093,6 +5654,9 @@ START_TEST(listview)
     test_scrollnotify();
     test_LVS_EX_TRANSPARENTBKGND();
     test_LVS_EX_HEADERINALLVIEWS();
+    test_deleteitem();
+    test_multiselect();
+    test_insertitem();
 
     unload_v6_module(ctx_cookie, hCtx);
 
diff --git a/rostests/winetests/comctl32/misc.c b/rostests/winetests/comctl32/misc.c
index 5aff06f95ea..72dcc662725 100644
--- a/rostests/winetests/comctl32/misc.c
+++ b/rostests/winetests/comctl32/misc.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdio.h>
-#include <windows.h>
+//#include <stdio.h>
+//#include <windows.h>
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 static PVOID (WINAPI * pAlloc)(LONG);
 static PVOID (WINAPI * pReAlloc)(PVOID, LONG);
diff --git a/rostests/winetests/comctl32/monthcal.c b/rostests/winetests/comctl32/monthcal.c
index 1fed8319b4d..1d8ccfa8c78 100644
--- a/rostests/winetests/comctl32/monthcal.c
+++ b/rostests/winetests/comctl32/monthcal.c
@@ -19,18 +19,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include <wine/test.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
+//#include <stdarg.h>
 
-#include "commctrl.h"
+//#include "windef.h"
+//#include "winbase.h"
+#include <winuser.h>
+#include <wingdi.h>
+#include <winnls.h>
+#include <commctrl.h>
 
-#include "wine/test.h"
 #include "v6util.h"
-#include <assert.h>
-#include <windows.h>
+//#include <assert.h>
+//#include <windows.h>
 #include "msg.h"
 
 #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got);
@@ -588,6 +590,7 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, MONTHCAL_SEQ_INDEX, &msg);
 
     /* some debug output for style changing */
@@ -1367,10 +1370,8 @@ static void test_monthrange(void)
 
     hwnd = create_monthcal_control(0);
 
-    st_visible[0].wYear = 0;
-    st_visible[0].wMonth = 0;
-    st_visible[0].wDay = 0;
-    st_daystate[1] = st_daystate[0] = st_visible[1] = st_visible[0];
+    memset(&st_visible, 0, sizeof(st_visible));
+    memset(&st_daystate, 0, sizeof(st_daystate));
 
     st.wYear = 2000;
     st.wMonth = 11;
diff --git a/rostests/winetests/comctl32/mru.c b/rostests/winetests/comctl32/mru.c
index 1d8ad9a867e..075281c9fb7 100644
--- a/rostests/winetests/comctl32/mru.c
+++ b/rostests/winetests/comctl32/mru.c
@@ -19,16 +19,16 @@
  */
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "commctrl.h"
-#include "shlwapi.h"
+#include <windef.h>
+#include <winbase.h>
+//#include "wingdi.h"
+#include <winuser.h>
+//#include "winnls.h"
+#include <winreg.h>
+#include <commctrl.h>
+//#include "shlwapi.h"
 
-#include "wine/test.h"
+#include <wine/test.h>
 
 /* Keys for testing MRU functions */
 #define REG_TEST_BASEKEYA    "Software\\Wine"
diff --git a/rostests/winetests/comctl32/msg.h b/rostests/winetests/comctl32/msg.h
index 1d78ffea94e..fd6fb99c57f 100644
--- a/rostests/winetests/comctl32/msg.h
+++ b/rostests/winetests/comctl32/msg.h
@@ -19,8 +19,8 @@
  */
 
 #include <assert.h>
-#include <windows.h>
-#include "wine/test.h"
+//#include <windows.h>
+#include <wine/test.h>
 
 /* undocumented SWP flags - from SDK 3.1 */
 #define SWP_NOCLIENTSIZE	0x0800
diff --git a/rostests/winetests/comctl32/pager.c b/rostests/winetests/comctl32/pager.c
index 8ac062da2a6..21f619baa96 100644
--- a/rostests/winetests/comctl32/pager.c
+++ b/rostests/winetests/comctl32/pager.c
@@ -18,10 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
 #include "msg.h"
 
 #define NUM_MSG_SEQUENCES   1
diff --git a/rostests/winetests/comctl32/propsheet.c b/rostests/winetests/comctl32/propsheet.c
index 992b60fb34e..35373adcd30 100644
--- a/rostests/winetests/comctl32/propsheet.c
+++ b/rostests/winetests/comctl32/propsheet.c
@@ -18,14 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include "msg.h"
 
 #include "resources.h"
 
-#include "wine/test.h"
-
 static HWND parenthwnd;
 static HWND sheethwnd;
 
@@ -821,7 +823,7 @@ if (0)
     ok(r == 4, "got %d\n", r);
 
     /* select page that can't be created */
-    ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0);
+    ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 1);
     ok(ret == TRUE, "got %d\n", ret);
 
     r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0);
diff --git a/rostests/winetests/comctl32/rebar.c b/rostests/winetests/comctl32/rebar.c
index 88c931c633a..a608603c511 100644
--- a/rostests/winetests/comctl32/rebar.c
+++ b/rostests/winetests/comctl32/rebar.c
@@ -21,14 +21,16 @@
 #define _WIN32_WINNT 0x500
 #define _WIN32_IE 0x500
 
+#include <wine/test.h>
+
 #include <assert.h>
-#include <stdarg.h>
+//#include <stdarg.h>
 
-#include <windows.h>
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
-#include <uxtheme.h>
-
-#include "wine/test.h"
+//#include <uxtheme.h>
 
 static RECT height_change_notify_rect;
 static HWND hMainWnd;
diff --git a/rostests/winetests/comctl32/rsrc.rc b/rostests/winetests/comctl32/rsrc.rc
index 4f7a2253f17..5c131ef943e 100644
--- a/rostests/winetests/comctl32/rsrc.rc
+++ b/rostests/winetests/comctl32/rsrc.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windef.h"
+//#include "windef.h"
 #include "winuser.h"
 #include "resources.h"
 
diff --git a/rostests/winetests/comctl32/status.c b/rostests/winetests/comctl32/status.c
index d8b3dbe0d26..69c3d9623e1 100644
--- a/rostests/winetests/comctl32/status.c
+++ b/rostests/winetests/comctl32/status.c
@@ -18,11 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-#include <windows.h>
-#include <commctrl.h>
+#include <wine/test.h>
 
-#include "wine/test.h"
+#include <assert.h>
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <commctrl.h>
 
 #define SUBCLASS_NAME "MyStatusBar"
 
@@ -492,7 +494,7 @@ static void test_gettext(void)
     expect(4, r);
     /* A size of 0 returns the length of the text */
     r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0);
-    expect(4, r);
+    ok( r == 4 || broken(r == 2) /* win8 */, "Expected 4 got %d\n", r );
     /* A size of 1 only stores the NULL terminator */
     buf[0] = 0xa;
     r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf);
diff --git a/rostests/winetests/comctl32/syslink.c b/rostests/winetests/comctl32/syslink.c
index ea92d428b71..039577f2048 100644
--- a/rostests/winetests/comctl32/syslink.c
+++ b/rostests/winetests/comctl32/syslink.c
@@ -17,10 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 
-#include "wine/test.h"
 #include "v6util.h"
 #include "msg.h"
 
@@ -155,6 +158,7 @@ static LRESULT WINAPI syslink_subclass_proc(HWND hwnd, UINT message, WPARAM wPar
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, SYSLINK_SEQ_INDEX, &msg);
 
     defwndproc_counter++;
diff --git a/rostests/winetests/comctl32/tab.c b/rostests/winetests/comctl32/tab.c
index 51a8a912902..adebcfdea46 100644
--- a/rostests/winetests/comctl32/tab.c
+++ b/rostests/winetests/comctl32/tab.c
@@ -18,12 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <wine/test.h>
+
 #include <assert.h>
-#include <windows.h>
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include <stdio.h>
 
-#include "wine/test.h"
 #include "msg.h"
 
 #define DEFAULT_MIN_TAB_WIDTH 54
@@ -352,6 +355,7 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam
         if (defwndproc_counter) msg.flags |= defwinproc;
         msg.wParam = wParam;
         msg.lParam = lParam;
+        msg.id = 0;
         add_message(sequences, PARENT_SEQ_INDEX, &msg);
     }
 
@@ -419,6 +423,7 @@ static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam,
         if (defwndproc_counter) msg.flags |= defwinproc;
         msg.wParam = wParam;
         msg.lParam = lParam;
+        msg.id = 0;
         add_message(sequences, TAB_SEQ_INDEX, &msg);
     }
 
diff --git a/rostests/winetests/comctl32/testlist.c b/rostests/winetests/comctl32/testlist.c
index d90fbadb06c..d3990f77768 100644
--- a/rostests/winetests/comctl32/testlist.c
+++ b/rostests/winetests/comctl32/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_comboex(void);
 extern void func_datetime(void);
diff --git a/rostests/winetests/comctl32/tooltips.c b/rostests/winetests/comctl32/tooltips.c
index 71c66a5517b..e17de9a2297 100644
--- a/rostests/winetests/comctl32/tooltips.c
+++ b/rostests/winetests/comctl32/tooltips.c
@@ -17,11 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-#include <windows.h>
-#include <commctrl.h>
+#include <wine/test.h>
 
-#include "wine/test.h"
+#include <assert.h>
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winnls.h>
+#include <commctrl.h>
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
 
diff --git a/rostests/winetests/comctl32/trackbar.c b/rostests/winetests/comctl32/trackbar.c
index 7a0e398c107..aa0d65fb4ec 100644
--- a/rostests/winetests/comctl32/trackbar.c
+++ b/rostests/winetests/comctl32/trackbar.c
@@ -17,11 +17,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include <stdio.h>
 
-#include "wine/test.h"
 #include "msg.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
@@ -442,6 +445,7 @@ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wPa
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, TRACKBAR_SEQ_INDEX, &msg);
 
     defwndproc_counter++;
diff --git a/rostests/winetests/comctl32/treeview.c b/rostests/winetests/comctl32/treeview.c
index 2fe468be4a9..3c437de8d79 100644
--- a/rostests/winetests/comctl32/treeview.c
+++ b/rostests/winetests/comctl32/treeview.c
@@ -292,6 +292,7 @@ static LRESULT WINAPI TreeviewWndProc(HWND hwnd, UINT message, WPARAM wParam, LP
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
+    msg.id = 0;
     add_message(sequences, TREEVIEW_SEQ_INDEX, &msg);
 
     defwndproc_counter++;
@@ -1001,7 +1002,10 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam,
     if (defwndproc_counter) msg.flags |= defwinproc;
     msg.wParam = wParam;
     msg.lParam = lParam;
-    if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code;
+    if (message == WM_NOTIFY && lParam)
+        msg.id = ((NMHDR*)lParam)->code;
+    else
+        msg.id = 0;
 
     /* log system messages, except for painting */
     if (message < WM_USER &&
@@ -1946,6 +1950,19 @@ static void test_TVM_HITTEST(void)
     DestroyWindow(hTree);
 }
 
+static void test_WM_GETDLGCODE(void)
+{
+    DWORD code;
+    HWND hTree;
+
+    hTree = create_treeview_control(0);
+
+    code = SendMessageA(hTree, WM_GETDLGCODE, VK_TAB, 0);
+    ok(code == (DLGC_WANTCHARS | DLGC_WANTARROWS), "0x%08x\n", code);
+
+    DestroyWindow(hTree);
+}
+
 START_TEST(treeview)
 {
     HMODULE hComctl32;
@@ -2019,6 +2036,7 @@ START_TEST(treeview)
     test_TVS_CHECKBOXES();
     test_TVM_GETNEXTITEM();
     test_TVM_HITTEST();
+    test_WM_GETDLGCODE();
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
     {
@@ -2044,6 +2062,7 @@ START_TEST(treeview)
     /* comctl32 version 6 tests start here */
     test_expandedimage();
     test_htreeitem_layout();
+    test_WM_GETDLGCODE();
 
     unload_v6_module(ctx_cookie, hCtx);
 
diff --git a/rostests/winetests/comctl32/updown.c b/rostests/winetests/comctl32/updown.c
index e2a640f8d56..bacc1126dc3 100644
--- a/rostests/winetests/comctl32/updown.c
+++ b/rostests/winetests/comctl32/updown.c
@@ -44,11 +44,14 @@
  *   - more stuff to test
  */
 
-#include <windows.h>
+#include <wine/test.h>
+
+//#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include <commctrl.h>
 #include <stdio.h>
 
-#include "wine/test.h"
 #include "msg.h"
 
 #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT))
@@ -186,6 +189,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
         if (defwndproc_counter) msg.flags |= defwinproc;
         msg.wParam = wParam;
         msg.lParam = lParam;
+        msg.id = 0;
         add_message(sequences, PARENT_SEQ_INDEX, &msg);
     }
 

From c1ae544f63c589dbb9ec3daef8c8bcdbcc09730e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 19:49:08 +0000
Subject: [PATCH 57/61] Remove the unneeded $Id$ blabla from the source code,
 but not in 3rd party code. (Part 4/N)

svn path=/trunk/; revision=58523
---
 reactos/drivers/base/beep/beep.rc             |  1 -
 reactos/drivers/base/bootvid/bootvid.rc       |  1 -
 reactos/drivers/base/kdcom/kdcom.rc           |  6 ---
 reactos/drivers/base/null/null.rc             |  1 -
 reactos/drivers/bus/acpi/acpi.rc              |  1 -
 reactos/drivers/bus/acpi/acpienum.c           |  3 +-
 reactos/drivers/bus/isapnp/isapnp.rc          |  1 -
 reactos/drivers/bus/pci/pci.rc                |  1 -
 reactos/drivers/bus/pci/pcidef.h              |  2 -
 reactos/drivers/filesystems/cdfs/cdfs.c       | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/cdfs.rc      |  1 -
 reactos/drivers/filesystems/cdfs/cleanup.c    | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/close.c      | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/common.c     | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/create.c     | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/dirctl.c     | 53 +++++++++----------
 reactos/drivers/filesystems/cdfs/fcb.c        | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/finfo.c      | 53 +++++++++----------
 reactos/drivers/filesystems/cdfs/misc.c       | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/rw.c         | 51 +++++++++---------
 reactos/drivers/filesystems/cdfs/volinfo.c    | 51 +++++++++---------
 reactos/drivers/filesystems/ext2/ext2fs.rc    |  1 -
 reactos/drivers/filesystems/msfs/msfs.rc      |  1 -
 reactos/drivers/filesystems/mup/create.c      |  3 +-
 reactos/drivers/filesystems/mup/mup.c         |  3 +-
 reactos/drivers/filesystems/mup/mup.rc        |  1 -
 reactos/drivers/input/kbdclass/kbdclass.rc    |  1 -
 reactos/drivers/input/mouclass/mouclass.rc    |  1 -
 reactos/drivers/input/sermouse/sermouse.rc    |  1 -
 .../multimedia/audio/mpu401_nt4/mpu401.rc     |  1 -
 .../multimedia/audio/sndblst.old/sndblst.rc   |  1 -
 .../multimedia/audio/sndblst_sys/sndblst.rc   |  1 -
 reactos/drivers/multimedia/audio/sound/sb16.c |  3 +-
 .../drivers/multimedia/audio/sound/sb16.rc    |  1 -
 reactos/drivers/network/afd/afd.rc            |  1 -
 reactos/drivers/network/afd/afd/bind.c        |  2 +-
 reactos/drivers/network/afd/afd/connect.c     |  2 +-
 reactos/drivers/network/afd/afd/context.c     |  2 +-
 reactos/drivers/network/afd/afd/info.c        |  2 +-
 reactos/drivers/network/afd/afd/listen.c      |  2 +-
 reactos/drivers/network/afd/afd/lock.c        |  2 +-
 reactos/drivers/network/afd/afd/main.c        |  2 +-
 reactos/drivers/network/afd/afd/read.c        |  2 +-
 reactos/drivers/network/afd/afd/tdiconn.c     |  2 +-
 reactos/drivers/network/afd/include/afd.h     |  3 +-
 reactos/drivers/network/dd/ne2000/ne2000.rc   |  1 -
 reactos/drivers/network/dd/pcnet/pcnet.rc     |  1 -
 reactos/drivers/network/lan/lan.rc            |  1 -
 reactos/drivers/network/ndis/ndis.rc          |  1 -
 reactos/drivers/network/tdi/cte/string.c      |  4 +-
 reactos/drivers/network/tdi/misc/tdi.rc       |  1 -
 reactos/drivers/network/tdi/tdi/handler.c     |  3 +-
 reactos/drivers/network/tdi/tdi/obsolete.c    |  3 --
 reactos/drivers/network/tdi/tdi/stubs.c       |  3 --
 reactos/drivers/parallel/parallel/parallel.c  |  3 +-
 reactos/drivers/parallel/parallel/parallel.rc |  1 -
 reactos/drivers/serial/serenum/serenum.rc     |  1 -
 reactos/drivers/serial/serial/serial.rc       |  1 -
 reactos/drivers/setup/blue/blue.rc            |  1 -
 reactos/drivers/storage/class/cdrom/cdrom.rc  |  1 -
 .../drivers/storage/class/class2/class2.rc    |  1 -
 reactos/drivers/storage/class/disk/disk.rc    |  1 -
 .../drivers/storage/class/include/class2.h    |  3 +-
 reactos/drivers/storage/floppy/floppy.rc      |  3 +-
 reactos/drivers/storage/ide/atapi/atapi.rc    |  1 -
 reactos/drivers/wmi/wmilib.rc                 |  1 -
 reactos/include/psdk/ddkernel.h               |  3 +-
 reactos/include/psdk/dmemmgr.h                |  4 +-
 reactos/include/psdk/dvp.h                    |  4 +-
 reactos/include/psdk/objerror.h               |  5 +-
 reactos/include/psdk/polarity.h               |  3 +-
 reactos/include/reactos/libs/epsapi/epsapi.h  |  2 -
 .../include/reactos/libs/syssetup/syssetup.h  |  2 -
 reactos/include/reactos/subsys/lsass/lsass.h  |  3 +-
 reactos/include/reactos/subsys/sm/helper.h    |  2 -
 reactos/include/reactos/subsys/sm/ns.h        |  2 -
 reactos/include/reactos/winlogon.h            |  3 +-
 77 files changed, 303 insertions(+), 390 deletions(-)

diff --git a/reactos/drivers/base/beep/beep.rc b/reactos/drivers/base/beep/beep.rc
index 87eb7a1e70c..4d9ae9903c8 100644
--- a/reactos/drivers/base/beep/beep.rc
+++ b/reactos/drivers/base/beep/beep.rc
@@ -1,4 +1,3 @@
-/* $Id: beep.rc 21705 2006-04-22 13:58:53Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PC Speaker Device Driver\0"
diff --git a/reactos/drivers/base/bootvid/bootvid.rc b/reactos/drivers/base/bootvid/bootvid.rc
index 5bbf194de06..94fc8f0bd01 100644
--- a/reactos/drivers/base/bootvid/bootvid.rc
+++ b/reactos/drivers/base/bootvid/bootvid.rc
@@ -1,4 +1,3 @@
-/* $Id: bootvid.rc 31840 2008-01-17 14:50:36Z cfinck $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"VGA Boot Driver\0"
diff --git a/reactos/drivers/base/kdcom/kdcom.rc b/reactos/drivers/base/kdcom/kdcom.rc
index c33d67fb32d..48cc0b847cb 100644
--- a/reactos/drivers/base/kdcom/kdcom.rc
+++ b/reactos/drivers/base/kdcom/kdcom.rc
@@ -1,12 +1,6 @@
-/* $Id: bootvid.rc 24464 2006-10-09 04:00:34Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS KDBG COM Library\0"
 #define REACTOS_STR_INTERNAL_NAME	"kdcom\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"kdcom.sys\0"
 #include <reactos/version.rc>
-
-IDB_BOOTIMAGE   BITMAP  DISCARDABLE   "bootimage.bmp"
-IDB_BAR         BITMAP  DISCARDABLE   "bar.bmp"
-
-
diff --git a/reactos/drivers/base/null/null.rc b/reactos/drivers/base/null/null.rc
index d52736c090e..fe0e7bf4453 100644
--- a/reactos/drivers/base/null/null.rc
+++ b/reactos/drivers/base/null/null.rc
@@ -1,4 +1,3 @@
-/* $Id: null.rc 21842 2006-05-07 19:16:11Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Null Device Driver\0"
diff --git a/reactos/drivers/bus/acpi/acpi.rc b/reactos/drivers/bus/acpi/acpi.rc
index 7a466943475..82a090ca49a 100644
--- a/reactos/drivers/bus/acpi/acpi.rc
+++ b/reactos/drivers/bus/acpi/acpi.rc
@@ -1,4 +1,3 @@
-/* $Id: acpi.rc 21698 2006-04-22 05:55:17Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS ACPI Driver\0"
diff --git a/reactos/drivers/bus/acpi/acpienum.c b/reactos/drivers/bus/acpi/acpienum.c
index 5e94468c664..4abb3dacfe6 100644
--- a/reactos/drivers/bus/acpi/acpienum.c
+++ b/reactos/drivers/bus/acpi/acpienum.c
@@ -1,5 +1,4 @@
-/* $Id: acpienum.c 21698 2006-04-22 05:55:17Z tretiakov $
- *
+/*
  * PROJECT:         ReactOS ACPI bus driver
  * FILE:            acpi/ospm/acpienum.c
  * PURPOSE:         ACPI namespace enumerator
diff --git a/reactos/drivers/bus/isapnp/isapnp.rc b/reactos/drivers/bus/isapnp/isapnp.rc
index b39405558c7..7e49fdbe730 100644
--- a/reactos/drivers/bus/isapnp/isapnp.rc
+++ b/reactos/drivers/bus/isapnp/isapnp.rc
@@ -1,4 +1,3 @@
-/* $Id: isapnp.rc 27431 2007-07-06 20:18:43Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ISA Plug And Play Bus Driver\0"
diff --git a/reactos/drivers/bus/pci/pci.rc b/reactos/drivers/bus/pci/pci.rc
index 765dbe5b202..0cb65559652 100644
--- a/reactos/drivers/bus/pci/pci.rc
+++ b/reactos/drivers/bus/pci/pci.rc
@@ -1,4 +1,3 @@
-/* $Id: pci.rc 27432 2007-07-06 20:24:15Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PCI Bus Driver\0"
diff --git a/reactos/drivers/bus/pci/pcidef.h b/reactos/drivers/bus/pci/pcidef.h
index 2540544d10f..73f4caf3eb3 100644
--- a/reactos/drivers/bus/pci/pcidef.h
+++ b/reactos/drivers/bus/pci/pcidef.h
@@ -1,6 +1,4 @@
 /*
- *	$Id: pcidef.h 45685 2010-02-26 11:43:19Z gedmurphy $
- *
  *	PCI defines and function prototypes
  *	Copyright 1994, Drew Eckhardt
  *	Copyright 1997--1999 Martin Mares <mj@suse.cz>
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.c b/reactos/drivers/filesystems/cdfs/cdfs.c
index ea561b20a5f..5be1d5c957a 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.c
+++ b/reactos/drivers/filesystems/cdfs/cdfs.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2003 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: cdfs.c 48654 2010-08-30 11:51:17Z mjmartin $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             drivers/fs/cdfs/cdfs.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2003 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             drivers/fs/cdfs/cdfs.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.rc b/reactos/drivers/filesystems/cdfs/cdfs.rc
index 1cf70c60840..d5d0e6270a9 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.rc
+++ b/reactos/drivers/filesystems/cdfs/cdfs.rc
@@ -1,4 +1,3 @@
-/* $Id: cdfs.rc 21710 2006-04-22 16:36:21Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ISO9660 Driver\0"
diff --git a/reactos/drivers/filesystems/cdfs/cleanup.c b/reactos/drivers/filesystems/cdfs/cleanup.c
index 1b048eecc03..af894fbc89b 100644
--- a/reactos/drivers/filesystems/cdfs/cleanup.c
+++ b/reactos/drivers/filesystems/cdfs/cleanup.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: cleanup.c 43790 2009-10-27 10:34:16Z dgorbachev $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/cleanup.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/cleanup.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/close.c b/reactos/drivers/filesystems/cdfs/close.c
index e2d8406a03f..b5f3510ba97 100644
--- a/reactos/drivers/filesystems/cdfs/close.c
+++ b/reactos/drivers/filesystems/cdfs/close.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: close.c 43790 2009-10-27 10:34:16Z dgorbachev $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/close.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/close.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/common.c b/reactos/drivers/filesystems/cdfs/common.c
index 87b8e489a09..2dc126e2308 100644
--- a/reactos/drivers/filesystems/cdfs/common.c
+++ b/reactos/drivers/filesystems/cdfs/common.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2003 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: common.c 55057 2012-01-21 22:16:46Z cgutman $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             drivers/fs/cdfs/common.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2003 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             drivers/fs/cdfs/common.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/create.c b/reactos/drivers/filesystems/cdfs/create.c
index 220943a46ee..39e5ca86189 100644
--- a/reactos/drivers/filesystems/cdfs/create.c
+++ b/reactos/drivers/filesystems/cdfs/create.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2003, 2004 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: create.c 52546 2011-07-05 13:55:39Z rharabien $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/cdfs.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2003, 2004 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/cdfs.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index 99590cd652b..9a130a701c7 100644
--- a/reactos/drivers/filesystems/cdfs/dirctl.c
+++ b/reactos/drivers/filesystems/cdfs/dirctl.c
@@ -1,31 +1,30 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2004 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: dirctl.c 57791 2012-12-02 21:04:31Z pschweitzer $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/dirctl.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2004 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/dirctl.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/fcb.c b/reactos/drivers/filesystems/cdfs/fcb.c
index f0effcd0108..0b5240819ef 100644
--- a/reactos/drivers/filesystems/cdfs/fcb.c
+++ b/reactos/drivers/filesystems/cdfs/fcb.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2004 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: fcb.c 48654 2010-08-30 11:51:17Z mjmartin $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/fcb.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2004 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/fcb.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
index dca2adee539..c93cbbb4417 100644
--- a/reactos/drivers/filesystems/cdfs/finfo.c
+++ b/reactos/drivers/filesystems/cdfs/finfo.c
@@ -1,31 +1,30 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2004 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: finfo.c 53676 2011-09-10 21:31:09Z akhaldi $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/finfo.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2004 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/finfo.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/misc.c b/reactos/drivers/filesystems/cdfs/misc.c
index 8acf3395b7c..fd48da28270 100644
--- a/reactos/drivers/filesystems/cdfs/misc.c
+++ b/reactos/drivers/filesystems/cdfs/misc.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2004 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: misc.c 48494 2010-08-09 20:38:12Z fireball $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/cdfs/misc.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Eric Kohl
-* UPDATE HISTORY:
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2004 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/cdfs/misc.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Eric Kohl
+ * UPDATE HISTORY:
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
index 21aa1d68c1e..72cd9c3eea0 100644
--- a/reactos/drivers/filesystems/cdfs/rw.c
+++ b/reactos/drivers/filesystems/cdfs/rw.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2003 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: rw.c 54273 2011-10-30 00:58:21Z jgardou $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             drivers/fs/cdfs/rw.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2003 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             drivers/fs/cdfs/rw.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
index e7b2cf21fe9..1a028193518 100644
--- a/reactos/drivers/filesystems/cdfs/volinfo.c
+++ b/reactos/drivers/filesystems/cdfs/volinfo.c
@@ -1,30 +1,29 @@
 /*
-*  ReactOS kernel
-*  Copyright (C) 2002, 2003 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.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-/* $Id: volinfo.c 44442 2009-12-06 18:49:19Z spetreolle $
-*
-* COPYRIGHT:        See COPYING in the top level directory
-* PROJECT:          ReactOS kernel
-* FILE:             services/fs/vfat/volume.c
-* PURPOSE:          CDROM (ISO 9660) filesystem driver
-* PROGRAMMER:       Art Yerkes
-*                   Eric Kohl
-*/
+ *  ReactOS kernel
+ *  Copyright (C) 2002, 2003 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.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS kernel
+ * FILE:             services/fs/vfat/volume.c
+ * PURPOSE:          CDROM (ISO 9660) filesystem driver
+ * PROGRAMMER:       Art Yerkes
+ *                   Eric Kohl
+ */
 
 /* INCLUDES *****************************************************************/
 
diff --git a/reactos/drivers/filesystems/ext2/ext2fs.rc b/reactos/drivers/filesystems/ext2/ext2fs.rc
index 0cbc172a885..e5c5721f47b 100644
--- a/reactos/drivers/filesystems/ext2/ext2fs.rc
+++ b/reactos/drivers/filesystems/ext2/ext2fs.rc
@@ -1,4 +1,3 @@
-/* $Id: ext2fs.rc 12852 2005-01-06 13:58:04Z mf $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Linux ext2 IFS Driver\0"
diff --git a/reactos/drivers/filesystems/msfs/msfs.rc b/reactos/drivers/filesystems/msfs/msfs.rc
index 37e10dec2d8..dae5b633e3f 100644
--- a/reactos/drivers/filesystems/msfs/msfs.rc
+++ b/reactos/drivers/filesystems/msfs/msfs.rc
@@ -1,4 +1,3 @@
-/* $Id: msfs.rc 21716 2006-04-23 08:56:14Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Mailslot IFS Driver\0"
diff --git a/reactos/drivers/filesystems/mup/create.c b/reactos/drivers/filesystems/mup/create.c
index 6f3dba4e2b4..e8da7466fea 100644
--- a/reactos/drivers/filesystems/mup/create.c
+++ b/reactos/drivers/filesystems/mup/create.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: create.c 53683 2011-09-11 08:52:59Z ekohl $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/mup/create.c
diff --git a/reactos/drivers/filesystems/mup/mup.c b/reactos/drivers/filesystems/mup/mup.c
index 27fd39d4b79..a6f7f11aa67 100644
--- a/reactos/drivers/filesystems/mup/mup.c
+++ b/reactos/drivers/filesystems/mup/mup.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: mup.c 53683 2011-09-11 08:52:59Z ekohl $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/mup/mup.c
diff --git a/reactos/drivers/filesystems/mup/mup.rc b/reactos/drivers/filesystems/mup/mup.rc
index 73c212a7810..cd270a2ea35 100644
--- a/reactos/drivers/filesystems/mup/mup.rc
+++ b/reactos/drivers/filesystems/mup/mup.rc
@@ -1,4 +1,3 @@
-/* $Id: mup.rc 21385 2006-03-25 01:39:22Z peterw $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Multi UNC Provider\0"
diff --git a/reactos/drivers/input/kbdclass/kbdclass.rc b/reactos/drivers/input/kbdclass/kbdclass.rc
index bf223babdc0..b1229d863ad 100644
--- a/reactos/drivers/input/kbdclass/kbdclass.rc
+++ b/reactos/drivers/input/kbdclass/kbdclass.rc
@@ -1,4 +1,3 @@
-/* $Id: kbdclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Keyboard Device Driver\0"
diff --git a/reactos/drivers/input/mouclass/mouclass.rc b/reactos/drivers/input/mouclass/mouclass.rc
index 65419972702..20f4588a932 100644
--- a/reactos/drivers/input/mouclass/mouclass.rc
+++ b/reactos/drivers/input/mouclass/mouclass.rc
@@ -1,4 +1,3 @@
-/* $Id: mouclass.rc 21598 2006-04-16 07:11:56Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Mouse Class Device Driver\0"
diff --git a/reactos/drivers/input/sermouse/sermouse.rc b/reactos/drivers/input/sermouse/sermouse.rc
index 81ab2cd4825..e078a9ee326 100644
--- a/reactos/drivers/input/sermouse/sermouse.rc
+++ b/reactos/drivers/input/sermouse/sermouse.rc
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Serial mouse device driver\0"
diff --git a/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
index ba6a0d5f32f..9aaccfc1673 100644
--- a/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
+++ b/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rc
@@ -1,4 +1,3 @@
-/* $Id: mpu401.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"MPU-401 MIDI Driver\0"
diff --git a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
index 7eb19f90117..8ea5f677586 100644
--- a/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
+++ b/reactos/drivers/multimedia/audio/sndblst.old/sndblst.rc
@@ -1,4 +1,3 @@
-/* $Id: sndblst.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SoundBlaster Driver\0"
diff --git a/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc b/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc
index 9588d5c78a7..4eacc41d251 100644
--- a/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc
+++ b/reactos/drivers/multimedia/audio/sndblst_sys/sndblst.rc
@@ -1,4 +1,3 @@
-/* $Id: sndblst.rc 39744 2009-02-25 09:10:46Z silverblade $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SoundBlaster Driver\0"
diff --git a/reactos/drivers/multimedia/audio/sound/sb16.c b/reactos/drivers/multimedia/audio/sound/sb16.c
index 9f2c930466f..70cdc4de5d0 100644
--- a/reactos/drivers/multimedia/audio/sound/sb16.c
+++ b/reactos/drivers/multimedia/audio/sound/sb16.c
@@ -1,5 +1,4 @@
-/* $Id: sb16.c 37762 2008-11-30 11:16:55Z sginsberg $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 services/dd/sound/sb16.c
diff --git a/reactos/drivers/multimedia/audio/sound/sb16.rc b/reactos/drivers/multimedia/audio/sound/sb16.rc
index 194b7f91fe7..0f4f9cee6f5 100644
--- a/reactos/drivers/multimedia/audio/sound/sb16.rc
+++ b/reactos/drivers/multimedia/audio/sound/sb16.rc
@@ -1,4 +1,3 @@
-/* $Id: sb16.rc 21285 2006-03-10 23:22:58Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SB16 driver\0"
diff --git a/reactos/drivers/network/afd/afd.rc b/reactos/drivers/network/afd/afd.rc
index 31e7c3efcc6..e8f7429028e 100644
--- a/reactos/drivers/network/afd/afd.rc
+++ b/reactos/drivers/network/afd/afd.rc
@@ -1,4 +1,3 @@
-/* $Id: afd.rc 21689 2006-04-21 17:45:51Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Socket Filesystem Driver\0"
diff --git a/reactos/drivers/network/afd/afd/bind.c b/reactos/drivers/network/afd/afd/bind.c
index b14bcfb6916..0c5b33d69ce 100644
--- a/reactos/drivers/network/afd/afd/bind.c
+++ b/reactos/drivers/network/afd/afd/bind.c
@@ -1,4 +1,4 @@
-/* $Id: bind.c 57233 2012-09-04 03:01:15Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/bind.c
diff --git a/reactos/drivers/network/afd/afd/connect.c b/reactos/drivers/network/afd/afd/connect.c
index b937c683ddb..36dd2907dcc 100644
--- a/reactos/drivers/network/afd/afd/connect.c
+++ b/reactos/drivers/network/afd/afd/connect.c
@@ -1,4 +1,4 @@
-/* $Id: connect.c 57233 2012-09-04 03:01:15Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/connect.c
diff --git a/reactos/drivers/network/afd/afd/context.c b/reactos/drivers/network/afd/afd/context.c
index 741bf5bfc40..9dec195c079 100644
--- a/reactos/drivers/network/afd/afd/context.c
+++ b/reactos/drivers/network/afd/afd/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c 57233 2012-09-04 03:01:15Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/context.c
diff --git a/reactos/drivers/network/afd/afd/info.c b/reactos/drivers/network/afd/afd/info.c
index 1f5656b5a4e..68cbe2e4bcf 100644
--- a/reactos/drivers/network/afd/afd/info.c
+++ b/reactos/drivers/network/afd/afd/info.c
@@ -1,4 +1,4 @@
-/* $Id: info.c 57233 2012-09-04 03:01:15Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/info.c
diff --git a/reactos/drivers/network/afd/afd/listen.c b/reactos/drivers/network/afd/afd/listen.c
index f316367047c..5c17fe05dd8 100644
--- a/reactos/drivers/network/afd/afd/listen.c
+++ b/reactos/drivers/network/afd/afd/listen.c
@@ -1,4 +1,4 @@
-/* $Id: listen.c 57233 2012-09-04 03:01:15Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/listen.c
diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c
index 2123c437e73..4fcfba0a471 100644
--- a/reactos/drivers/network/afd/afd/lock.c
+++ b/reactos/drivers/network/afd/afd/lock.c
@@ -1,4 +1,4 @@
-/* $Id: lock.c 57237 2012-09-04 07:42:21Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/lock.c
diff --git a/reactos/drivers/network/afd/afd/main.c b/reactos/drivers/network/afd/afd/main.c
index ecd9109818a..4fa43c82309 100644
--- a/reactos/drivers/network/afd/afd/main.c
+++ b/reactos/drivers/network/afd/afd/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c 57975 2012-12-23 09:53:36Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/main.c
diff --git a/reactos/drivers/network/afd/afd/read.c b/reactos/drivers/network/afd/afd/read.c
index 06cc551e2b4..090aed0c072 100644
--- a/reactos/drivers/network/afd/afd/read.c
+++ b/reactos/drivers/network/afd/afd/read.c
@@ -1,4 +1,4 @@
-/* $Id: read.c 57975 2012-12-23 09:53:36Z cgutman $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/read.c
diff --git a/reactos/drivers/network/afd/afd/tdiconn.c b/reactos/drivers/network/afd/afd/tdiconn.c
index fcb14dacb3d..72b7c3f75ec 100644
--- a/reactos/drivers/network/afd/afd/tdiconn.c
+++ b/reactos/drivers/network/afd/afd/tdiconn.c
@@ -1,4 +1,4 @@
-/* $Id: tdiconn.c 56389 2012-04-22 13:11:54Z tfaber $
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/afd/tdiconn.c
diff --git a/reactos/drivers/network/afd/include/afd.h b/reactos/drivers/network/afd/include/afd.h
index 038d79ec4cb..c05eaede6bc 100644
--- a/reactos/drivers/network/afd/include/afd.h
+++ b/reactos/drivers/network/afd/include/afd.h
@@ -1,5 +1,4 @@
-/* $Id: afd.h 57975 2012-12-23 09:53:36Z cgutman $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/net/afd/include/afd.h
diff --git a/reactos/drivers/network/dd/ne2000/ne2000.rc b/reactos/drivers/network/dd/ne2000/ne2000.rc
index 4fd998235d2..c20e6350cbb 100644
--- a/reactos/drivers/network/dd/ne2000/ne2000.rc
+++ b/reactos/drivers/network/dd/ne2000/ne2000.rc
@@ -1,4 +1,3 @@
-/* $Id: ne2000.rc 21473 2006-04-05 16:35:30Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Novell NE2000 network driver\0"
diff --git a/reactos/drivers/network/dd/pcnet/pcnet.rc b/reactos/drivers/network/dd/pcnet/pcnet.rc
index e5f3f5a5567..db010eca1b2 100644
--- a/reactos/drivers/network/dd/pcnet/pcnet.rc
+++ b/reactos/drivers/network/dd/pcnet/pcnet.rc
@@ -1,4 +1,3 @@
-/* $Id: pcnet.rc 30251 2007-11-07 22:59:56Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PCNet Ethernet PCI Driver\0"
diff --git a/reactos/drivers/network/lan/lan.rc b/reactos/drivers/network/lan/lan.rc
index 73fe1719fae..f7630a802f2 100644
--- a/reactos/drivers/network/lan/lan.rc
+++ b/reactos/drivers/network/lan/lan.rc
@@ -1,4 +1,3 @@
-/* $Id: lan.rc 21693 2006-04-22 04:56:37Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TCP/IP protocol driver\0"
diff --git a/reactos/drivers/network/ndis/ndis.rc b/reactos/drivers/network/ndis/ndis.rc
index dbbeb77f172..3cef52fb0ee 100644
--- a/reactos/drivers/network/ndis/ndis.rc
+++ b/reactos/drivers/network/ndis/ndis.rc
@@ -1,4 +1,3 @@
-/* $Id: ndis.rc 21293 2006-03-11 23:55:37Z jimtabor $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"NDIS Library\0"
diff --git a/reactos/drivers/network/tdi/cte/string.c b/reactos/drivers/network/tdi/cte/string.c
index dbbaa9ecec6..04992c99fd7 100644
--- a/reactos/drivers/network/tdi/cte/string.c
+++ b/reactos/drivers/network/tdi/cte/string.c
@@ -1,6 +1,4 @@
-/* $Id: string.c 52934 2011-07-27 19:33:08Z akhaldi $
- *
- */
+
 #include "precomp.h"
 
 /*
diff --git a/reactos/drivers/network/tdi/misc/tdi.rc b/reactos/drivers/network/tdi/misc/tdi.rc
index ce92554094a..bf387831deb 100644
--- a/reactos/drivers/network/tdi/misc/tdi.rc
+++ b/reactos/drivers/network/tdi/misc/tdi.rc
@@ -1,4 +1,3 @@
-/* $Id: tdi.rc 21695 2006-04-22 05:22:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TDI wrapper kernel module\0"
diff --git a/reactos/drivers/network/tdi/tdi/handler.c b/reactos/drivers/network/tdi/tdi/handler.c
index 5f6e030e6cd..7a64e3f167c 100644
--- a/reactos/drivers/network/tdi/tdi/handler.c
+++ b/reactos/drivers/network/tdi/tdi/handler.c
@@ -1,5 +1,4 @@
-/* $Id: handler.c 52934 2011-07-27 19:33:08Z akhaldi $
- *
+/*
  * DESCRIPTION: Default TDI event handlers.
  */
 #include "precomp.h"
diff --git a/reactos/drivers/network/tdi/tdi/obsolete.c b/reactos/drivers/network/tdi/tdi/obsolete.c
index a84c7f09154..98e72adf7eb 100644
--- a/reactos/drivers/network/tdi/tdi/obsolete.c
+++ b/reactos/drivers/network/tdi/tdi/obsolete.c
@@ -1,6 +1,3 @@
-/* $Id: obsolete.c 52934 2011-07-27 19:33:08Z akhaldi $
- *
- */
 
 #include "precomp.h"
 
diff --git a/reactos/drivers/network/tdi/tdi/stubs.c b/reactos/drivers/network/tdi/tdi/stubs.c
index c0c20fceac6..4832d7fa4e5 100644
--- a/reactos/drivers/network/tdi/tdi/stubs.c
+++ b/reactos/drivers/network/tdi/tdi/stubs.c
@@ -1,7 +1,4 @@
 
-/* $Id: stubs.c 52934 2011-07-27 19:33:08Z akhaldi $
- *
- */
 #include "precomp.h"
 
 /*
diff --git a/reactos/drivers/parallel/parallel/parallel.c b/reactos/drivers/parallel/parallel/parallel.c
index 8a27d03df11..36e58fe7b08 100644
--- a/reactos/drivers/parallel/parallel/parallel.c
+++ b/reactos/drivers/parallel/parallel/parallel.c
@@ -1,5 +1,4 @@
-/* $Id: parallel.c 54094 2011-10-12 12:24:19Z akhaldi $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/parallel/parallel.c
diff --git a/reactos/drivers/parallel/parallel/parallel.rc b/reactos/drivers/parallel/parallel/parallel.rc
index 57b79adbb0e..db11bceada9 100644
--- a/reactos/drivers/parallel/parallel/parallel.rc
+++ b/reactos/drivers/parallel/parallel/parallel.rc
@@ -1,4 +1,3 @@
-/* $Id: parallel.rc 21498 2006-04-07 10:15:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Parallel Port Device Driver\0"
diff --git a/reactos/drivers/serial/serenum/serenum.rc b/reactos/drivers/serial/serenum/serenum.rc
index 90dee990790..6da34d940e7 100644
--- a/reactos/drivers/serial/serenum/serenum.rc
+++ b/reactos/drivers/serial/serenum/serenum.rc
@@ -1,4 +1,3 @@
-/* $Id: serenum.rc 21507 2006-04-07 15:34:51Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Serial port enumerator\0"
diff --git a/reactos/drivers/serial/serial/serial.rc b/reactos/drivers/serial/serial/serial.rc
index a7bf9af4de0..910ccf96ecb 100644
--- a/reactos/drivers/serial/serial/serial.rc
+++ b/reactos/drivers/serial/serial/serial.rc
@@ -1,4 +1,3 @@
-/* $Id: serial.rc 22516 2006-06-22 22:14:51Z hpoussin $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Serial Port Device Driver\0"
diff --git a/reactos/drivers/setup/blue/blue.rc b/reactos/drivers/setup/blue/blue.rc
index 85074c4d01d..3aec979970c 100644
--- a/reactos/drivers/setup/blue/blue.rc
+++ b/reactos/drivers/setup/blue/blue.rc
@@ -1,4 +1,3 @@
-/* $Id: blue.rc 21706 2006-04-22 14:01:25Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"HAL Console Device Driver\0"
diff --git a/reactos/drivers/storage/class/cdrom/cdrom.rc b/reactos/drivers/storage/class/cdrom/cdrom.rc
index 0af3c65cecb..7a60cb19526 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.rc
+++ b/reactos/drivers/storage/class/cdrom/cdrom.rc
@@ -1,4 +1,3 @@
-/* $Id: cdrom.rc 26227 2007-04-01 16:29:16Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"CD-ROM Class Driver\0"
diff --git a/reactos/drivers/storage/class/class2/class2.rc b/reactos/drivers/storage/class/class2/class2.rc
index e6e694c77d8..4c87c570b69 100644
--- a/reactos/drivers/storage/class/class2/class2.rc
+++ b/reactos/drivers/storage/class/class2/class2.rc
@@ -1,4 +1,3 @@
-/* $Id: class2.rc 26227 2007-04-01 16:29:16Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"SCSI Class Driver Helper\0"
diff --git a/reactos/drivers/storage/class/disk/disk.rc b/reactos/drivers/storage/class/disk/disk.rc
index 1c6a54694a4..88a5f2275a3 100644
--- a/reactos/drivers/storage/class/disk/disk.rc
+++ b/reactos/drivers/storage/class/disk/disk.rc
@@ -1,4 +1,3 @@
-/* $Id: disk.rc 21397 2006-03-27 07:38:43Z peterw $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Disk Class Driver\0"
diff --git a/reactos/drivers/storage/class/include/class2.h b/reactos/drivers/storage/class/include/class2.h
index e02c8fb5940..b967c3dfce7 100644
--- a/reactos/drivers/storage/class/include/class2.h
+++ b/reactos/drivers/storage/class/include/class2.h
@@ -1,5 +1,4 @@
-/* $Id: class2.h 49129 2010-10-12 20:17:55Z pschweitzer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            services/storage/include/class2.h
diff --git a/reactos/drivers/storage/floppy/floppy.rc b/reactos/drivers/storage/floppy/floppy.rc
index 60658cddd61..d239880a1bf 100644
--- a/reactos/drivers/storage/floppy/floppy.rc
+++ b/reactos/drivers/storage/floppy/floppy.rc
@@ -1,5 +1,4 @@
-/* $Id: floppy.rc 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  *  ReactOS Floppy Driver
  *  Copyright (C) 2004, Vizzini (vizzini@plasmic.com)
  *
diff --git a/reactos/drivers/storage/ide/atapi/atapi.rc b/reactos/drivers/storage/ide/atapi/atapi.rc
index ed082789741..fb5d6557b0a 100644
--- a/reactos/drivers/storage/ide/atapi/atapi.rc
+++ b/reactos/drivers/storage/ide/atapi/atapi.rc
@@ -1,4 +1,3 @@
-/* $Id: atapi.rc 26238 2007-04-01 19:25:38Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ATAPI IDE Miniport Driver\0"
diff --git a/reactos/drivers/wmi/wmilib.rc b/reactos/drivers/wmi/wmilib.rc
index 79ac7929b3e..7756101b354 100644
--- a/reactos/drivers/wmi/wmilib.rc
+++ b/reactos/drivers/wmi/wmilib.rc
@@ -1,4 +1,3 @@
-/* $Id: wmilib.rc 21844 2006-05-07 19:34:23Z fireball $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"WmiLib\0"
diff --git a/reactos/include/psdk/ddkernel.h b/reactos/include/psdk/ddkernel.h
index 8ffedf8165d..6d67625697c 100644
--- a/reactos/include/psdk/ddkernel.h
+++ b/reactos/include/psdk/ddkernel.h
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            This file is in the public domain.
  * PROJECT:              ReactOS kernel
  * FILE:
diff --git a/reactos/include/psdk/dmemmgr.h b/reactos/include/psdk/dmemmgr.h
index 5a637f73de7..429b459d8bd 100644
--- a/reactos/include/psdk/dmemmgr.h
+++ b/reactos/include/psdk/dmemmgr.h
@@ -1,6 +1,4 @@
-
-/* $Id: $
- *
+/*
  * COPYRIGHT:            This file is in the public domain.
  * PROJECT:              ReactOS kernel
  * FILE:
diff --git a/reactos/include/psdk/dvp.h b/reactos/include/psdk/dvp.h
index 0e79d3ea62a..07787f56a33 100644
--- a/reactos/include/psdk/dvp.h
+++ b/reactos/include/psdk/dvp.h
@@ -1,6 +1,4 @@
-
-/* $Id$
- *
+/*
  * COPYRIGHT:            This file is in the public domain.
  * PROJECT:              ReactOS kernel
  * FILE:
diff --git a/reactos/include/psdk/objerror.h b/reactos/include/psdk/objerror.h
index 06b30e700b5..f6b86b1981d 100644
--- a/reactos/include/psdk/objerror.h
+++ b/reactos/include/psdk/objerror.h
@@ -1,6 +1,4 @@
-
-/* $Id$
- *
+/*
  * COPYRIGHT:            This file is in the public domain.
  * PROJECT:              ReactOS kernel
  * FILE:
@@ -10,4 +8,3 @@
  */
 
 #include <winerror.h>
-
diff --git a/reactos/include/psdk/polarity.h b/reactos/include/psdk/polarity.h
index ecc79a7bd5d..e6078709871 100644
--- a/reactos/include/psdk/polarity.h
+++ b/reactos/include/psdk/polarity.h
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            This file is in the public domain.
  * PROJECT:              ReactOS kernel
  * FILE:
diff --git a/reactos/include/reactos/libs/epsapi/epsapi.h b/reactos/include/reactos/libs/epsapi/epsapi.h
index 52295d47f99..92967928c1e 100644
--- a/reactos/include/reactos/libs/epsapi/epsapi.h
+++ b/reactos/include/reactos/libs/epsapi/epsapi.h
@@ -1,5 +1,3 @@
-/* $Id: epsapi.h 21880 2006-05-10 17:47:44Z ion $
-*/
 /*
  * epsapi.h
  *
diff --git a/reactos/include/reactos/libs/syssetup/syssetup.h b/reactos/include/reactos/libs/syssetup/syssetup.h
index 3db55c473bb..91ecfc8b8c2 100644
--- a/reactos/include/reactos/libs/syssetup/syssetup.h
+++ b/reactos/include/reactos/libs/syssetup/syssetup.h
@@ -1,5 +1,3 @@
-/* $Id: syssetup.h 45020 2010-01-09 22:43:16Z ekohl $
-*/
 /*
  * syssetup.h
  *
diff --git a/reactos/include/reactos/subsys/lsass/lsass.h b/reactos/include/reactos/subsys/lsass/lsass.h
index fc2bb2ca707..96b0497aa2b 100644
--- a/reactos/include/reactos/subsys/lsass/lsass.h
+++ b/reactos/include/reactos/subsys/lsass/lsass.h
@@ -1,5 +1,4 @@
-/* $Id: lsass.h 58304 2013-02-10 12:09:21Z ekohl $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            include/lsass/lsass.h
diff --git a/reactos/include/reactos/subsys/sm/helper.h b/reactos/include/reactos/subsys/sm/helper.h
index abbfd09b567..2c33ffcbd69 100644
--- a/reactos/include/reactos/subsys/sm/helper.h
+++ b/reactos/include/reactos/subsys/sm/helper.h
@@ -5,8 +5,6 @@
 #include <sm/api.h>
 #endif
 
-/* $Id: helper.h 37769 2008-11-30 13:46:35Z sginsberg $ */
-
 /* smlib/connect.c */
 NTSTATUS WINAPI
 SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
diff --git a/reactos/include/reactos/subsys/sm/ns.h b/reactos/include/reactos/subsys/sm/ns.h
index a0247209e3b..d05d03e2e09 100644
--- a/reactos/include/reactos/subsys/sm/ns.h
+++ b/reactos/include/reactos/subsys/sm/ns.h
@@ -1,8 +1,6 @@
 #if !defined(INCLUDE_SM_NS_H)
 #define INCLUDE_SM_NS_H
 
-/* $Id: ns.h 15729 2005-06-02 13:17:37Z ea $ */
-
 #define SM_REGISTRY_ROOT_NAME	     L"\\Session Manager"
 #define SM_REGISTRY_SUBSYSTEMS_NAME  L"SubSystems"
 
diff --git a/reactos/include/reactos/winlogon.h b/reactos/include/reactos/winlogon.h
index 14bb549fb13..b8571da7bbc 100644
--- a/reactos/include/reactos/winlogon.h
+++ b/reactos/include/reactos/winlogon.h
@@ -1,5 +1,4 @@
-/* $Id: winlogon.h 50813 2011-02-18 20:16:43Z gadamopoulos $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS kernel
  * FILE:        include/reactos/winlogon.h

From 7a90d8cd1efe0da5c55fcb5ed7af3286a251a6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 20:08:56 +0000
Subject: [PATCH 58/61] Remove the unneeded $Id$ blabla from the source code,
 but not in 3rd party code. (Part 5/N) The only thing remaining is to remove
 $Id$ in /dll/

svn path=/trunk/; revision=58524
---
 reactos/base/applications/cmdutils/dbgprint/dbgprint.c | 3 +--
 reactos/base/applications/cmdutils/hostname/hostname.c | 3 +--
 reactos/base/applications/sndvol32/misc.c              | 3 +--
 reactos/base/applications/sndvol32/mixer.c             | 3 +--
 reactos/base/applications/sndvol32/sndvol32.c          | 3 +--
 reactos/base/setup/reactos/reactos.c                   | 3 +--
 reactos/base/setup/usetup/bootsup.h                    | 2 +-
 reactos/base/setup/usetup/drivesup.c                   | 2 +-
 reactos/base/setup/usetup/drivesup.h                   | 2 +-
 reactos/base/setup/usetup/errorcode.h                  | 2 +-
 reactos/base/setup/usetup/filequeue.h                  | 2 +-
 reactos/base/setup/usetup/filesup.h                    | 2 +-
 reactos/base/setup/usetup/format.h                     | 2 +-
 reactos/base/setup/usetup/genlist.h                    | 2 +-
 reactos/base/setup/usetup/inicache.c                   | 2 +-
 reactos/base/setup/usetup/progress.h                   | 2 +-
 reactos/base/setup/usetup/registry.h                   | 2 +-
 reactos/base/setup/usetup/settings.h                   | 2 +-
 reactos/base/setup/welcome/lang/ru-RU.rc               | 1 -
 reactos/base/setup/welcome/welcome.c                   | 3 +--
 reactos/base/shell/cmd/window.c                        | 3 +--
 reactos/base/system/winlogon/setup.h                   | 2 +-
 22 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c
index 8699db6dfcd..ed3d76cab9e 100644
--- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c
+++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c
@@ -1,5 +1,4 @@
-/* $Id: dbgprint.c 24720 2006-11-11 16:07:35Z janderwald $
- *
+/*
  * PROJECT:         ReactOS DbgPrint Utility
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            tools/dbgprint/dbgprint.c
diff --git a/reactos/base/applications/cmdutils/hostname/hostname.c b/reactos/base/applications/cmdutils/hostname/hostname.c
index c118d2b575b..759015f5d94 100644
--- a/reactos/base/applications/cmdutils/hostname/hostname.c
+++ b/reactos/base/applications/cmdutils/hostname/hostname.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: hostname.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT : See COPYING in the top level directory
  * PROJECT   : ReactOS/Win32 get host name
  * FILE      : subsys/system/hostname/hostname.c
diff --git a/reactos/base/applications/sndvol32/misc.c b/reactos/base/applications/sndvol32/misc.c
index b362c475fa3..17e3eb265bb 100644
--- a/reactos/base/applications/sndvol32/misc.c
+++ b/reactos/base/applications/sndvol32/misc.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
  * FILE:        subsys/system/sndvol32/misc.c
diff --git a/reactos/base/applications/sndvol32/mixer.c b/reactos/base/applications/sndvol32/mixer.c
index 697d240854f..3445184f5eb 100644
--- a/reactos/base/applications/sndvol32/mixer.c
+++ b/reactos/base/applications/sndvol32/mixer.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: mixer.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
  * FILE:        subsys/system/sndvol32/mixer.c
diff --git a/reactos/base/applications/sndvol32/sndvol32.c b/reactos/base/applications/sndvol32/sndvol32.c
index e484acd39e6..a09718fe839 100644
--- a/reactos/base/applications/sndvol32/sndvol32.c
+++ b/reactos/base/applications/sndvol32/sndvol32.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: sndvol32.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS Sound Volume Control
  * FILE:        subsys/system/sndvol32/sndvol32.c
diff --git a/reactos/base/setup/reactos/reactos.c b/reactos/base/setup/reactos/reactos.c
index 3697dd14a5c..416c2f304d4 100644
--- a/reactos/base/setup/reactos/reactos.c
+++ b/reactos/base/setup/reactos/reactos.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: reactos.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS GUI first stage setup application
  * FILE:        base/setup/reactos/reactos.c
diff --git a/reactos/base/setup/usetup/bootsup.h b/reactos/base/setup/usetup/bootsup.h
index dcde104c808..33b983a0228 100644
--- a/reactos/base/setup/usetup/bootsup.h
+++ b/reactos/base/setup/usetup/bootsup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: bootsup.h 48703 2010-09-05 17:09:18Z cgutman $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/bootsup.h
diff --git a/reactos/base/setup/usetup/drivesup.c b/reactos/base/setup/usetup/drivesup.c
index 60a5bfd5f21..a910e9302ef 100644
--- a/reactos/base/setup/usetup/drivesup.c
+++ b/reactos/base/setup/usetup/drivesup.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: drivesup.c 47686 2010-06-07 21:38:49Z spetreolle $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/drivesup.c
diff --git a/reactos/base/setup/usetup/drivesup.h b/reactos/base/setup/usetup/drivesup.h
index cc6c58b9815..37c918cf964 100644
--- a/reactos/base/setup/usetup/drivesup.h
+++ b/reactos/base/setup/usetup/drivesup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: drivesup.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/drivesup.h
diff --git a/reactos/base/setup/usetup/errorcode.h b/reactos/base/setup/usetup/errorcode.h
index 79461a7e39c..8bb5a43d308 100644
--- a/reactos/base/setup/usetup/errorcode.h
+++ b/reactos/base/setup/usetup/errorcode.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: registry.h 21704 2006-04-22 13:55:01Z tretiakov $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/errcode.h
diff --git a/reactos/base/setup/usetup/filequeue.h b/reactos/base/setup/usetup/filequeue.h
index 3948f0d5214..7dc8587d548 100644
--- a/reactos/base/setup/usetup/filequeue.h
+++ b/reactos/base/setup/usetup/filequeue.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: filequeue.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/filequeue.h
diff --git a/reactos/base/setup/usetup/filesup.h b/reactos/base/setup/usetup/filesup.h
index 4d0a9425306..a1d45cb9417 100644
--- a/reactos/base/setup/usetup/filesup.h
+++ b/reactos/base/setup/usetup/filesup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: filesup.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/filesup.h
diff --git a/reactos/base/setup/usetup/format.h b/reactos/base/setup/usetup/format.h
index 90830182def..3c7706b2ca2 100644
--- a/reactos/base/setup/usetup/format.h
+++ b/reactos/base/setup/usetup/format.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: format.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/format.h
diff --git a/reactos/base/setup/usetup/genlist.h b/reactos/base/setup/usetup/genlist.h
index 9eaebf797c5..2d4cc74fbe2 100644
--- a/reactos/base/setup/usetup/genlist.h
+++ b/reactos/base/setup/usetup/genlist.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: genlist.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/genlist.h
diff --git a/reactos/base/setup/usetup/inicache.c b/reactos/base/setup/usetup/inicache.c
index a25a9a68bd5..bcff69e1def 100644
--- a/reactos/base/setup/usetup/inicache.c
+++ b/reactos/base/setup/usetup/inicache.c
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: inicache.c 47686 2010-06-07 21:38:49Z spetreolle $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/inicache.c
diff --git a/reactos/base/setup/usetup/progress.h b/reactos/base/setup/usetup/progress.h
index 6319058660d..948501c3d62 100644
--- a/reactos/base/setup/usetup/progress.h
+++ b/reactos/base/setup/usetup/progress.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: progress.h 52467 2011-06-26 10:08:31Z rharabien $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/partlist.h
diff --git a/reactos/base/setup/usetup/registry.h b/reactos/base/setup/usetup/registry.h
index 49196666b11..0d62ac9c25b 100644
--- a/reactos/base/setup/usetup/registry.h
+++ b/reactos/base/setup/usetup/registry.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: registry.h 47037 2010-04-26 15:10:23Z ekohl $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/registry.h
diff --git a/reactos/base/setup/usetup/settings.h b/reactos/base/setup/usetup/settings.h
index aff6c5e13d7..fb8cd3cdd1e 100644
--- a/reactos/base/setup/usetup/settings.h
+++ b/reactos/base/setup/usetup/settings.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: settings.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS text-mode setup
  * FILE:            subsys/system/usetup/settings.h
diff --git a/reactos/base/setup/welcome/lang/ru-RU.rc b/reactos/base/setup/welcome/lang/ru-RU.rc
index 39ec334eaa1..c40e3f18377 100644
--- a/reactos/base/setup/welcome/lang/ru-RU.rc
+++ b/reactos/base/setup/welcome/lang/ru-RU.rc
@@ -1,4 +1,3 @@
-/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
diff --git a/reactos/base/setup/welcome/welcome.c b/reactos/base/setup/welcome/welcome.c
index 3c0dc521005..93335f1d6b8 100644
--- a/reactos/base/setup/welcome/welcome.c
+++ b/reactos/base/setup/welcome/welcome.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: welcome.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS welcome/autorun application
  * FILE:        subsys/system/welcome/welcome.c
diff --git a/reactos/base/shell/cmd/window.c b/reactos/base/shell/cmd/window.c
index dc052b4bfab..42771d572c3 100644
--- a/reactos/base/shell/cmd/window.c
+++ b/reactos/base/shell/cmd/window.c
@@ -1,5 +1,4 @@
-/* $Id: window.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * WINDOW.C - activate & window internal commands.
  *
  * clone from 4nt activate command
diff --git a/reactos/base/system/winlogon/setup.h b/reactos/base/system/winlogon/setup.h
index efb14d16035..6f980e0e221 100644
--- a/reactos/base/system/winlogon/setup.h
+++ b/reactos/base/system/winlogon/setup.h
@@ -16,7 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: setup.h 45685 2010-02-26 11:43:19Z gedmurphy $
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS winlogon
  * FILE:            subsys/system/winlogon/setup.h

From fbb7f7727c390ff70c0554cda2ea5b7ea9098523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 20:25:38 +0000
Subject: [PATCH 59/61] Remove the unneeded $Id$ blabla from the source code,
 but not in 3rd party code. (Part 6/8) (N == 8)

svn path=/trunk/; revision=58525
---
 reactos/dll/cpl/access/access.c                   |  3 +--
 reactos/dll/cpl/access/display.c                  |  3 +--
 reactos/dll/cpl/access/general.c                  |  3 +--
 reactos/dll/cpl/access/keyboard.c                 |  3 +--
 reactos/dll/cpl/access/mouse.c                    |  3 +--
 reactos/dll/cpl/access/sound.c                    |  3 +--
 reactos/dll/cpl/appwiz/createlink.c               | 15 +++++++--------
 reactos/dll/cpl/console/lang/bg-BG.rc             |  3 +--
 reactos/dll/cpl/console/lang/de-DE.rc             |  3 +--
 reactos/dll/cpl/console/lang/en-US.rc             |  3 +--
 reactos/dll/cpl/console/lang/it-IT.rc             |  3 +--
 reactos/dll/cpl/console/lang/no-NO.rc             |  3 +--
 reactos/dll/cpl/console/lang/ru-RU.rc             |  1 -
 reactos/dll/cpl/desk/advappdlg.c                  |  3 +--
 reactos/dll/cpl/desk/background.c                 |  3 +--
 reactos/dll/cpl/desk/desk.c                       |  3 +--
 reactos/dll/cpl/desk/dibitmap.c                   |  3 +--
 reactos/dll/cpl/intl/currency.c                   |  3 +--
 reactos/dll/cpl/intl/date.c                       |  3 +--
 reactos/dll/cpl/intl/generalp.c                   |  3 +--
 reactos/dll/cpl/intl/inplocale.c                  |  3 +--
 reactos/dll/cpl/intl/intl.c                       |  3 +--
 reactos/dll/cpl/intl/numbers.c                    |  3 +--
 reactos/dll/cpl/intl/sort.c                       |  3 +--
 reactos/dll/cpl/liccpa/liccpa.c                   |  3 +--
 reactos/dll/cpl/liccpa/liccpa.rc                  |  1 -
 reactos/dll/cpl/main/keyboard.c                   |  3 +--
 reactos/dll/cpl/main/main.c                       |  3 +--
 reactos/dll/cpl/main/mouse.c                      |  3 +--
 reactos/dll/cpl/mmsys/sounds.c                    |  3 +--
 reactos/dll/cpl/mmsys/volume.c                    |  3 +--
 reactos/dll/cpl/odbccp32/odbccp32.c               |  3 +--
 reactos/dll/cpl/powercfg/advanced.c               |  3 +--
 reactos/dll/cpl/powercfg/alarms.c                 |  3 +--
 reactos/dll/cpl/powercfg/hibernate.c              |  3 +--
 reactos/dll/cpl/powercfg/powercfg.c               |  3 +--
 reactos/dll/cpl/powercfg/powershemes.c            |  3 +--
 reactos/dll/cpl/usrmgr/extra.c                    |  3 +--
 reactos/dll/cpl/usrmgr/usrmgr.c                   |  3 +--
 reactos/dll/directx/d3d8/d3d8.rc                  |  1 -
 reactos/dll/directx/d3d9/d3d9.rc                  |  1 -
 reactos/dll/directx/ddraw/Clipper/clipper_main.c  |  3 +--
 reactos/dll/directx/ddraw/Clipper/clipper_stubs.c |  3 +--
 reactos/dll/directx/ddraw/Color/color_stubs.c     |  3 +--
 reactos/dll/directx/ddraw/Ddraw/GetCaps.c         |  3 +--
 .../dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c |  3 +--
 .../dll/directx/ddraw/Ddraw/callbacks_dd_hel.c    |  3 +--
 .../dll/directx/ddraw/Ddraw/ddraw_displaymode.c   |  3 +--
 reactos/dll/directx/ddraw/Ddraw/ddraw_main.c      |  3 +--
 .../ddraw/Ddraw/ddraw_setcooperativelevel.c       |  3 +--
 reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c     |  3 +--
 reactos/dll/directx/ddraw/Gamma/gamma_stubs.c     |  3 +--
 reactos/dll/directx/ddraw/Kernel/kernel_stubs.c   |  3 +--
 reactos/dll/directx/ddraw/Palette/createpalette.c |  3 +--
 reactos/dll/directx/ddraw/Palette/palette.c       |  3 +--
 reactos/dll/directx/ddraw/Palette/palette_stubs.c |  3 +--
 .../directx/ddraw/Surface/callbacks_surf_hel.c    |  3 +--
 reactos/dll/directx/ddraw/Surface/createsurface.c |  3 +--
 reactos/dll/directx/ddraw/Surface/surface_main.c  |  3 +--
 reactos/dll/directx/ddraw/Surface/surface_stubs.c |  3 +--
 .../dll/directx/ddraw/Videoport/videoport_stubs.c |  3 +--
 reactos/dll/directx/ddraw/cleanup.c               |  3 +--
 reactos/dll/directx/ddraw/ddraw.rc                |  1 -
 reactos/dll/directx/ddraw/main.c                  |  4 +---
 reactos/dll/directx/ddraw/startup.c               |  3 +--
 reactos/dll/shellext/slayer/slayer.c              |  3 +--
 66 files changed, 67 insertions(+), 134 deletions(-)

diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c
index 5b33e1436ae..76be27d6a36 100644
--- a/reactos/dll/cpl/access/access.c
+++ b/reactos/dll/cpl/access/access.c
@@ -1,5 +1,4 @@
-/* $Id: access.c 29112 2007-09-19 21:31:49Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/access.c
diff --git a/reactos/dll/cpl/access/display.c b/reactos/dll/cpl/access/display.c
index cf09292b118..3154da12983 100644
--- a/reactos/dll/cpl/access/display.c
+++ b/reactos/dll/cpl/access/display.c
@@ -1,5 +1,4 @@
-/* $Id: display.c 29112 2007-09-19 21:31:49Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/display.c
diff --git a/reactos/dll/cpl/access/general.c b/reactos/dll/cpl/access/general.c
index 7fb7cf93770..421348aa726 100644
--- a/reactos/dll/cpl/access/general.c
+++ b/reactos/dll/cpl/access/general.c
@@ -1,5 +1,4 @@
-/* $Id: general.c 29112 2007-09-19 21:31:49Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/general.c
diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c
index 1b2f3081eeb..c63711ecba1 100644
--- a/reactos/dll/cpl/access/keyboard.c
+++ b/reactos/dll/cpl/access/keyboard.c
@@ -1,5 +1,4 @@
-/* $Id: keyboard.c 29170 2007-09-23 22:59:00Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/keyboard.c
diff --git a/reactos/dll/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c
index 0fe19e5b6a1..6473718a724 100644
--- a/reactos/dll/cpl/access/mouse.c
+++ b/reactos/dll/cpl/access/mouse.c
@@ -1,5 +1,4 @@
-/* $Id: mouse.c 29112 2007-09-19 21:31:49Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/mouse.c
diff --git a/reactos/dll/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c
index 9190189ece4..dea63e27054 100644
--- a/reactos/dll/cpl/access/sound.c
+++ b/reactos/dll/cpl/access/sound.c
@@ -1,5 +1,4 @@
-/* $Id: sound.c 29112 2007-09-19 21:31:49Z ekohl $
- *
+/*
  * PROJECT:         ReactOS Accessibility Control Panel
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/access/sound.c
diff --git a/reactos/dll/cpl/appwiz/createlink.c b/reactos/dll/cpl/appwiz/createlink.c
index 58192618509..2c902011326 100644
--- a/reactos/dll/cpl/appwiz/createlink.c
+++ b/reactos/dll/cpl/appwiz/createlink.c
@@ -1,11 +1,10 @@
-/* $Id: appwiz.c 29364 2007-10-02 23:34:00Z janderwald $
- *
- * PROJECT:         		ReactOS Software Control Panel
- * FILE:            		dll/cpl/appwiz/createlink.c
- * PURPOSE:         		ReactOS Software Control Panel
- * PROGRAMMER:      	Gero Kuehn (reactos.filter@gkware.com)
- *				Dmitry Chapyshev (lentind@yandex.ru)
- *				Johannes Anderwald
+/*
+ * PROJECT:         ReactOS Software Control Panel
+ * FILE:            dll/cpl/appwiz/createlink.c
+ * PURPOSE:         ReactOS Software Control Panel
+ * PROGRAMMER:      Gero Kuehn (reactos.filter@gkware.com)
+ *                  Dmitry Chapyshev (lentind@yandex.ru)
+ *                  Johannes Anderwald
  * UPDATE HISTORY:
  *      06-17-2004  Created
  */
diff --git a/reactos/dll/cpl/console/lang/bg-BG.rc b/reactos/dll/cpl/console/lang/bg-BG.rc
index 0ed6ad37273..85bb72124b7 100644
--- a/reactos/dll/cpl/console/lang/bg-BG.rc
+++ b/reactos/dll/cpl/console/lang/bg-BG.rc
@@ -1,5 +1,4 @@
-/* $Id: en-US.rc 49139 2010-10-13 21:23:48Z dreimer $
- *
+/*
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/console/lang/en-US.rc
diff --git a/reactos/dll/cpl/console/lang/de-DE.rc b/reactos/dll/cpl/console/lang/de-DE.rc
index 78233f77fb8..37118c555de 100644
--- a/reactos/dll/cpl/console/lang/de-DE.rc
+++ b/reactos/dll/cpl/console/lang/de-DE.rc
@@ -1,5 +1,4 @@
-/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $
- *
+/*
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/win32/console/de-DE.rc
diff --git a/reactos/dll/cpl/console/lang/en-US.rc b/reactos/dll/cpl/console/lang/en-US.rc
index 11865f312ba..1a9eeb0211d 100644
--- a/reactos/dll/cpl/console/lang/en-US.rc
+++ b/reactos/dll/cpl/console/lang/en-US.rc
@@ -1,5 +1,4 @@
-/* $Id: en-US.rc 49139 2010-10-13 21:23:48Z dreimer $
- *
+/*
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/console/lang/en-US.rc
diff --git a/reactos/dll/cpl/console/lang/it-IT.rc b/reactos/dll/cpl/console/lang/it-IT.rc
index edcdcfaea79..5a96c8028c1 100644
--- a/reactos/dll/cpl/console/lang/it-IT.rc
+++ b/reactos/dll/cpl/console/lang/it-IT.rc
@@ -1,5 +1,4 @@
-/* $Id: en-US.rc 29690 2007-10-19 23:21:45Z dreimer $
- *
+/*
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/win32/console/it-IT.rc
diff --git a/reactos/dll/cpl/console/lang/no-NO.rc b/reactos/dll/cpl/console/lang/no-NO.rc
index c8ee130e67b..289598db07b 100644
--- a/reactos/dll/cpl/console/lang/no-NO.rc
+++ b/reactos/dll/cpl/console/lang/no-NO.rc
@@ -1,5 +1,4 @@
-/* $Id: en-US.rc 31950 2008-01-22 19:08:51Z dreimer $
- *
+/*
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/win32/console/lang/en-US.rc
diff --git a/reactos/dll/cpl/console/lang/ru-RU.rc b/reactos/dll/cpl/console/lang/ru-RU.rc
index 8ee4b565b96..81b7c514ff6 100644
--- a/reactos/dll/cpl/console/lang/ru-RU.rc
+++ b/reactos/dll/cpl/console/lang/ru-RU.rc
@@ -1,5 +1,4 @@
 // Russian language resource file (Dmitry Chapyshev, 2007-06-11)
-/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ */
 
 #include <commctrl.h>
 
diff --git a/reactos/dll/cpl/desk/advappdlg.c b/reactos/dll/cpl/desk/advappdlg.c
index 837bc0b18c2..6ccefacc444 100644
--- a/reactos/dll/cpl/desk/advappdlg.c
+++ b/reactos/dll/cpl/desk/advappdlg.c
@@ -1,5 +1,4 @@
-/* $Id: advappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            dll/cpl/desk/advappdlg.c
diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c
index e964964a01c..982312fa2a7 100644
--- a/reactos/dll/cpl/desk/background.c
+++ b/reactos/dll/cpl/desk/background.c
@@ -1,5 +1,4 @@
-/* $Id: background.c 55583 2012-02-13 20:52:20Z rharabien $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            dll/cpl/desk/background.c
diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c
index 577ad3ed432..0f3727100e6 100644
--- a/reactos/dll/cpl/desk/desk.c
+++ b/reactos/dll/cpl/desk/desk.c
@@ -1,5 +1,4 @@
-/* $Id: desk.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            dll/cpl/desk/desk.c
diff --git a/reactos/dll/cpl/desk/dibitmap.c b/reactos/dll/cpl/desk/dibitmap.c
index 4724ccc6289..9486d5afd11 100644
--- a/reactos/dll/cpl/desk/dibitmap.c
+++ b/reactos/dll/cpl/desk/dibitmap.c
@@ -1,5 +1,4 @@
-/* $Id: dibitmap.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
  * FILE:            dll/cpl/desk/dibitmap.c
diff --git a/reactos/dll/cpl/intl/currency.c b/reactos/dll/cpl/intl/currency.c
index af39005f1b4..78423688365 100644
--- a/reactos/dll/cpl/intl/currency.c
+++ b/reactos/dll/cpl/intl/currency.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: currency.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/currency.c
  * PURPOSE:         Currency property page
diff --git a/reactos/dll/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c
index 388fb4ff852..166899a05ed 100644
--- a/reactos/dll/cpl/intl/date.c
+++ b/reactos/dll/cpl/intl/date.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: date.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/date.c
  * PURPOSE:         Date property page
diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c
index c48e076b7b1..885bd90ef96 100644
--- a/reactos/dll/cpl/intl/generalp.c
+++ b/reactos/dll/cpl/intl/generalp.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: generalp.c 56849 2012-07-07 23:02:14Z fireball $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/generalp.c
  * PURPOSE:         General property page
diff --git a/reactos/dll/cpl/intl/inplocale.c b/reactos/dll/cpl/intl/inplocale.c
index 5eeb6d05c98..0cd3fd12fcd 100644
--- a/reactos/dll/cpl/intl/inplocale.c
+++ b/reactos/dll/cpl/intl/inplocale.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: inplocale.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/inplocale.c
  * PURPOSE:         Input Locale property page
diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
index ea5b82df441..76758edad3d 100644
--- a/reactos/dll/cpl/intl/intl.c
+++ b/reactos/dll/cpl/intl/intl.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: intl.c 54972 2012-01-15 13:37:25Z rharabien $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/intl.c
  * PURPOSE:         Property sheet code
diff --git a/reactos/dll/cpl/intl/numbers.c b/reactos/dll/cpl/intl/numbers.c
index d33a8b8fbb0..2daf993082a 100644
--- a/reactos/dll/cpl/intl/numbers.c
+++ b/reactos/dll/cpl/intl/numbers.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: numbers.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/numbers.c
  * PURPOSE:         Numbers property page
diff --git a/reactos/dll/cpl/intl/sort.c b/reactos/dll/cpl/intl/sort.c
index cefa0915b2a..52a6fad2bbb 100644
--- a/reactos/dll/cpl/intl/sort.c
+++ b/reactos/dll/cpl/intl/sort.c
@@ -1,5 +1,4 @@
-/* $Id: sort.c 52956 2011-07-28 14:54:48Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS International Control Panel
  * FILE:            dll/cpl/intl/sort.c
  * PURPOSE:         Sorting property page
diff --git a/reactos/dll/cpl/liccpa/liccpa.c b/reactos/dll/cpl/liccpa/liccpa.c
index a8d224464e6..860954bcf2c 100644
--- a/reactos/dll/cpl/liccpa/liccpa.c
+++ b/reactos/dll/cpl/liccpa/liccpa.c
@@ -1,5 +1,4 @@
-/* $Id: appearance.c 13406 2005-02-04 20:39:10Z weiden $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS License Manager
  * FILE:            dll/cpl/liccpa/liccpa.c
diff --git a/reactos/dll/cpl/liccpa/liccpa.rc b/reactos/dll/cpl/liccpa/liccpa.rc
index cd33b4bbc90..6e51ca7098b 100644
--- a/reactos/dll/cpl/liccpa/liccpa.rc
+++ b/reactos/dll/cpl/liccpa/liccpa.rc
@@ -1,4 +1,3 @@
-/* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */
 
 #include <windows.h>
 #include "resource.h"
diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c
index 8929524e032..165d66824fb 100644
--- a/reactos/dll/cpl/main/keyboard.c
+++ b/reactos/dll/cpl/main/keyboard.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: keyboard.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Main Control Panel
  * FILE:            dll/cpl/main/keyboard.c
  * PURPOSE:         Keyboard Control Panel
diff --git a/reactos/dll/cpl/main/main.c b/reactos/dll/cpl/main/main.c
index 5cc246b4a92..272aafc52b4 100644
--- a/reactos/dll/cpl/main/main.c
+++ b/reactos/dll/cpl/main/main.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: main.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Sample Control Panel
  * FILE:            dll/cpl/main/main.c
  * PURPOSE:         ReactOS Main Control Panel
diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
index 2e318294ab2..8197e496195 100644
--- a/reactos/dll/cpl/main/mouse.c
+++ b/reactos/dll/cpl/main/mouse.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: mouse.c 56254 2012-03-28 07:09:53Z tkreuzer $
- *
+/*
  * PROJECT:         ReactOS Main Control Panel
  * FILE:            dll/cpl/main/mouse.c
  * PURPOSE:         Mouse Control Panel
diff --git a/reactos/dll/cpl/mmsys/sounds.c b/reactos/dll/cpl/mmsys/sounds.c
index f48d8d272be..868606e4574 100644
--- a/reactos/dll/cpl/mmsys/sounds.c
+++ b/reactos/dll/cpl/mmsys/sounds.c
@@ -1,5 +1,4 @@
-/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
- *
+/*
  * PROJECT:         ReactOS Multimedia Control Panel
  * FILE:            dll/cpl/mmsys/mmsys.c
  * PURPOSE:         ReactOS Multimedia Control Panel
diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c
index efe050a9739..9d1957a0aa9 100644
--- a/reactos/dll/cpl/mmsys/volume.c
+++ b/reactos/dll/cpl/mmsys/volume.c
@@ -1,5 +1,4 @@
-/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $
- *
+/*
  * PROJECT:         ReactOS Multimedia Control Panel
  * FILE:            dll/cpl/mmsys/mmsys.c
  * PURPOSE:         ReactOS Multimedia Control Panel
diff --git a/reactos/dll/cpl/odbccp32/odbccp32.c b/reactos/dll/cpl/odbccp32/odbccp32.c
index 2a8403f96d7..ce77120626b 100644
--- a/reactos/dll/cpl/odbccp32/odbccp32.c
+++ b/reactos/dll/cpl/odbccp32/odbccp32.c
@@ -1,5 +1,4 @@
-/* $Id: odbccp32.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS ODBC Control Panel Applet
  * FILE:            dll/cpl/main/main.c
  * PURPOSE:         applet initialization
diff --git a/reactos/dll/cpl/powercfg/advanced.c b/reactos/dll/cpl/powercfg/advanced.c
index 0b73f6352cb..f615966cc33 100644
--- a/reactos/dll/cpl/powercfg/advanced.c
+++ b/reactos/dll/cpl/powercfg/advanced.c
@@ -1,5 +1,4 @@
-/* $Id: advanced.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/powercfg/advanced.c
diff --git a/reactos/dll/cpl/powercfg/alarms.c b/reactos/dll/cpl/powercfg/alarms.c
index 1d315261574..71f3a2891e7 100644
--- a/reactos/dll/cpl/powercfg/alarms.c
+++ b/reactos/dll/cpl/powercfg/alarms.c
@@ -1,5 +1,4 @@
-/* $Id: alarms.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/powercfg/alarms.c
diff --git a/reactos/dll/cpl/powercfg/hibernate.c b/reactos/dll/cpl/powercfg/hibernate.c
index 94e7cde845d..82f54fac114 100644
--- a/reactos/dll/cpl/powercfg/hibernate.c
+++ b/reactos/dll/cpl/powercfg/hibernate.c
@@ -1,5 +1,4 @@
-/* $Id: hibernate.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/powercfg/hibernate.c
diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c
index 7ef11c1986b..9e5b441e3ac 100644
--- a/reactos/dll/cpl/powercfg/powercfg.c
+++ b/reactos/dll/cpl/powercfg/powercfg.c
@@ -1,5 +1,4 @@
-/* $Id: powercfg.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/powercfg/powershemes.c
diff --git a/reactos/dll/cpl/powercfg/powershemes.c b/reactos/dll/cpl/powercfg/powershemes.c
index d4bf28735cf..7a6b3fd50c3 100644
--- a/reactos/dll/cpl/powercfg/powershemes.c
+++ b/reactos/dll/cpl/powercfg/powershemes.c
@@ -1,5 +1,4 @@
-/* $Id: powershemes.c 54535 2011-11-29 14:55:58Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS Power Configuration Applet
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            dll/cpl/powercfg/powershemes.c
diff --git a/reactos/dll/cpl/usrmgr/extra.c b/reactos/dll/cpl/usrmgr/extra.c
index c057b1380c3..cf9b7c7280f 100644
--- a/reactos/dll/cpl/usrmgr/extra.c
+++ b/reactos/dll/cpl/usrmgr/extra.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS User Manager Control Panel
  * FILE:            dll/cpl/usrmgr/extra.c
diff --git a/reactos/dll/cpl/usrmgr/usrmgr.c b/reactos/dll/cpl/usrmgr/usrmgr.c
index 527af2e5375..2668e18a5c7 100644
--- a/reactos/dll/cpl/usrmgr/usrmgr.c
+++ b/reactos/dll/cpl/usrmgr/usrmgr.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS User Manager Control Panel
  * FILE:            dll/cpl/usrmgr/usrmgr.c
diff --git a/reactos/dll/directx/d3d8/d3d8.rc b/reactos/dll/directx/d3d8/d3d8.rc
index 7856196638f..9030b032e64 100644
--- a/reactos/dll/directx/d3d8/d3d8.rc
+++ b/reactos/dll/directx/d3d8/d3d8.rc
@@ -1,4 +1,3 @@
-/* $Id: d3d8.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
diff --git a/reactos/dll/directx/d3d9/d3d9.rc b/reactos/dll/directx/d3d9/d3d9.rc
index 34b108b141a..0f08fb03693 100644
--- a/reactos/dll/directx/d3d9/d3d9.rc
+++ b/reactos/dll/directx/d3d9/d3d9.rc
@@ -1,4 +1,3 @@
-/* $Id: d3d9.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
diff --git a/reactos/dll/directx/ddraw/Clipper/clipper_main.c b/reactos/dll/directx/ddraw/Clipper/clipper_main.c
index 76b4874679c..77f3e949d64 100644
--- a/reactos/dll/directx/ddraw/Clipper/clipper_main.c
+++ b/reactos/dll/directx/ddraw/Clipper/clipper_main.c
@@ -1,5 +1,4 @@
-/* $Id: clipper_main.c 36519 2008-09-25 19:26:09Z tkreuzer $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/clipper/clipper_stubs.c
diff --git a/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c b/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c
index 6f0714902f5..cc39ee4ed64 100644
--- a/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c
+++ b/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/clipper/clipper_stubs.c
diff --git a/reactos/dll/directx/ddraw/Color/color_stubs.c b/reactos/dll/directx/ddraw/Color/color_stubs.c
index c4fd61187d9..776832b80dd 100644
--- a/reactos/dll/directx/ddraw/Color/color_stubs.c
+++ b/reactos/dll/directx/ddraw/Color/color_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/color/color.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/GetCaps.c b/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
index 567672b8d54..fa0316609dd 100644
--- a/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
+++ b/reactos/dll/directx/ddraw/Ddraw/GetCaps.c
@@ -1,5 +1,4 @@
-/* $Id: GetCaps.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/GetCaps.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c b/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
index 5f2fdeae971..105430a8d41 100644
--- a/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
+++ b/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
@@ -1,5 +1,4 @@
-/* $Id: GetDeviceIdentifier.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/GetDeviceIdentifier.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c b/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
index 57c30e346d8..08bdaf04d68 100644
--- a/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
+++ b/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/callbacks_dd_hel.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
index 633286c6724..ccd655a2fe7 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
@@ -1,5 +1,4 @@
-/* $Id: ddraw_displaymode.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/ddraw_displaymode.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
index 4f01b33d10c..5f3355ed35d 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
@@ -1,5 +1,4 @@
-/* $Id: ddraw_main.c 49872 2010-11-30 16:29:49Z fireball $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/ddraw_main.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
index 17dfd6f809b..21b98e02c58 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c
@@ -1,5 +1,4 @@
-/* $Id: ddraw_setcooperativelevel.c 40864 2009-05-09 12:27:40Z dchapyshev $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/ddraw_main.c
diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
index 17e00c2d833..7b152485c99 100644
--- a/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
+++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: ddraw_stubs.c 49872 2010-11-30 16:29:49Z fireball $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/ddraw/ddraw_stubs.c
diff --git a/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c b/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c
index 4dd97510f32..5069c7f0afd 100644
--- a/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c
+++ b/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/gamma/gamma_stubs.c
diff --git a/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c b/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c
index 16e30ff78f5..add4f04879a 100644
--- a/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c
+++ b/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/kernel/kernel_stubs.c
diff --git a/reactos/dll/directx/ddraw/Palette/createpalette.c b/reactos/dll/directx/ddraw/Palette/createpalette.c
index 87bb0a9f141..1b3929c0d29 100644
--- a/reactos/dll/directx/ddraw/Palette/createpalette.c
+++ b/reactos/dll/directx/ddraw/Palette/createpalette.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/surface/createsurface.c
diff --git a/reactos/dll/directx/ddraw/Palette/palette.c b/reactos/dll/directx/ddraw/Palette/palette.c
index c366be9206c..1c5bad67406 100644
--- a/reactos/dll/directx/ddraw/Palette/palette.c
+++ b/reactos/dll/directx/ddraw/Palette/palette.c
@@ -1,5 +1,4 @@
-/* $Id: palette.c $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/Palette/palette.c
diff --git a/reactos/dll/directx/ddraw/Palette/palette_stubs.c b/reactos/dll/directx/ddraw/Palette/palette_stubs.c
index 07590f46411..a0ab80cbf56 100644
--- a/reactos/dll/directx/ddraw/Palette/palette_stubs.c
+++ b/reactos/dll/directx/ddraw/Palette/palette_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/palette/palette_stubs.c
diff --git a/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c b/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
index 5a31199f72b..7d8bda38005 100644
--- a/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
+++ b/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/surface/callbacks_surf_hel.c
diff --git a/reactos/dll/directx/ddraw/Surface/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c
index d6d95579a3d..be030e0172f 100644
--- a/reactos/dll/directx/ddraw/Surface/createsurface.c
+++ b/reactos/dll/directx/ddraw/Surface/createsurface.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/surface/createsurface.c
diff --git a/reactos/dll/directx/ddraw/Surface/surface_main.c b/reactos/dll/directx/ddraw/Surface/surface_main.c
index 096be26a3b8..03bdbaa93e1 100644
--- a/reactos/dll/directx/ddraw/Surface/surface_main.c
+++ b/reactos/dll/directx/ddraw/Surface/surface_main.c
@@ -1,5 +1,4 @@
-/* $Id: surface_main.c 49872 2010-11-30 16:29:49Z fireball $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/surface/surface_main.c
diff --git a/reactos/dll/directx/ddraw/Surface/surface_stubs.c b/reactos/dll/directx/ddraw/Surface/surface_stubs.c
index f21a0462603..ffe2d992b04 100644
--- a/reactos/dll/directx/ddraw/Surface/surface_stubs.c
+++ b/reactos/dll/directx/ddraw/Surface/surface_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: surface_stubs.c 37917 2008-12-07 21:48:44Z dgorbachev $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/surface/surface_stubs.c
diff --git a/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c b/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c
index f40f03c063e..0fba94ff9cf 100644
--- a/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c
+++ b/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c
@@ -1,5 +1,4 @@
-/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS DirectX
  * FILE:                 ddraw/videoport/videoport_stubs.c
diff --git a/reactos/dll/directx/ddraw/cleanup.c b/reactos/dll/directx/ddraw/cleanup.c
index 5b6d70974e6..2e011d8a497 100644
--- a/reactos/dll/directx/ddraw/cleanup.c
+++ b/reactos/dll/directx/ddraw/cleanup.c
@@ -1,5 +1,4 @@
-/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/ddraw/ddraw.c
diff --git a/reactos/dll/directx/ddraw/ddraw.rc b/reactos/dll/directx/ddraw/ddraw.rc
index 294d53e021e..5e773bc8910 100644
--- a/reactos/dll/directx/ddraw/ddraw.rc
+++ b/reactos/dll/directx/ddraw/ddraw.rc
@@ -1,4 +1,3 @@
-/* $Id: ddraw.rc 33008 2008-04-17 19:15:43Z greatlrd $ */
 
 #include "resource.h"
 
diff --git a/reactos/dll/directx/ddraw/main.c b/reactos/dll/directx/ddraw/main.c
index 3a90f953c40..447eaebb074 100644
--- a/reactos/dll/directx/ddraw/main.c
+++ b/reactos/dll/directx/ddraw/main.c
@@ -1,6 +1,4 @@
-
-/* $Id: main.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/ddraw/ddraw.c
diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c
index 6a5c6ba9d33..e838959e443 100644
--- a/reactos/dll/directx/ddraw/startup.c
+++ b/reactos/dll/directx/ddraw/startup.c
@@ -1,5 +1,4 @@
-/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $
- *
+/*
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
  * FILE:                 lib/ddraw/ddraw.c
diff --git a/reactos/dll/shellext/slayer/slayer.c b/reactos/dll/shellext/slayer/slayer.c
index a9df768389c..ee2260ce320 100644
--- a/reactos/dll/shellext/slayer/slayer.c
+++ b/reactos/dll/shellext/slayer/slayer.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: slayer.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS Compatibility Layer Shell Extension
  * FILE:            lib/shellext/cplsample/cplsample.c
  * PURPOSE:         ReactOS Compatibility Layer Shell Extension

From faa356b8e50a657ccd5d2edff3a5f3e1b412931a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 20:41:13 +0000
Subject: [PATCH 60/61] Remove the unneeded $Id$ blabla from the source code,
 but not in 3rd party code. (Part 7/8)

svn path=/trunk/; revision=58526
---
 reactos/dll/win32/aclui/aclui.c              |  3 +--
 reactos/dll/win32/aclui/checklist.c          |  3 +--
 reactos/dll/win32/aclui/misc.c               |  3 +--
 reactos/dll/win32/aclui/sidcache.c           |  3 +--
 reactos/dll/win32/advapi32/misc/dllmain.c    |  3 +--
 reactos/dll/win32/advapi32/sec/ac.c          |  3 +--
 reactos/dll/win32/advapi32/sec/audit.c       |  3 +--
 reactos/dll/win32/advapi32/sec/sec.c         |  3 +--
 reactos/dll/win32/advapi32/sec/trustee.c     |  3 +--
 reactos/dll/win32/advapi32/token/privilege.c |  3 +--
 reactos/dll/win32/devmgr/devprblm.c          |  3 +--
 reactos/dll/win32/devmgr/hwpage.c            |  3 +--
 reactos/dll/win32/devmgr/misc.c              |  3 +--
 reactos/dll/win32/dhcpcsvc/dhcp/api.c        |  3 +--
 reactos/dll/win32/dhcpcsvc/dhcp/pipe.c       |  3 +--
 reactos/dll/win32/hid/hid.c                  |  3 +--
 reactos/dll/win32/hid/stubs.c                |  3 +--
 reactos/dll/win32/iprtprio/iprtprio.rc       |  1 -
 reactos/dll/win32/msgina/stubs.c             |  3 +--
 reactos/dll/win32/mswsock/extensions.c       | 13 ++++++-------
 reactos/dll/win32/mswsock/stubs.c            | 13 ++++++-------
 reactos/dll/win32/ntmarta/ntmarta.c          |  3 +--
 reactos/dll/win32/psapi/internal.h           |  2 --
 reactos/dll/win32/psapi/malloc.c             |  2 --
 reactos/dll/win32/psapi/psapi.c              |  2 --
 reactos/dll/win32/samlib/dllmain.c           |  3 +--
 reactos/dll/win32/samlib/samlib.c            |  3 +--
 reactos/dll/win32/secur32/dllmain.c          |  3 +--
 reactos/dll/win32/smdll/dllmain.c            |  3 +--
 reactos/dll/win32/smdll/query.c              |  3 +--
 reactos/dll/win32/smdll/readme.txt           |  1 -
 reactos/dll/win32/syssetup/dllmain.c         |  3 +--
 reactos/dll/win32/userenv/desktop.c          |  3 +--
 reactos/dll/win32/userenv/directory.c        |  3 +--
 reactos/dll/win32/userenv/environment.c      |  3 +--
 reactos/dll/win32/userenv/internal.h         |  3 +--
 reactos/dll/win32/userenv/misc.c             |  3 +--
 reactos/dll/win32/userenv/registry.c         |  3 +--
 reactos/dll/win32/userenv/resources.h        |  3 +--
 reactos/dll/win32/userenv/setup.c            |  3 +--
 reactos/dll/win32/userenv/userenv.c          |  3 +--
 reactos/dll/win32/winfax/winfax.c            |  3 +--
 reactos/dll/win32/winscard/winscard.c        |  3 +--
 reactos/dll/win32/winscard/winscard.rc       |  1 -
 reactos/dll/win32/winspool/stubs.c           |  3 +--
 reactos/dll/win32/wsock32/stubs.c            |  3 +--
 46 files changed, 50 insertions(+), 99 deletions(-)

diff --git a/reactos/dll/win32/aclui/aclui.c b/reactos/dll/win32/aclui/aclui.c
index 60b5928bbe8..53c32d38dd8 100644
--- a/reactos/dll/win32/aclui/aclui.c
+++ b/reactos/dll/win32/aclui/aclui.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: aclui.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/aclui.c
  * PURPOSE:         Access Control List Editor
diff --git a/reactos/dll/win32/aclui/checklist.c b/reactos/dll/win32/aclui/checklist.c
index d3157068564..f81e453a42f 100644
--- a/reactos/dll/win32/aclui/checklist.c
+++ b/reactos/dll/win32/aclui/checklist.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: checklist.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/checklist.c
  * PURPOSE:         Access Control List Editor
diff --git a/reactos/dll/win32/aclui/misc.c b/reactos/dll/win32/aclui/misc.c
index 9b18af8e2fd..59f7605b851 100644
--- a/reactos/dll/win32/aclui/misc.c
+++ b/reactos/dll/win32/aclui/misc.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/misc.c
  * PURPOSE:         Access Control List Editor
diff --git a/reactos/dll/win32/aclui/sidcache.c b/reactos/dll/win32/aclui/sidcache.c
index 7e5ab9b514d..b396ed1a060 100644
--- a/reactos/dll/win32/aclui/sidcache.c
+++ b/reactos/dll/win32/aclui/sidcache.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: aclui.c 19715 2005-11-28 01:10:49Z weiden $
- *
+/*
  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/sidcache.c
  * PURPOSE:         Access Control List Editor
diff --git a/reactos/dll/win32/advapi32/misc/dllmain.c b/reactos/dll/win32/advapi32/misc/dllmain.c
index fc6b3498fd9..97ae6d0176b 100644
--- a/reactos/dll/win32/advapi32/misc/dllmain.c
+++ b/reactos/dll/win32/advapi32/misc/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 53225 2011-08-14 11:31:23Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/misc/dllmain.c
diff --git a/reactos/dll/win32/advapi32/sec/ac.c b/reactos/dll/win32/advapi32/sec/ac.c
index 42472c9e4fc..65b22c26c17 100644
--- a/reactos/dll/win32/advapi32/sec/ac.c
+++ b/reactos/dll/win32/advapi32/sec/ac.c
@@ -1,5 +1,4 @@
-/* $Id: ac.c 57331 2012-09-19 02:32:58Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/sec/ac.c
diff --git a/reactos/dll/win32/advapi32/sec/audit.c b/reactos/dll/win32/advapi32/sec/audit.c
index dc631ed4d5c..c3b836cb1c0 100644
--- a/reactos/dll/win32/advapi32/sec/audit.c
+++ b/reactos/dll/win32/advapi32/sec/audit.c
@@ -1,5 +1,4 @@
-/* $Id: audit.c 56877 2012-07-12 19:48:30Z tfaber $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/sec/audit.c
diff --git a/reactos/dll/win32/advapi32/sec/sec.c b/reactos/dll/win32/advapi32/sec/sec.c
index 7292f3e68e7..d62edc39481 100644
--- a/reactos/dll/win32/advapi32/sec/sec.c
+++ b/reactos/dll/win32/advapi32/sec/sec.c
@@ -1,5 +1,4 @@
-/* $Id: sec.c 56451 2012-04-29 21:39:32Z ekohl $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/sec/sec.c
diff --git a/reactos/dll/win32/advapi32/sec/trustee.c b/reactos/dll/win32/advapi32/sec/trustee.c
index b4611cfed80..9b62f7954aa 100644
--- a/reactos/dll/win32/advapi32/sec/trustee.c
+++ b/reactos/dll/win32/advapi32/sec/trustee.c
@@ -1,5 +1,4 @@
-/* $Id: trustee.c 53225 2011-08-14 11:31:23Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/sec/trustee.c
diff --git a/reactos/dll/win32/advapi32/token/privilege.c b/reactos/dll/win32/advapi32/token/privilege.c
index aaaaacc9533..2b0762a1711 100644
--- a/reactos/dll/win32/advapi32/token/privilege.c
+++ b/reactos/dll/win32/advapi32/token/privilege.c
@@ -1,5 +1,4 @@
-/* $Id: privilege.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/token/privilege.c
diff --git a/reactos/dll/win32/devmgr/devprblm.c b/reactos/dll/win32/devmgr/devprblm.c
index ac432499128..d578b68614e 100644
--- a/reactos/dll/win32/devmgr/devprblm.c
+++ b/reactos/dll/win32/devmgr/devprblm.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: hwpage.c 19599 2005-11-26 02:12:58Z weiden $
- *
+/*
  * PROJECT:         ReactOS devmgr.dll
  * FILE:            lib/devmgr/devprblm.c
  * PURPOSE:         ReactOS Device Manager
diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c
index b580308288b..82ee053340c 100644
--- a/reactos/dll/win32/devmgr/hwpage.c
+++ b/reactos/dll/win32/devmgr/hwpage.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: hwpage.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS devmgr.dll
  * FILE:            lib/devmgr/hwpage.c
  * PURPOSE:         ReactOS Device Manager
diff --git a/reactos/dll/win32/devmgr/misc.c b/reactos/dll/win32/devmgr/misc.c
index a4a70c534ff..550ea9f21fe 100644
--- a/reactos/dll/win32/devmgr/misc.c
+++ b/reactos/dll/win32/devmgr/misc.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: devmgr.c 12852 2005-01-06 13:58:04Z mf $
- *
+/*
  * PROJECT:         ReactOS devmgr.dll
  * FILE:            lib/devmgr/misc.c
  * PURPOSE:         ReactOS Device Manager
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/api.c b/reactos/dll/win32/dhcpcsvc/dhcp/api.c
index 7e8a2b9f4cc..62fd2c56551 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcp/api.c
+++ b/reactos/dll/win32/dhcpcsvc/dhcp/api.c
@@ -1,5 +1,4 @@
-/* $Id: $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             subsys/system/dhcp/api.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c b/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
index d9ac7db6298..aff1812675c 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
+++ b/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
@@ -1,5 +1,4 @@
-/* $Id: $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             subsys/system/dhcp/pipe.c
diff --git a/reactos/dll/win32/hid/hid.c b/reactos/dll/win32/hid/hid.c
index 05ff0ac7e60..ea9aeab18f4 100644
--- a/reactos/dll/win32/hid/hid.c
+++ b/reactos/dll/win32/hid/hid.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: hid.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * PROJECT:         ReactOS Hid User Library
  * FILE:            lib/hid/hid.c
  * PURPOSE:         ReactOS Hid User Library
diff --git a/reactos/dll/win32/hid/stubs.c b/reactos/dll/win32/hid/stubs.c
index fca1934dfea..ecb87f72235 100644
--- a/reactos/dll/win32/hid/stubs.c
+++ b/reactos/dll/win32/hid/stubs.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Hid User Library
  * FILE:            lib/hid/stubs.c
diff --git a/reactos/dll/win32/iprtprio/iprtprio.rc b/reactos/dll/win32/iprtprio/iprtprio.rc
index bd2d2df2b37..568748a2ea7 100644
--- a/reactos/dll/win32/iprtprio/iprtprio.rc
+++ b/reactos/dll/win32/iprtprio/iprtprio.rc
@@ -1,4 +1,3 @@
-/* $Id: iprtprio.rc 23585 2006-08-14 21:48:55Z gedmurphy $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS IP Route Priority API DLL\0"
diff --git a/reactos/dll/win32/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
index a5253b61ceb..19fd551e2b8 100644
--- a/reactos/dll/win32/msgina/stubs.c
+++ b/reactos/dll/win32/msgina/stubs.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 58363 2013-02-24 19:44:41Z ekohl $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS msgina.dll
  * FILE:            lib/msgina/stubs.c
diff --git a/reactos/dll/win32/mswsock/extensions.c b/reactos/dll/win32/mswsock/extensions.c
index acb7ba07794..30642672b97 100644
--- a/reactos/dll/win32/mswsock/extensions.c
+++ b/reactos/dll/win32/mswsock/extensions.c
@@ -1,10 +1,9 @@
-/* $Id: stubs.c 12852 2005-01-06 13:58:04Z mf $
- *
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS WinSock DLL
- * FILE:        stubs.c
- * PURPOSE:     WSAIoctl wrappers for Microsoft extensions to Winsock
- * PROGRAMMERS: KJK::Hyperion <hackbunny@reactos.com>
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS WinSock DLL
+ * FILE:            stubs.c
+ * PURPOSE:         WSAIoctl wrappers for Microsoft extensions to Winsock
+ * PROGRAMMERS:     KJK::Hyperion <hackbunny@reactos.com>
  * REVISIONS:
  */
 
diff --git a/reactos/dll/win32/mswsock/stubs.c b/reactos/dll/win32/mswsock/stubs.c
index f36dd3db093..7661bee08fb 100644
--- a/reactos/dll/win32/mswsock/stubs.c
+++ b/reactos/dll/win32/mswsock/stubs.c
@@ -1,10 +1,9 @@
-/* $Id: stubs.c 53180 2011-08-11 15:07:19Z akhaldi $
- *
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS WinSock DLL
- * FILE:        stubs.c
- * PURPOSE:     Stub functions
- * PROGRAMMERS: Ge van Geldorp (ge@gse.nl)
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS WinSock DLL
+ * FILE:            stubs.c
+ * PURPOSE:         Stub functions
+ * PROGRAMMERS:     Ge van Geldorp (ge@gse.nl)
  * REVISIONS:
  */
 
diff --git a/reactos/dll/win32/ntmarta/ntmarta.c b/reactos/dll/win32/ntmarta/ntmarta.c
index 251b6f54882..e45f1e596a3 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.c
+++ b/reactos/dll/win32/ntmarta/ntmarta.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: ntmarta.c 31176 2007-12-12 07:04:12Z weiden $
- *
+/*
  * PROJECT:         ReactOS MARTA provider
  * FILE:            lib/ntmarta/ntmarta.c
  * PURPOSE:         ReactOS MARTA provider
diff --git a/reactos/dll/win32/psapi/internal.h b/reactos/dll/win32/psapi/internal.h
index 6ae39524cdb..8d6245ba999 100644
--- a/reactos/dll/win32/psapi/internal.h
+++ b/reactos/dll/win32/psapi/internal.h
@@ -1,5 +1,3 @@
-/* $Id: internal.h 21298 2006-03-12 00:08:41Z jimtabor $
-*/
 /*
  * epsapi.h
  *
diff --git a/reactos/dll/win32/psapi/malloc.c b/reactos/dll/win32/psapi/malloc.c
index ade59502616..49357e6b61c 100644
--- a/reactos/dll/win32/psapi/malloc.c
+++ b/reactos/dll/win32/psapi/malloc.c
@@ -1,5 +1,3 @@
-/* $Id: malloc.c 37763 2008-11-30 11:42:05Z sginsberg $
- */
 /*
  * COPYRIGHT:   None
  * LICENSE:     Public domain
diff --git a/reactos/dll/win32/psapi/psapi.c b/reactos/dll/win32/psapi/psapi.c
index 4803e802764..12a3ba03bab 100644
--- a/reactos/dll/win32/psapi/psapi.c
+++ b/reactos/dll/win32/psapi/psapi.c
@@ -1,5 +1,3 @@
-/* $Id: psapi.c 44602 2009-12-15 15:16:01Z tkreuzer $
- */
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * LICENSE:     See LGPL.txt in the top level directory
diff --git a/reactos/dll/win32/samlib/dllmain.c b/reactos/dll/win32/samlib/dllmain.c
index 83ee5028591..4e66cebdcfd 100644
--- a/reactos/dll/win32/samlib/dllmain.c
+++ b/reactos/dll/win32/samlib/dllmain.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: dllmain.c 56648 2012-05-21 13:38:32Z ekohl $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
  * PURPOSE:           SAM interface library
diff --git a/reactos/dll/win32/samlib/samlib.c b/reactos/dll/win32/samlib/samlib.c
index 59b37f49606..9225a8708b2 100644
--- a/reactos/dll/win32/samlib/samlib.c
+++ b/reactos/dll/win32/samlib/samlib.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: samlib.c 58259 2013-02-01 22:18:28Z ekohl $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
  * PURPOSE:           SAM interface library
diff --git a/reactos/dll/win32/secur32/dllmain.c b/reactos/dll/win32/secur32/dllmain.c
index 69b25171a1c..481cc5c2b2c 100644
--- a/reactos/dll/win32/secur32/dllmain.c
+++ b/reactos/dll/win32/secur32/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/secur32/lsa.c
diff --git a/reactos/dll/win32/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c
index 1ecd476a801..604f8944d40 100644
--- a/reactos/dll/win32/smdll/dllmain.c
+++ b/reactos/dll/win32/smdll/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS
  * FILE:            lib/smdll/dllmain.c
diff --git a/reactos/dll/win32/smdll/query.c b/reactos/dll/win32/smdll/query.c
index 650e721d6b3..a26e8b7b1c9 100644
--- a/reactos/dll/win32/smdll/query.c
+++ b/reactos/dll/win32/smdll/query.c
@@ -1,5 +1,4 @@
-/* $Id: query.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/smdll/query.c
diff --git a/reactos/dll/win32/smdll/readme.txt b/reactos/dll/win32/smdll/readme.txt
index 512dbaa53b3..d5551610031 100644
--- a/reactos/dll/win32/smdll/readme.txt
+++ b/reactos/dll/win32/smdll/readme.txt
@@ -1,4 +1,3 @@
-$Id: readme.txt 58335 2013-02-17 15:06:22Z tkreuzer $
 
 This is SMDLL: a helper library to talk to the ReactOS session manager (SM).
 
diff --git a/reactos/dll/win32/syssetup/dllmain.c b/reactos/dll/win32/syssetup/dllmain.c
index 6e444477192..731a784ab90 100644
--- a/reactos/dll/win32/syssetup/dllmain.c
+++ b/reactos/dll/win32/syssetup/dllmain.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: dllmain.c 54383 2011-11-15 08:44:37Z rharabien $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
  * PURPOSE:           Main file
diff --git a/reactos/dll/win32/userenv/desktop.c b/reactos/dll/win32/userenv/desktop.c
index 5605fd61d94..1cc1a8c2cd4 100644
--- a/reactos/dll/win32/userenv/desktop.c
+++ b/reactos/dll/win32/userenv/desktop.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: desktop.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/desktop.c
diff --git a/reactos/dll/win32/userenv/directory.c b/reactos/dll/win32/userenv/directory.c
index 9f7f8f544a9..c42030b5b21 100644
--- a/reactos/dll/win32/userenv/directory.c
+++ b/reactos/dll/win32/userenv/directory.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: directory.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/directory.c
diff --git a/reactos/dll/win32/userenv/environment.c b/reactos/dll/win32/userenv/environment.c
index e2e3bbb825f..c07db234bcb 100644
--- a/reactos/dll/win32/userenv/environment.c
+++ b/reactos/dll/win32/userenv/environment.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: environment.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/environment.c
diff --git a/reactos/dll/win32/userenv/internal.h b/reactos/dll/win32/userenv/internal.h
index 8e7482e7fda..07c14980663 100644
--- a/reactos/dll/win32/userenv/internal.h
+++ b/reactos/dll/win32/userenv/internal.h
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: internal.h 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/internal.h
diff --git a/reactos/dll/win32/userenv/misc.c b/reactos/dll/win32/userenv/misc.c
index 3d02597f918..92e66c126f8 100644
--- a/reactos/dll/win32/userenv/misc.c
+++ b/reactos/dll/win32/userenv/misc.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: misc.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/misc.c
diff --git a/reactos/dll/win32/userenv/registry.c b/reactos/dll/win32/userenv/registry.c
index 0e8486dc37f..cd822f8af1f 100644
--- a/reactos/dll/win32/userenv/registry.c
+++ b/reactos/dll/win32/userenv/registry.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: registry.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/registry.c
diff --git a/reactos/dll/win32/userenv/resources.h b/reactos/dll/win32/userenv/resources.h
index 3932e6dc83e..a78cd0a4a6b 100644
--- a/reactos/dll/win32/userenv/resources.h
+++ b/reactos/dll/win32/userenv/resources.h
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: resources.h 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/resource.h
diff --git a/reactos/dll/win32/userenv/setup.c b/reactos/dll/win32/userenv/setup.c
index 247f40efd2b..f662110982b 100644
--- a/reactos/dll/win32/userenv/setup.c
+++ b/reactos/dll/win32/userenv/setup.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: setup.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/setup.c
diff --git a/reactos/dll/win32/userenv/userenv.c b/reactos/dll/win32/userenv/userenv.c
index 4c91acfccec..6295fd7fae3 100644
--- a/reactos/dll/win32/userenv/userenv.c
+++ b/reactos/dll/win32/userenv/userenv.c
@@ -16,8 +16,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* $Id: userenv.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/userenv/userenv.c
diff --git a/reactos/dll/win32/winfax/winfax.c b/reactos/dll/win32/winfax/winfax.c
index 3e3530c33bd..3576b7ad893 100644
--- a/reactos/dll/win32/winfax/winfax.c
+++ b/reactos/dll/win32/winfax/winfax.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: winfax.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS FAX API Support
  * FILE:            lib/winfax/winfax.c
  * PURPOSE:         ReactOS FAX API Support
diff --git a/reactos/dll/win32/winscard/winscard.c b/reactos/dll/win32/winscard/winscard.c
index f5201fc4fb4..e2eb7557c0d 100644
--- a/reactos/dll/win32/winscard/winscard.c
+++ b/reactos/dll/win32/winscard/winscard.c
@@ -16,8 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-/* $Id: winscard.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * PROJECT:         ReactOS SmartCard API
  * FILE:            lib/winscard/winscard.c
  * PURPOSE:         ReactOS SmartCard API
diff --git a/reactos/dll/win32/winscard/winscard.rc b/reactos/dll/win32/winscard/winscard.rc
index 26a49a02171..19959dca71c 100644
--- a/reactos/dll/win32/winscard/winscard.rc
+++ b/reactos/dll/win32/winscard/winscard.rc
@@ -1,4 +1,3 @@
-/* $Id: winscard.rc 22413 2006-06-19 12:43:39Z gedmurphy $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SmartCard API\0"
diff --git a/reactos/dll/win32/winspool/stubs.c b/reactos/dll/win32/winspool/stubs.c
index 7ffcc9d98a6..35c4518c3ac 100644
--- a/reactos/dll/win32/winspool/stubs.c
+++ b/reactos/dll/win32/winspool/stubs.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS winspool DRV
  * FILE:        stubs.c
diff --git a/reactos/dll/win32/wsock32/stubs.c b/reactos/dll/win32/wsock32/stubs.c
index d6d70a36f3f..fb64df3ff2a 100644
--- a/reactos/dll/win32/wsock32/stubs.c
+++ b/reactos/dll/win32/wsock32/stubs.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS WinSock DLL
  * FILE:        stubs.c

From 582d211b8fadf187107586efff4b4b172ebd7364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 16 Mar 2013 20:48:10 +0000
Subject: [PATCH 61/61] Remove the unneeded $Id$ blabla from the source code.
 (Part 8/8) Done !!

svn path=/trunk/; revision=58527
---
 reactos/dll/win32/kernel32/client/dllmain.c       | 3 +--
 reactos/dll/win32/kernel32/client/dosdev.c        | 3 +--
 reactos/dll/win32/kernel32/client/environ.c       | 3 +--
 reactos/dll/win32/kernel32/client/except.c        | 3 +--
 reactos/dll/win32/kernel32/client/file/backup.c   | 3 +--
 reactos/dll/win32/kernel32/client/file/cnotify.c  | 3 +--
 reactos/dll/win32/kernel32/client/file/console.c  | 3 +--
 reactos/dll/win32/kernel32/client/file/copy.c     | 3 +--
 reactos/dll/win32/kernel32/client/file/create.c   | 3 +--
 reactos/dll/win32/kernel32/client/file/delete.c   | 3 +--
 reactos/dll/win32/kernel32/client/file/dir.c      | 3 +--
 reactos/dll/win32/kernel32/client/file/fileinfo.c | 3 +--
 reactos/dll/win32/kernel32/client/file/filename.c | 3 +--
 reactos/dll/win32/kernel32/client/file/hardlink.c | 3 +--
 reactos/dll/win32/kernel32/client/file/iocompl.c  | 3 +--
 reactos/dll/win32/kernel32/client/file/lfile.c    | 3 +--
 reactos/dll/win32/kernel32/client/file/lock.c     | 3 +--
 reactos/dll/win32/kernel32/client/file/mailslot.c | 3 +--
 reactos/dll/win32/kernel32/client/file/move.c     | 3 +--
 reactos/dll/win32/kernel32/client/file/rw.c       | 3 +--
 reactos/dll/win32/kernel32/client/file/tape.c     | 3 +--
 reactos/dll/win32/kernel32/client/file/volume.c   | 3 +--
 reactos/dll/win32/kernel32/client/job.c           | 3 +--
 reactos/dll/win32/kernel32/client/proc.c          | 3 +--
 reactos/dll/win32/kernel32/client/time.c          | 3 +--
 reactos/dll/win32/kernel32/client/toolhelp.c      | 3 +--
 reactos/dll/win32/kernel32/wine/lzexpand.c        | 3 +--
 reactos/dll/win32/kernel32/wine/muldiv.c          | 3 +--
 reactos/dll/win32/kernel32/wine/timezone.c        | 3 +--
 reactos/dll/win32/kernel32/winnls/string/nls.c    | 3 +--
 30 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/reactos/dll/win32/kernel32/client/dllmain.c b/reactos/dll/win32/kernel32/client/dllmain.c
index 04c5cff7452..15e3ea00e98 100644
--- a/reactos/dll/win32/kernel32/client/dllmain.c
+++ b/reactos/dll/win32/kernel32/client/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 56414 2012-04-25 10:17:29Z tfaber $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/dllmain.c
diff --git a/reactos/dll/win32/kernel32/client/dosdev.c b/reactos/dll/win32/kernel32/client/dosdev.c
index 7bfb6cd8f9f..ebd243ca543 100644
--- a/reactos/dll/win32/kernel32/client/dosdev.c
+++ b/reactos/dll/win32/kernel32/client/dosdev.c
@@ -1,5 +1,4 @@
-/* $Id: dosdev.c 54326 2011-11-07 00:18:13Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/dosdev.c
diff --git a/reactos/dll/win32/kernel32/client/environ.c b/reactos/dll/win32/kernel32/client/environ.c
index cbc3b1ea775..8948980633a 100644
--- a/reactos/dll/win32/kernel32/client/environ.c
+++ b/reactos/dll/win32/kernel32/client/environ.c
@@ -1,5 +1,4 @@
-/* $Id: environ.c 54459 2011-11-20 17:00:39Z pschweitzer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/env.c
diff --git a/reactos/dll/win32/kernel32/client/except.c b/reactos/dll/win32/kernel32/client/except.c
index 4dc0eaf8a40..9e6e63c900e 100644
--- a/reactos/dll/win32/kernel32/client/except.c
+++ b/reactos/dll/win32/kernel32/client/except.c
@@ -1,5 +1,4 @@
-/* $Id: except.c 57269 2012-09-11 03:50:20Z mnordell $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/except.c
diff --git a/reactos/dll/win32/kernel32/client/file/backup.c b/reactos/dll/win32/kernel32/client/file/backup.c
index 8162d511e44..14b4b811893 100644
--- a/reactos/dll/win32/kernel32/client/file/backup.c
+++ b/reactos/dll/win32/kernel32/client/file/backup.c
@@ -1,5 +1,4 @@
-/* $Id: backup.c 48475 2010-08-07 05:02:58Z sir_richard $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/backup.c
diff --git a/reactos/dll/win32/kernel32/client/file/cnotify.c b/reactos/dll/win32/kernel32/client/file/cnotify.c
index 2bc7d9740ce..eb28c5ce9be 100644
--- a/reactos/dll/win32/kernel32/client/file/cnotify.c
+++ b/reactos/dll/win32/kernel32/client/file/cnotify.c
@@ -1,5 +1,4 @@
-/* $Id: cnotify.c 55801 2012-02-21 23:27:45Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/find.c
diff --git a/reactos/dll/win32/kernel32/client/file/console.c b/reactos/dll/win32/kernel32/client/file/console.c
index de9208a9dd1..716beb31004 100644
--- a/reactos/dll/win32/kernel32/client/file/console.c
+++ b/reactos/dll/win32/kernel32/client/file/console.c
@@ -1,5 +1,4 @@
-/* $Id: console.c 55081 2012-01-22 22:27:08Z gadamopoulos $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/misc/console.c
diff --git a/reactos/dll/win32/kernel32/client/file/copy.c b/reactos/dll/win32/kernel32/client/file/copy.c
index b123cce38e6..47b81995335 100644
--- a/reactos/dll/win32/kernel32/client/file/copy.c
+++ b/reactos/dll/win32/kernel32/client/file/copy.c
@@ -1,5 +1,4 @@
-/* $Id: copy.c 55885 2012-02-27 17:10:44Z sir_richard $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/copy.c
diff --git a/reactos/dll/win32/kernel32/client/file/create.c b/reactos/dll/win32/kernel32/client/file/create.c
index a91a49fbf86..fede467a1a2 100644
--- a/reactos/dll/win32/kernel32/client/file/create.c
+++ b/reactos/dll/win32/kernel32/client/file/create.c
@@ -1,5 +1,4 @@
-/* $Id: create.c 54326 2011-11-07 00:18:13Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/create.c
diff --git a/reactos/dll/win32/kernel32/client/file/delete.c b/reactos/dll/win32/kernel32/client/file/delete.c
index c31ff8e47eb..11840a4ac4a 100644
--- a/reactos/dll/win32/kernel32/client/file/delete.c
+++ b/reactos/dll/win32/kernel32/client/file/delete.c
@@ -1,5 +1,4 @@
-/* $Id: delete.c 56650 2012-05-23 16:51:22Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/delete.c
diff --git a/reactos/dll/win32/kernel32/client/file/dir.c b/reactos/dll/win32/kernel32/client/file/dir.c
index b99a4369ab9..52a5342afd1 100644
--- a/reactos/dll/win32/kernel32/client/file/dir.c
+++ b/reactos/dll/win32/kernel32/client/file/dir.c
@@ -1,5 +1,4 @@
-/* $Id: dir.c 55866 2012-02-25 21:09:28Z khornicek $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/client/file/dir.c
diff --git a/reactos/dll/win32/kernel32/client/file/fileinfo.c b/reactos/dll/win32/kernel32/client/file/fileinfo.c
index 392347a9426..a7486c60630 100644
--- a/reactos/dll/win32/kernel32/client/file/fileinfo.c
+++ b/reactos/dll/win32/kernel32/client/file/fileinfo.c
@@ -1,5 +1,4 @@
-/* $Id: fileinfo.c 54326 2011-11-07 00:18:13Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/file.c
diff --git a/reactos/dll/win32/kernel32/client/file/filename.c b/reactos/dll/win32/kernel32/client/file/filename.c
index a1aa505e97c..eb94d8a1f4c 100644
--- a/reactos/dll/win32/kernel32/client/file/filename.c
+++ b/reactos/dll/win32/kernel32/client/file/filename.c
@@ -1,5 +1,4 @@
-/* $Id: file.c 54310 2011-11-06 04:13:21Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/file.c
diff --git a/reactos/dll/win32/kernel32/client/file/hardlink.c b/reactos/dll/win32/kernel32/client/file/hardlink.c
index b4a43a6a36e..dc1e8a51bf1 100644
--- a/reactos/dll/win32/kernel32/client/file/hardlink.c
+++ b/reactos/dll/win32/kernel32/client/file/hardlink.c
@@ -1,5 +1,4 @@
-/* $Id: hardlink.c 55790 2012-02-21 19:18:57Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/client/file/hardlink.c
diff --git a/reactos/dll/win32/kernel32/client/file/iocompl.c b/reactos/dll/win32/kernel32/client/file/iocompl.c
index 4d778897b2a..0ee98005894 100644
--- a/reactos/dll/win32/kernel32/client/file/iocompl.c
+++ b/reactos/dll/win32/kernel32/client/file/iocompl.c
@@ -1,5 +1,4 @@
-/* $Id: iocompl.c 55793 2012-02-21 21:31:01Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/iocompl.c
diff --git a/reactos/dll/win32/kernel32/client/file/lfile.c b/reactos/dll/win32/kernel32/client/file/lfile.c
index abfed1243b8..904e1e207e7 100644
--- a/reactos/dll/win32/kernel32/client/file/lfile.c
+++ b/reactos/dll/win32/kernel32/client/file/lfile.c
@@ -1,5 +1,4 @@
-/* $Id: lfile.c 48475 2010-08-07 05:02:58Z sir_richard $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/lfile.c
diff --git a/reactos/dll/win32/kernel32/client/file/lock.c b/reactos/dll/win32/kernel32/client/file/lock.c
index 2b71e4e062d..708b6333786 100644
--- a/reactos/dll/win32/kernel32/client/file/lock.c
+++ b/reactos/dll/win32/kernel32/client/file/lock.c
@@ -1,5 +1,4 @@
-/* $Id: lock.c 55795 2012-02-21 21:38:08Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/file/lock.c
diff --git a/reactos/dll/win32/kernel32/client/file/mailslot.c b/reactos/dll/win32/kernel32/client/file/mailslot.c
index d9875c3ecd2..a6b22d6da0c 100644
--- a/reactos/dll/win32/kernel32/client/file/mailslot.c
+++ b/reactos/dll/win32/kernel32/client/file/mailslot.c
@@ -1,5 +1,4 @@
-/* $Id: mailslot.c 55791 2012-02-21 19:19:44Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/mailslot.c
diff --git a/reactos/dll/win32/kernel32/client/file/move.c b/reactos/dll/win32/kernel32/client/file/move.c
index 87fbc2f8961..8ddd4bb0f6b 100644
--- a/reactos/dll/win32/kernel32/client/file/move.c
+++ b/reactos/dll/win32/kernel32/client/file/move.c
@@ -1,5 +1,4 @@
-/* $Id: move.c 54326 2011-11-07 00:18:13Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/file.c
diff --git a/reactos/dll/win32/kernel32/client/file/rw.c b/reactos/dll/win32/kernel32/client/file/rw.c
index 69661da739b..82dc7ca39eb 100644
--- a/reactos/dll/win32/kernel32/client/file/rw.c
+++ b/reactos/dll/win32/kernel32/client/file/rw.c
@@ -1,5 +1,4 @@
-/* $Id: rw.c 54326 2011-11-07 00:18:13Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/rw.c
diff --git a/reactos/dll/win32/kernel32/client/file/tape.c b/reactos/dll/win32/kernel32/client/file/tape.c
index 37c30668e0a..b0642e873e1 100644
--- a/reactos/dll/win32/kernel32/client/file/tape.c
+++ b/reactos/dll/win32/kernel32/client/file/tape.c
@@ -1,5 +1,4 @@
-/* $Id: tape.c 54334 2011-11-07 07:41:52Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/tape.c
diff --git a/reactos/dll/win32/kernel32/client/file/volume.c b/reactos/dll/win32/kernel32/client/file/volume.c
index 6b3b4ac6809..3759e1ed6f8 100644
--- a/reactos/dll/win32/kernel32/client/file/volume.c
+++ b/reactos/dll/win32/kernel32/client/file/volume.c
@@ -1,5 +1,4 @@
-/* $Id: volume.c 52819 2011-07-23 18:54:29Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/file/volume.c
diff --git a/reactos/dll/win32/kernel32/client/job.c b/reactos/dll/win32/kernel32/client/job.c
index 6baf5da5866..e5a20c0bca6 100644
--- a/reactos/dll/win32/kernel32/client/job.c
+++ b/reactos/dll/win32/kernel32/client/job.c
@@ -1,5 +1,4 @@
-/* $Id: job.c 54306 2011-11-06 00:09:33Z pschweitzer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/process/job.c
diff --git a/reactos/dll/win32/kernel32/client/proc.c b/reactos/dll/win32/kernel32/client/proc.c
index 245687bac7b..16c058b8b47 100644
--- a/reactos/dll/win32/kernel32/client/proc.c
+++ b/reactos/dll/win32/kernel32/client/proc.c
@@ -1,5 +1,4 @@
-/* $Id: proc.c 57086 2012-08-16 15:39:40Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/proc/proc.c
diff --git a/reactos/dll/win32/kernel32/client/time.c b/reactos/dll/win32/kernel32/client/time.c
index ff729d2c749..44516d4b6ee 100644
--- a/reactos/dll/win32/kernel32/client/time.c
+++ b/reactos/dll/win32/kernel32/client/time.c
@@ -1,5 +1,4 @@
-/* $Id: time.c 52770 2011-07-22 02:13:57Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/time.c
diff --git a/reactos/dll/win32/kernel32/client/toolhelp.c b/reactos/dll/win32/kernel32/client/toolhelp.c
index 1f221048716..0eae03bb0fe 100644
--- a/reactos/dll/win32/kernel32/client/toolhelp.c
+++ b/reactos/dll/win32/kernel32/client/toolhelp.c
@@ -1,5 +1,4 @@
-/* $Id: toolhelp.c 54071 2011-10-10 12:14:12Z tfaber $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/misc/toolhelp.c
diff --git a/reactos/dll/win32/kernel32/wine/lzexpand.c b/reactos/dll/win32/kernel32/wine/lzexpand.c
index c24f3e0be14..eb4b4d2e0f9 100644
--- a/reactos/dll/win32/kernel32/wine/lzexpand.c
+++ b/reactos/dll/win32/kernel32/wine/lzexpand.c
@@ -1,5 +1,4 @@
-/* $Id: lzexpand.c 52854 2011-07-24 23:42:09Z ion $
- * 
+/* 
  * LZ Decompression functions
  *
  * Copyright 1996 Marcus Meissner
diff --git a/reactos/dll/win32/kernel32/wine/muldiv.c b/reactos/dll/win32/kernel32/wine/muldiv.c
index 2f12caa54fa..45a1b872421 100644
--- a/reactos/dll/win32/kernel32/wine/muldiv.c
+++ b/reactos/dll/win32/kernel32/wine/muldiv.c
@@ -1,5 +1,4 @@
-/* $Id: muldiv.c 37829 2008-12-03 17:33:13Z dgorbachev $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/misc/muldiv.c
diff --git a/reactos/dll/win32/kernel32/wine/timezone.c b/reactos/dll/win32/kernel32/wine/timezone.c
index 6ffc5783d6f..ae0e053e24f 100644
--- a/reactos/dll/win32/kernel32/wine/timezone.c
+++ b/reactos/dll/win32/kernel32/wine/timezone.c
@@ -1,5 +1,4 @@
-/* $Id: timezone.c 52819 2011-07-23 18:54:29Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/kernel32/misc/time.c
diff --git a/reactos/dll/win32/kernel32/winnls/string/nls.c b/reactos/dll/win32/kernel32/winnls/string/nls.c
index 7a9081880fb..8bfc515f162 100644
--- a/reactos/dll/win32/kernel32/winnls/string/nls.c
+++ b/reactos/dll/win32/kernel32/winnls/string/nls.c
@@ -1,5 +1,4 @@
-/* $Id: nls.c 52854 2011-07-24 23:42:09Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            dll/win32/kernel32/misc/nls.c