Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52227: [FREELDR] Reimplement Int386 based on realmode callback mechanism.
by tkreuzer＠svn.reactos.org 14 Jun '11

14 Jun '11

Author: tkreuzer Date: Tue Jun 14 14:53:02 2011 New Revision: 52227 URL: http://svn.reactos.org/svn/reactos?rev=52227&view=rev Log: [FREELDR] Reimplement Int386 based on realmode callback mechanism. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -19,7 +19,6 @@ arch/i386/i386pnp.S arch/i386/i386pxe.S arch/i386/i386trap.S - arch/i386/int386.S arch/i386/linux.S arch/i386/mb.S arch/i386/i386bug.c) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -63,8 +63,6 @@ mov eax, dword ptr ds:[BSS_RealModeEntry] mov dword ptr ds:[SwitchToReal16Address], eax -call _Int386_ // test - /* GO! */ xor eax, eax push eax @@ -222,8 +220,25 @@ _EnableA20: ret -PUBLIC _Int386_ -_Int386_: +Int386_regsin: + .long 0 +Int386_regsout: + .long 0 + +/* + * int Int386(int ivec, REGS* in, REGS* out); + */ +PUBLIC _Int386 +_Int386: + + /* Get the function parameters */ + mov eax, dword ptr [esp + 4] + mov dword ptr ds:[BSS_IntVector], eax + mov eax, dword ptr [esp + 8] + mov dword ptr [Int386_regsin], eax + mov eax, dword ptr [esp + 12] + mov dword ptr [Int386_regsout], eax + /* Save all registers + segment registers */ push ds push es @@ -231,14 +246,26 @@ push gs pusha + /* Copy input registers */ + mov esi, dword ptr [Int386_regsin] + mov edi, BSS_RegisterSet + mov ecx, 9 + rep movsd + /* Set the callback index */ - mov cx, 1234 + mov bx, 0 /* Set continue address and switch to real mode */ mov dword ptr [ContinueAddress], offset Int386_return jmp SwitchToReal Int386_return: + + /* Copy output registers */ + mov esi, BSS_RegisterSet + mov edi, dword ptr [Int386_regsout] + mov ecx, 9 + rep movsd popa pop gs Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -91,10 +91,10 @@ sti /* These are ok now */ - /* Do the callback, specified by cx */ - // call word ptr CallbackTable[cx * 4] - mov ax, cx - call writehex4 + /* Do the callback, specified by bx */ + shl bx, 1 + call word ptr ds:[callback_table + bx] + /* * Switches the processor to protected mode @@ -123,6 +123,8 @@ nop +callback_table: + .word Int386 /* 16-bit stack pointer */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Tue Jun 14 14:53:02 2011 @@ -1,26 +1,33 @@ Int386: + /* Save all registers + segment registers */ + push ds + push es + push fs + push gs + pushad + /* Get the interupt vector and patch the opcode */ mov al, byte ptr ds:[BSS_IntVector] mov byte ptr ds:[Int386_vector_opcode], al /* Setup the registers */ mov ax, word ptr cs:[BSS_RegisterSet + REGS_DS] - mov ds, ax /* DS register */ + mov ds, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_ES] - mov es, ax /* ES register */ + mov es, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_FS] - mov fs, ax /* FS register */ + mov fs, ax mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] - mov gs, ax /* GS register */ + mov gs, ax - mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] /* EAX register */ - mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] /* EBX register */ - mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] /* ECX register */ - mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] /* EDX register */ - mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] /* ESI register */ - mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* EDI register */ + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] + mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] + mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] + mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] + mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] + mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* Do not set the flags register */ /* only return its value in regsout */ @@ -32,24 +39,30 @@ .byte 0x00 /* Save the registers */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax /* EAX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx /* EBX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx /* ECX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx /* EDX register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi /* ESI register */ - mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi /* EDI register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax + mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx + mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx + mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx + mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi + mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi - mov ax, ds /* DS register */ + mov ax, ds mov word ptr cs:[BSS_RegisterSet + REGS_DS], ax - mov ax, es /* ES register */ + mov ax, es mov word ptr cs:[BSS_RegisterSet + REGS_ES], ax - mov ax, fs /* FS register */ + mov ax, fs mov word ptr cs:[BSS_RegisterSet + REGS_FS], ax - mov ax, gs /* GS register */ + mov ax, gs mov word ptr cs:[BSS_RegisterSet + REGS_GS], ax - pushf - pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] /* EFLAGS register */ + pushfd + pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] + + popad + pop gs + pop fs + pop es + pop ds ret

1 0

[tkreuzer] 52226: [FREELDR] Start implementing a realmode callback mechanism
by tkreuzer＠svn.reactos.org 14 Jun '11

14 Jun '11

Author: tkreuzer Date: Tue Jun 14 12:17:28 2011 New Revision: 52226 URL: http://svn.reactos.org/svn/reactos?rev=52226&view=rev Log: [FREELDR] Start implementing a realmode callback mechanism Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -44,9 +44,9 @@ lidt i386idtptr /* Continue execution */ - jmp dword ptr [_ContinueAddress] - -_ContinueAddress: + jmp dword ptr [ContinueAddress] + +ContinueAddress: .long _FrldrStartup @@ -58,6 +58,12 @@ mov dword ptr [_FrldrBootDrive], eax mov al, dh mov dword ptr [_FrldrBootPartition], eax + + /* Patch long jump with real mode entry point */ + mov eax, dword ptr ds:[BSS_RealModeEntry] + mov dword ptr ds:[SwitchToReal16Address], eax + +call _Int386_ // test /* GO! */ xor eax, eax @@ -215,6 +221,51 @@ PUBLIC _EnableA20 _EnableA20: ret + +PUBLIC _Int386_ +_Int386_: + /* Save all registers + segment registers */ + push ds + push es + push fs + push gs + pusha + + /* Set the callback index */ + mov cx, 1234 + + /* Set continue address and switch to real mode */ + mov dword ptr [ContinueAddress], offset Int386_return + jmp SwitchToReal + +Int386_return: + + popa + pop gs + pop fs + pop es + pop ds + ret + + +SwitchToReal: + /* Set sane segments */ + mov ax, PMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Save 32-bit stack pointer */ + mov dword ptr [stack32], esp + + /* jmp to 16-bit segment to set the limit correctly */ + .byte HEX(0ea) // jmp far RMODE_CS:switch_to_real16 +SwitchToReal16Address: + .long 0 // receives address of switch_to_real16 + .word RMODE_CS + nop /* Multiboot support Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -30,6 +30,9 @@ /* Enable A20 address line */ call EnableA20 + /* Safe real mode entry point in shared memory */ + mov dword ptr [BSS_RealModeEntry], offset switch_to_real16 + /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE @@ -38,20 +41,74 @@ mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE - /* Safe the entry point */ - mov dword ptr [BSS_EntryPoint], eax - /* Patch the long jump instruction */ mov word ptr [pm_offset], ax + + jmp exit_to_protected + + +/* This is the entry point from protected mode */ +switch_to_real16: + + /* Restore segment registers to correct limit */ + mov ax, RMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Disable Protected Mode */ + mov eax, cr0 + and eax, CR0_PE_CLR + mov cr0, eax + + /* Clear prefetch queue & correct CS */ + ljmp16 0, inrmode + +inrmode: + /* Set real mode segments */ + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Clear out the high 16-bits of ESP */ + /* This is needed because I have one */ + /* machine that hangs when booted to dos if */ + /* anything other than 0x0000 is in the high */ + /* 16-bits of ESP. Even though real-mode */ + /* code should only use SP and not ESP. */ + xor esp, esp + + /* Restore real mode stack */ + mov sp, word ptr ds:[stack16] + + /* Load IDTR with real mode value */ + lidt rmode_idtptr + + sti /* These are ok now */ + + /* Do the callback, specified by cx */ + // call word ptr CallbackTable[cx * 4] + mov ax, cx + call writehex4 /* * Switches the processor to protected mode * it destroys eax */ -switch_to_prot: +exit_to_protected: + + cli + + /* Safe current stack pointer */ + mov word ptr ds:[stack16], sp /* Load the GDT */ - lgdt gdtptr + lgdt gdtptr /* Enable Protected Mode */ mov eax, cr0 @@ -64,6 +121,7 @@ .word 0 // receives address of PE entry point .word PMODE_CS nop + @@ -109,8 +167,14 @@ .word HEX(27) /* Limit */ .long gdt /* Base Address */ -.org 1024 +/* Real-mode IDT pointer */ +rmode_idtptr: + .word HEX(3ff) /* Limit */ + .long 0 /* Base Address */ +//.org 1024 + +#include "int386.inc" #include "helpers.inc" .org (FREELDR_PE_BASE - FREELDR_BASE) Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -1,0 +1,57 @@ + + +Int386: + /* Get the interupt vector and patch the opcode */ + mov al, byte ptr ds:[BSS_IntVector] + mov byte ptr ds:[Int386_vector_opcode], al + + /* Setup the registers */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_DS] + mov ds, ax /* DS register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_ES] + mov es, ax /* ES register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_FS] + mov fs, ax /* FS register */ + mov ax, word ptr cs:[BSS_RegisterSet + REGS_GS] + mov gs, ax /* GS register */ + + mov eax, dword ptr cs:[BSS_RegisterSet + REGS_EAX] /* EAX register */ + mov ebx, dword ptr cs:[BSS_RegisterSet + REGS_EBX] /* EBX register */ + mov ecx, dword ptr cs:[BSS_RegisterSet + REGS_ECX] /* ECX register */ + mov edx, dword ptr cs:[BSS_RegisterSet + REGS_EDX] /* EDX register */ + mov esi, dword ptr cs:[BSS_RegisterSet + REGS_ESI] /* ESI register */ + mov edi, dword ptr cs:[BSS_RegisterSet + REGS_EDI] /* EDI register */ + + /* Do not set the flags register */ + /* only return its value in regsout */ + + /* Call the interrupt vector */ + /*int Int386_vector*/ + .byte 0xcd +Int386_vector_opcode: + .byte 0x00 + + /* Save the registers */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax /* EAX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EBX], ebx /* EBX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_ECX], ecx /* ECX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EDX], edx /* EDX register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_ESI], esi /* ESI register */ + mov dword ptr cs:[BSS_RegisterSet + REGS_EDI], edi /* EDI register */ + + mov ax, ds /* DS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_DS], ax + mov ax, es /* ES register */ + mov word ptr cs:[BSS_RegisterSet + REGS_ES], ax + mov ax, fs /* FS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_FS], ax + mov ax, gs /* GS register */ + mov word ptr cs:[BSS_RegisterSet + REGS_GS], ax + + pushf + pop dword ptr cs:[BSS_RegisterSet + REGS_EFLAGS] /* EFLAGS register */ + + ret + + + Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Tue Jun 14 12:17:28 2011 @@ -17,11 +17,26 @@ #define DISKREADBUFFER_SIZE 512 /* These addresses specify the realmode "BSS section" layout */ -#define BSS_EntryPoint (BSS_START + 0) +#define BSS_RealModeEntry (BSS_START + 0) #define BSS_CallbackAddress (BSS_START + 4) #define BSS_CallbackReturn (BSS_START + 8) -#define BSS_BootDrive (BSS_START + 12) -#define BSS_BootPartition (BSS_START + 16) + +#define BSS_RegisterSet (BSS_START + 16) /* size = 36 */ +#define BSS_IntVector (BSS_START + 52) +// next 52 + +/* Layout of the REGS structure */ +#define REGS_EAX 0 +#define REGS_EBX 4 +#define REGS_ECX 8 +#define REGS_EDX 12 +#define REGS_ESI 16 +#define REGS_EDI 20 +#define REGS_DS 24 +#define REGS_ES 26 +#define REGS_FS 28 +#define REGS_GS 30 +#define REGS_EFLAGS 32 // Flag Masks

1 0

[tkreuzer] 52225: [FREELDR] Move EnableA20 to realmode code, remove DisableA20
by tkreuzer＠svn.reactos.org 14 Jun '11

14 Jun '11

Author: tkreuzer Date: Tue Jun 14 08:10:59 2011 New Revision: 52225 URL: http://svn.reactos.org/svn/reactos?rev=52225&view=rev Log: [FREELDR] Move EnableA20 to realmode code, remove DisableA20 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -211,69 +211,11 @@ ret - /* - * Needed for enabling the a20 address line - */ -.code16 -empty_8042: - .word 0x00eb,0x00eb // jmp $+2, jmp $+2 - in al, HEX(64) - cmp al, HEX(ff) // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF - test al, 2 - jnz empty_8042 -empty_8042_ret: - ret - - /* - * Enable the A20 address line (to allow access to over 1mb) - */ -EXTERN(_EnableA20) .code32 - - pusha - - call switch_to_real -.code16 - - call empty_8042 - mov al, HEX(D1) // command write - out HEX(64), al - call empty_8042 - mov al, HEX(DF) // A20 on - out HEX(60), al - call empty_8042 - call switch_to_prot - .code32 - - popa - - ret - - /* - * Disable the A20 address line - */ -EXTERN(_DisableA20) -.code32 - - pusha - - call switch_to_real - .code16 - - call empty_8042 - mov al, HEX(D1) // command write - out HEX(64), al - call empty_8042 - mov al, HEX(DD) // A20 off - out HEX(60), al - call empty_8042 - call switch_to_prot - .code32 - - popa - - ret +PUBLIC _EnableA20 +_EnableA20: + ret + /* Multiboot support * Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -3,21 +3,21 @@ .word 0x00eb,0x00eb // jmp $+2, jmp $+2 in al, 0x64 cmp al, 0xff // legacy-free machine without keyboard - jz empty_8042_ret // controllers on Intel Macs read back 0xFF + jz Empty8042_ret // controllers on Intel Macs read back 0xFF test al, 0x02 - jnz x86_16_Empty8042 -empty_8042_ret: + jnz Empty8042 +Empty8042_ret: ret EnableA20: pusha - call x86_16_Empty8042 + call Empty8042 mov al, 0xD1 // command write out 0x64, al - call x86_16_Empty8042 + call Empty8042 mov al, 0xDF // A20 on out 0x60, al - call x86_16_Empty8042 + call Empty8042 popa ret Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Tue Jun 14 08:10:59 2011 @@ -26,6 +26,9 @@ /* Setup the stack */ mov sp, word ptr ds:stack16 + + /* Enable A20 address line */ + call EnableA20 /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew]

1 0

[cgutman] 52224: [AFD] - Only indicate that receive is possible if there are no pending receive IRPs waiting for data - Don't attempt to receive on a connection which has been closed in the receive...
by cgutman＠svn.reactos.org 14 Jun '11

14 Jun '11

Author: cgutman Date: Tue Jun 14 02:18:20 2011 New Revision: 52224 URL: http://svn.reactos.org/svn/reactos?rev=52224&view=rev Log: [AFD] - Only indicate that receive is possible if there are no pending receive IRPs waiting for data - Don't attempt to receive on a connection which has been closed in the receive direction Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Jun 14 02:18:20 2011 @@ -49,7 +49,8 @@ static VOID RefillSocketBuffer( PAFD_FCB FCB ) { NTSTATUS Status; - if( !FCB->ReceiveIrp.InFlightRequest ) { + if( !FCB->ReceiveIrp.InFlightRequest && + !(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT)) ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, @@ -216,7 +217,8 @@ } } - if( FCB->Recv.Content - FCB->Recv.BytesUsed ) { + if( FCB->Recv.Content - FCB->Recv.BytesUsed && + IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV]) ) { FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -576,7 +578,7 @@ } } - if( !IsListEmpty( &FCB->DatagramList ) ) { + if( !IsListEmpty( &FCB->DatagramList ) && IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV]) ) { AFD_DbgPrint(MID_TRACE,("Signalling\n")); FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS;

1 0

[cgutman] 52223: [AFD] - FD_CLOSE is only for remote disconnects so don't send it when the app closes its own socket - Validate the user-mode event handle properly
by cgutman＠svn.reactos.org 14 Jun '11

14 Jun '11

Author: cgutman Date: Tue Jun 14 00:56:49 2011 New Revision: 52223 URL: http://svn.reactos.org/svn/reactos?rev=52223&view=rev Log: [AFD] - FD_CLOSE is only for remote disconnects so don't send it when the app closes its own socket - Validate the user-mode event handle properly Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Jun 14 00:56:49 2011 @@ -419,9 +419,6 @@ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->State = SOCKET_STATE_CLOSED; - FCB->PollState = AFD_EVENT_CLOSE; - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; //I think we can return success here - PollReeval( FCB->DeviceExt, FCB->FileObject ); InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Tue Jun 14 00:56:49 2011 @@ -287,8 +287,8 @@ Status = ObReferenceObjectByHandle( (PVOID)EventSelectInfo-> EventObject, FILE_ALL_ACCESS, - NULL, - KernelMode, + ExEventObjectType, + UserMode, (PVOID *)&FCB->EventSelect, NULL );

1 0

[ilardig] 52222: update README.WINE
by ilardig＠svn.reactos.org 13 Jun '11

13 Jun '11

Author: ilardig Date: Mon Jun 13 20:36:46 2011 New Revision: 52222 URL: http://svn.reactos.org/svn/reactos?rev=52222&view=rev Log: update README.WINE Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jun 13 20:36:46 2011 @@ -187,6 +187,8 @@ reactos/dll/win32/xinput9_1_0 # Autosync reactos/dll/win32/xmllite # Autosync +reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21 + ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/xcopy # Autosync

1 0

[tkreuzer] 52221: [FREELDR] Start moving the 16 bit code into the raw binary chunk. We now switch to protected mode before jumping to the PE entry point
by tkreuzer＠svn.reactos.org 13 Jun '11

13 Jun '11

Author: tkreuzer Date: Mon Jun 13 20:03:55 2011 New Revision: 52221 URL: http://svn.reactos.org/svn/reactos?rev=52221&view=rev Log: [FREELDR] Start moving the 16 bit code into the raw binary chunk. We now switch to protected mode before jumping to the PE entry point Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S - copied, changed from r52207, trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Mon Jun 13 20:03:55 2011 @@ -9,26 +9,9 @@ endif() if(ARCH MATCHES i386) - if(MSVC) - list(APPEND FREELDR_BASE64K_SOURCE - arch/i386/realmode.S) - else() - list(APPEND FREELDR_STARTUP_SOURCE - arch/i386/arch.S) - endif() -elseif(ARCH MATCHES amd64) - if(MSVC) - list(APPEND FREELDR_BASE64K_SOURCE - arch/amd64/stubs.S) - else() - list(APPEND FREELDR_STARTUP_SOURCE - arch/amd64/arch.S) - endif() -endif() - -if(ARCH MATCHES i386) if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/entry.S arch/i386/boot.S arch/i386/drvmap.S arch/i386/i386cpu.S @@ -40,15 +23,21 @@ arch/i386/linux.S arch/i386/mb.S arch/i386/i386bug.c) + else() + list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/realmode.S) endif() elseif(ARCH MATCHES amd64) if(NOT MSVC) - list(APPEND FREELDR_BASE64K_SOURCE - arch/i386/drvmap.S - arch/i386/i386cpu.S - arch/i386/i386idt.S - arch/i386/i386trap.S - arch/amd64/mb.S) + list(APPEND FREELDR_BASE64K_SOURCE + arch/i386/drvmap.S + arch/i386/i386cpu.S + arch/i386/i386idt.S + arch/i386/i386trap.S + arch/amd64/mb.S) + else() + list(APPEND FREELDR_BASE64K_SOURCE + arch/amd64/stubs.S) endif() endif() @@ -187,7 +176,6 @@ list(APPEND FREELDR_SOURCE bootmgr.c - ${FREELDR_STARTUP_SOURCE} ${FREELDR_BASE64K_SOURCE} ${FREELDR_BASE_SOURCE} ) @@ -242,7 +230,6 @@ endif() list(APPEND SETUPLDR_SOURCE - ${FREELDR_STARTUP_SOURCE} ${FREELDR_BASE64K_SOURCE} ${FREELDR_BASE_SOURCE} ${SETUPLDR_MAIN_SOURCE}) Copied: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S (from r52207, trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Mon Jun 13 20:03:55 2011 @@ -20,52 +20,49 @@ .intel_syntax noprefix #define HEX(y) 0x##y +#include <asm.inc> #include <arch/pc/x86common.h> #include <multiboot.h> - .code16 - -EXTERN(_RealEntryPoint) - - cli - - /* Setup segment registers */ - xor ax, ax +.code32 + +PUBLIC _RealEntryPoint +_RealEntryPoint: + + /* Setup segment selectors */ + mov ax, PMODE_DS mov ds, ax mov es, ax mov fs, ax mov gs, ax mov ss, ax - /* Setup a stack */ - mov sp, word ptr ds:stack16 - - sti - - /* Init pmode */ - call switch_to_prot - - .code32 - - /* Zero BootDrive and BootPartition */ + /* Setup protected mode stack */ + mov esp, dword ptr [stack32] + + /* Load the IDT */ + lidt i386idtptr + + /* Continue execution */ + jmp dword ptr [_ContinueAddress] + +_ContinueAddress: + .long _FrldrStartup + + +_FrldrStartup: + + /* Store BootDrive and BootPartition */ + xor eax, eax + mov al, dl + mov dword ptr [_FrldrBootDrive], eax + mov al, dh + mov dword ptr [_FrldrBootPartition], eax + + /* GO! */ xor eax, eax - mov dword ptr [_FrldrBootDrive], eax - mov dword ptr [_FrldrBootPartition], eax - - /* Store the boot drive */ - mov byte ptr [_FrldrBootDrive], dl - - /* Store the boot partition */ - mov byte ptr [_FrldrBootPartition], dh - - /* GO! */ push eax - call _BootMain - - call switch_to_real - .code16 - - int HEX(19) + call _BootMain /* We should never get here */ stop: @@ -399,12 +396,12 @@ mov eax, [ebx + MB_INFO_BOOT_DEVICE_OFFSET] shr eax, 16 inc al - mov byte ptr _FrldrBootPartition, al - mov byte ptr _FrldrBootDrive, ah + mov byte ptr [_FrldrBootPartition], al + mov byte ptr [_FrldrBootDrive], ah jmp mb6 mb5: /* No boot device known, assume first partition of first harddisk */ - mov byte ptr _FrldrBootDrive, HEX(80) - mov byte ptr _FrldrBootPartition, 1 + mov byte ptr [_FrldrBootDrive], HEX(80) + mov byte ptr [_FrldrBootPartition], 1 mb6: /* Check for command line */ mov eax, offset cmdline @@ -495,8 +492,12 @@ cmdline: .fill CMDLINE_SIZE, 1, 0 -EXTERN(_FrldrBootDrive) +PUBLIC _FrldrBootDrive +_FrldrBootDrive: .long 0 -EXTERN(_FrldrBootPartition) +PUBLIC _FrldrBootPartition +_FrldrBootPartition: .long 0 + +END Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Mon Jun 13 20:03:55 2011 @@ -12,17 +12,101 @@ #include "fathelp.inc" .org 512 -RealEntryPoint: +RealModeEntryPoint: + + cli + + /* Setup segment registers */ + xor ax, ax + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov ss, ax + + /* Setup the stack */ + mov sp, word ptr ds:stack16 /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE - /* Jump to address of entry point */ + /* Get address of entry point */ mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE - jmp ax + /* Safe the entry point */ + mov dword ptr [BSS_EntryPoint], eax + + /* Patch the long jump instruction */ + mov word ptr [pm_offset], ax + +/* + * Switches the processor to protected mode + * it destroys eax + */ +switch_to_prot: + + /* Load the GDT */ + lgdt gdtptr + + /* Enable Protected Mode */ + mov eax, cr0 + or eax, CR0_PE_SET + mov cr0, eax + + /* Clear prefetch queue & correct CS */ + .byte HEX(0ea) // jmp far PMODE_CS:entry_point +pm_offset: + .word 0 // receives address of PE entry point + .word PMODE_CS + nop + + + + /* 16-bit stack pointer */ +stack16: + .word STACK16ADDR + + +.align 4 /* force 4-byte alignment */ +gdt: + /* NULL Descriptor */ + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) + .word HEX(0000) + + /* 32-bit flat CS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9A00) + .word HEX(00CF) + + /* 32-bit flat DS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(00CF) + + /* 16-bit real mode CS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9E00) + .word HEX(0000) + + /* 16-bit real mode DS */ + .word HEX(FFFF) + .word HEX(0000) + .word HEX(9200) + .word HEX(0000) + +/* GDT table pointer */ +gdtptr: + .word HEX(27) /* Limit */ + .long gdt /* Base Address */ + +.org 1024 #include "helpers.inc" Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Mon Jun 13 20:03:55 2011 @@ -4,8 +4,8 @@ #endif /* Memory layout */ -#define STACK16ADDR HEX(7000) /* The 16-bit stack top will be at 0000:7000 */ -#define BSS_START HEX(7000) +#define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ +#define BSS_START HEX(6F00) #define FREELDR_BASE HEX(8000) #define FREELDR_PE_BASE HEX(9000) #define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ @@ -17,15 +17,12 @@ #define DISKREADBUFFER_SIZE 512 /* These addresses specify the realmode "BSS section" layout */ -#define BSS_CallbackAddress BSS_START + 0 -#define BSS_CallbackReturn BSS_START + 8 -#define BSS_BootDrive BSS_START + 16 -#define BSS_BootPartition BSS_START + 20 +#define BSS_EntryPoint (BSS_START + 0) +#define BSS_CallbackAddress (BSS_START + 4) +#define BSS_CallbackReturn (BSS_START + 8) +#define BSS_BootDrive (BSS_START + 12) +#define BSS_BootPartition (BSS_START + 16) -#ifdef _M_AMD64 -#define FrldrBootDrive *((PULONG)BSS_BootDrive) -#define FrldrBootPartition *((PULONG)BSS_BootPartition) -#endif // Flag Masks #define I386FLAG_CF HEX(0001) // Carry Flag @@ -45,13 +42,13 @@ #define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ /* Defines needed for switching between real and protected mode */ -#ifdef _M_IX86 +//#ifdef _M_IX86 #define NULL_DESC HEX(00) /* NULL descriptor */ #define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ #define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ #define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ #define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ -#endif +//#endif /* Makes "x" a global variable or label */ #define EXTERN(x) .global x; x:

1 0

[tkreuzer] 52220: forgot a pecoff.h update
by tkreuzer＠svn.reactos.org 13 Jun '11

13 Jun '11

Author: tkreuzer Date: Mon Jun 13 19:54:35 2011 New Revision: 52220 URL: http://svn.reactos.org/svn/reactos?rev=52220&view=rev Log: forgot a pecoff.h update Modified: trunk/reactos/tools/pecoff.h Modified: trunk/reactos/tools/pecoff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pecoff.h?rev=52220&r… ============================================================================== --- trunk/reactos/tools/pecoff.h [iso-8859-1] (original) +++ trunk/reactos/tools/pecoff.h [iso-8859-1] Mon Jun 13 19:54:35 2011 @@ -42,6 +42,7 @@ #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 #define IMAGE_REL_I386_ABSOLUTE 0x0001 +#define IMAGE_REL_I386_DIR32 0x0006 typedef unsigned char BYTE; typedef unsigned char UCHAR;

1 0

[gadamopoulos] 52219: [user32] - Fix several compilation issues with msvc
by gadamopoulos＠svn.reactos.org 13 Jun '11

13 Jun '11

Author: gadamopoulos Date: Mon Jun 13 19:49:46 2011 New Revision: 52219 URL: http://svn.reactos.org/svn/reactos?rev=52219&view=rev Log: [user32] - Fix several compilation issues with msvc Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Mon Jun 13 19:49:46 2011 @@ -188,7 +188,6 @@ { HWND owner = GetWindow( hWnd, GW_OWNER ); - if (!IsWindow(hWnd)) return 0; #ifdef __REACTOS__ // Do this now, remove after Server side is fixed. PWND pWnd; @@ -201,6 +200,8 @@ } } #endif + + if (!IsWindow(hWnd)) return 0; switch( msg ) { Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Mon Jun 13 19:49:46 2011 @@ -1243,11 +1243,6 @@ LRESULT WINAPI ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if (! IsWindow(Wnd)) - { - return 0; - } - #ifdef __REACTOS__ // Do this now, remove after Server side is fixed. PWND pWnd; @@ -1260,6 +1255,11 @@ } } #endif + + if (! IsWindow(Wnd)) + { + return 0; + } switch (Msg) { Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Jun 13 19:49:46 2011 @@ -753,6 +753,7 @@ ScrollTrackScrollBar(Wnd, ScrollBar, Pt ); } +LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam); LRESULT DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) @@ -824,7 +825,7 @@ case SC_SCREENSAVE: NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); break; -LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam); + case SC_NEXTWINDOW: case SC_PREVWINDOW: DoAppSwitch( wParam, lParam); @@ -833,9 +834,10 @@ case SC_HOTKEY: { HWND hwnd, hWndLastActive; + PWND pWnd; hwnd = (HWND)lParam; - PWND pWnd = ValidateHwnd(hwnd); + pWnd = ValidateHwnd(hwnd); if (pWnd) { hWndLastActive = GetLastActivePopup(hwnd); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Jun 13 19:49:46 2011 @@ -1791,7 +1791,6 @@ // LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { - TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); #ifdef __REACTOS__ PWND pWnd; @@ -1805,6 +1804,8 @@ } #endif + TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); + switch(Message) { case WM_CREATE: @@ -1879,7 +1880,6 @@ LRESULT WINAPI PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); #ifdef __REACTOS__ // Do this now, remove after Server side is fixed. PWND pWnd; @@ -1892,6 +1892,8 @@ } } #endif + + TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); switch(Message) {

1 0

[gadamopoulos] 52218: [browseui] - Fix some compilation errors with msvc
by gadamopoulos＠svn.reactos.org 13 Jun '11

13 Jun '11

Author: gadamopoulos Date: Mon Jun 13 19:34:06 2011 New Revision: 52218 URL: http://svn.reactos.org/svn/reactos?rev=52218&view=rev Log: [browseui] - Fix some compilation errors with msvc Modified: trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=52218… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Mon Jun 13 19:34:06 2011 @@ -24,7 +24,7 @@ #define GCCU(x) x __attribute__((unused)) #define Unused(x) #else -#define GCCU(x) +#define GCCU(x) (x) #define Unused(x) (x); #endif // __GNUC__

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs