Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 15107: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/boot/freeldr/fdebug/resource.h Modified: trunk/reactos/boot/freeldr/fdebug/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/rtl.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/math/i386.h Modified: trunk/reactos/boot/freeldr/freeldr/math/powerpc.h Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/memset.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/version.c Modified: trunk/reactos/boot/freeldr/freeldr/video/bank.c Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/video/palette.c Modified: trunk/reactos/boot/freeldr/freeldr/video/pixel.c Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c Modified: trunk/reactos/boot/freeldr/install/linux/finstext2.h Modified: trunk/reactos/boot/freeldr/install/volume.c Modified: trunk/reactos/boot/freeldr/ntvdmpat.c _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c --- trunk/reactos/boot/freeldr/fdebug/fdebug.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -57,7 +57,7 @@ MyRegisterClass(hInstance); // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) + if (!InitInstance (hInstance, nCmdShow)) { return FALSE; } @@ -65,9 +65,9 @@ hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FDEBUG); // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -96,7 +96,7 @@ { WNDCLASSEX wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = (WNDPROC)WndProc; @@ -156,7 +156,7 @@ NONCLIENTMETRICS ncm; HFONT hFont; - switch (message) + switch (message) { case WM_CREATE: @@ -174,7 +174,7 @@ break; case WM_COMMAND: - wmId = LOWORD(wParam); + wmId = LOWORD(wParam); wmEvent = HIWORD(wParam); if (lParam == (LPARAM)hEditWnd && wmEvent == EN_CHANGE) @@ -312,7 +312,7 @@ return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -340,7 +340,7 @@ GetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate, MAX_PATH); } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -392,7 +392,7 @@ GetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName, MAX_PATH); } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { EndDialog(hDlg, LOWORD(wParam)); return TRUE; _____ Modified: trunk/reactos/boot/freeldr/fdebug/resource.h --- trunk/reactos/boot/freeldr/fdebug/resource.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/resource.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -29,7 +29,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 132 _____ Modified: trunk/reactos/boot/freeldr/fdebug/rs232.c --- trunk/reactos/boot/freeldr/fdebug/rs232.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/fdebug/rs232.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -83,16 +83,16 @@ // [in] Pointer to a null-terminated string that specifies device-control information. // The string must have the same form as the mode command's command-line arguments. // -// For example, the following string specifies a baud rate of 1200, no parity, 8 data bits, and 1 stop bit: +// For example, the following string specifies a baud rate of 1200, no parity, 8 data bits, and 1 stop bit: // "baud=1200 parity=N data=8 stop=1" // // The following string specifies a baud rate of 115200, no parity, 8 data bits, and 1 stop bit: // "115200,n,8,1" // -// The device name is ignored if it is included in the string, but it must specify a valid device, as follows: +// The device name is ignored if it is included in the string, but it must specify a valid device, as follows: // "COM1: baud=1200 parity=N data=8 stop=1" // -// For further information on mode command syntax, refer to the end-user documentation for your operating system. +// For further information on mode command syntax, refer to the end-user documentation for your operating system. BOOL Rs232ConfigurePortWin32(TCHAR* DeviceControlString) { DCB dcb; @@ -157,28 +157,28 @@ } // Members -// ReadIntervalTimeout -// Specifies the maximum time, in milliseconds, allowed to elapse between the arrival of two characters on the communications line. During a ReadFile operation, the time period begins when the first character is received. If the interval between the arrival of any two characters exceeds this amount, the ReadFile operation is completed and any buffered data is returned. A value of zero indicates that interval time-outs are not used. -// A value of MAXDWORD, combined with zero values for both the ReadTotalTimeoutConstant and ReadTotalTimeoutMultiplier members, specifies that the read operation is to return immediately with the characters that have already been received, even if no characters have been received. -// -// ReadTotalTimeoutMultiplier -// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is multiplied by the requested number of bytes to be read. -// ReadTotalTimeoutConstant -// Specifies the constant, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is added to the product of the ReadTotalTimeoutMultiplier member and the requested number of bytes. -// A value of zero for both the ReadTotalTimeoutMultiplier and ReadTotalTimeoutConstant members indicates that total time-outs are not used for read operations. -// -// WriteTotalTimeoutMultiplier -// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is multiplied by the number of bytes to be written. -// WriteTotalTimeoutConstant -// Specifies the constant, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is added to the product of the WriteTotalTimeoutMultiplier member and the number of bytes to be written. -// A value of zero for both the WriteTotalTimeoutMultiplier and WriteTotalTimeoutConstant members indicates that total time-outs are not used for write operations. -// +// ReadIntervalTimeout +// Specifies the maximum time, in milliseconds, allowed to elapse between the arrival of two characters on the communications line. During a ReadFile operation, the time period begins when the first character is received. If the interval between the arrival of any two characters exceeds this amount, the ReadFile operation is completed and any buffered data is returned. A value of zero indicates that interval time-outs are not used. +// A value of MAXDWORD, combined with zero values for both the ReadTotalTimeoutConstant and ReadTotalTimeoutMultiplier members, specifies that the read operation is to return immediately with the characters that have already been received, even if no characters have been received. +// +// ReadTotalTimeoutMultiplier +// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is multiplied by the requested number of bytes to be read. +// ReadTotalTimeoutConstant +// Specifies the constant, in milliseconds, used to calculate the total time-out period for read operations. For each read operation, this value is added to the product of the ReadTotalTimeoutMultiplier member and the requested number of bytes. +// A value of zero for both the ReadTotalTimeoutMultiplier and ReadTotalTimeoutConstant members indicates that total time-outs are not used for read operations. +// +// WriteTotalTimeoutMultiplier +// Specifies the multiplier, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is multiplied by the number of bytes to be written. +// WriteTotalTimeoutConstant +// Specifies the constant, in milliseconds, used to calculate the total time-out period for write operations. For each write operation, this value is added to the product of the WriteTotalTimeoutMultiplier member and the number of bytes to be written. +// A value of zero for both the WriteTotalTimeoutMultiplier and WriteTotalTimeoutConstant members indicates that total time-outs are not used for write operations. +// // Remarks -// If an application sets ReadIntervalTimeout and ReadTotalTimeoutMultiplier to MAXDWORD and sets ReadTotalTimeoutConstant to a value greater than zero and less than MAXDWORD, one of the following occurs when the ReadFile function is called: -// -// If there are any characters in the input buffer, ReadFile returns immediately with the characters in the buffer. -// If there are no characters in the input buffer, ReadFile waits until a character arrives and then returns immediately. -// If no character arrives within the time specified by ReadTotalTimeoutConstant, ReadFile times out. +// If an application sets ReadIntervalTimeout and ReadTotalTimeoutMultiplier to MAXDWORD and sets ReadTotalTimeoutConstant to a value greater than zero and less than MAXDWORD, one of the following occurs when the ReadFile function is called: +// +// If there are any characters in the input buffer, ReadFile returns immediately with the characters in the buffer. +// If there are no characters in the input buffer, ReadFile waits until a character arrives and then returns immediately. +// If no character arrives within the time specified by ReadTotalTimeoutConstant, ReadFile times out. BOOL Rs232SetCommunicationTimeoutsWin32(DWORD ReadIntervalTimeout, DWORD ReadTotalTimeoutMultiplier, DWORD ReadTotalTimeoutConstant, DWORD WriteTotalTimeoutMultiplier, DWORD WriteTotalTimeoutConstant) { COMMTIMEOUTS ct; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -197,44 +197,44 @@ WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */ WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */ - + /* Stage 1: Coarse calibration */ - + WaitFor8254Wraparound(); - + delay_count = 1; - + do { delay_count <<= 1; /* Next delay count to try */ WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); } while (CurCount > LATCH / 2); - + delay_count >>= 1; /* Get bottom value for delay */ - + /* Stage 2: Fine calibration */ - + calib_bit = delay_count; /* Which bit are we going to test */ - + for(i=0;i<PRECISION;i++) { calib_bit >>= 1; /* Next bit to calibrate */ if(!calib_bit) break; /* If we have done all bits, stop */ - + delay_count |= calib_bit; /* Set the bit in delay_count */ - + WaitFor8254Wraparound(); - + __StallExecutionProcessor(delay_count); /* Do the delay */ - + CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ delay_count &= ~calib_bit; /* calibrated bit back off */ } - + /* We're finished: Do the finishing touches */ delay_count /= (MILLISEC / 2); /* Calculate delay_count for 1ms */ } _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -464,7 +464,7 @@ if (ConfigTable->Signature != MP_CT_SIGNATURE) return NULL; - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "MP Configuration Table at: %x\n", (ULONG)ConfigTable)); @@ -538,7 +538,7 @@ CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr; DbgPrint((DPRINT_HWDETECT, "Processor Entry\n")); - DbgPrint((DPRINT_HWDETECT, + DbgPrint((DPRINT_HWDETECT, "APIC Id %u APIC Version %u Flags %x Signature %x Feature %x\n", CpuEntry->LocalApicId, CpuEntry->LocalApicVersion, _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -168,7 +168,7 @@ return TRUE; } -BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) { PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR VolumeType; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -47,12 +47,12 @@ // interrupt from the AT real-time clock chip which is available on INT 70; // because newer BIOSes may have much more precise timers available, it is // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) + // the precise behavior of the BIOS is known (or found through testing) while (msec) { msec_this = msec; - + if (msec_this > 4000) { msec_this = 4000; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -88,7 +88,7 @@ // A search must then be made to find them, FFFFh will also terminate this // second list. In some cases, only a "stub" VBE may be present, supporting // only AX=4F00h; this case may be assumed if the list of supported video modes -// is empty (consisting of a single word of FFFFh) +// is empty (consisting of a single word of FFFFh) VOID BiosSetVideoFont8x16(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -136,7 +136,7 @@ * CH = feature connector bits * CL = switch settings * AH destroyed (at least by Tseng ET4000 BIOS v8.00n) - * + * * Installation check;EGA */ Regs.b.ah = 0x12; @@ -161,7 +161,7 @@ * This function is commonly used to check for the presence of a VGA. * * Installation check;VGA - * + * * Values for display combination code: * 00h no display * 01h monochrome adapter w/ monochrome display @@ -309,15 +309,15 @@ * CL = bottom scan line containing cursor (bits 0-4) * Return: * Nothing - * + * * Specify the starting and ending scan lines to be occupied * by the hardware cursor in text modes. * * AMI 386 BIOS and AST Premier 386 BIOS will lock up the * system if AL is not equal to the current video mode. - * + * * Bitfields for cursor start and options: - * + * * Bit(s) Description * 7 should be zero * 6,5 cursor blink @@ -460,7 +460,7 @@ * * Note: While VBE 1.1 and higher will zero out all unused bytes * of the buffer, v1.0 did not, so applications that want to be - * backward compatible should clear the buffer before calling + * backward compatible should clear the buffer before calling */ Regs.w.ax = 0x4F01; Regs.w.cx = Mode; @@ -563,7 +563,7 @@ * 121h 1600x1200x32K * 122h 1600x1200x64K * 81FFh special full-memory access mode - * + * * Notes: The special mode 81FFh preserves the contents of the video memory and gives * access to all of the memory; VESA recommends that the special mode be a packed-pixel * mode. For VBE 2.0+, it is required that the VBE implement the mode, but not place it _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -58,8 +58,8 @@ PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; insb\n\t" - : "=D" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; insb\n\t" + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -71,7 +71,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insw" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -83,17 +83,17 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; insl" - : "=D" (Buffer), "=c" (Count) + : "=D" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } #undef READ_PORT_UCHAR -UCHAR +UCHAR STDCALL READ_PORT_UCHAR (PUCHAR Port) { UCHAR Value; - + __asm__("inb %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -107,7 +107,7 @@ READ_PORT_USHORT (USHORT* Port) { USHORT Value; - + __asm__("inw %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -121,7 +121,7 @@ READ_PORT_ULONG (ULONG* Port) { ULONG Value; - + __asm__("inl %w1, %0\n\t" : "=a" (Value) : "d" (Port)); @@ -130,14 +130,14 @@ } #undef WRITE_PORT_BUFFER_UCHAR -VOID +VOID STDCALL WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsb" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsb" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -149,7 +149,7 @@ ULONG Count) { __asm__ __volatile__ ("cld ; rep ; outsw" - : "=S" (Buffer), "=c" (Count) + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -160,8 +160,8 @@ ULONG* Buffer, ULONG Count) { - __asm__ __volatile__ ("cld ; rep ; outsl" - : "=S" (Buffer), "=c" (Count) + __asm__ __volatile__ ("cld ; rep ; outsl" + : "=S" (Buffer), "=c" (Count) : "d" (Port),"0" (Buffer),"1" (Count)); } @@ -172,7 +172,7 @@ UCHAR Value) { __asm__("outb %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -185,7 +185,7 @@ USHORT Value) { __asm__("outw %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; @@ -198,7 +198,7 @@ ULONG Value) { __asm__("outl %0, %w1\n\t" - : + : : "a" (Value), "d" (Port)); SLOW_DOWN_IO; _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -149,7 +149,7 @@ #define IDEWriteDMAStatus(Address, Data) \ (WRITE_PORT_UCHAR((PUCHAR)((Address) + 2), (Data))) #define IDEWritePRDTable(Address, Data) \ - (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) + (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data))) /* * Data block read and write commands _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -31,11 +31,11 @@ BOOLEAN AcpiPresent = FALSE; char BootPath[0x100]; -void le_swap( const void *start_addr_v, - const void *end_addr_v, +void le_swap( const void *start_addr_v, + const void *end_addr_v, const void *target_addr_v ) { - long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), - *end_addr = (long *)ROUND_UP((long)end_addr_v,8), + long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), + *end_addr = (long *)ROUND_UP((long)end_addr_v,8), *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8); long tmp; while( start_addr <= end_addr ) { @@ -107,7 +107,7 @@ void PpcPutChar( int ch ) { char buf[3]; - if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } + if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } buf[2] = 0; ofw_print_string( buf ); @@ -167,12 +167,12 @@ return FALSE; } -VOID PpcVideoSetPaletteColor( UCHAR Color, +VOID PpcVideoSetPaletteColor( UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue ) { printf( "SetPaletteColor(%x,%x,%x,%x)\n", Color, Red, Green, Blue ); } -VOID PpcVideoGetPaletteColor( UCHAR Color, +VOID PpcVideoGetPaletteColor( UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue ) { printf( "GetPaletteColor(%x)\n", Color); } @@ -198,7 +198,7 @@ BiosMemoryMap[0].BaseAddress = 0; BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for now */ - printf( "Returning memory map (%dk total)\n", + printf( "Returning memory map (%dk total)\n", (int)BiosMemoryMap[0].Length / 1024 ); return 1; @@ -226,7 +226,7 @@ return 0; } -VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, +VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second ) { printf("RTCGeturrentDateTime\n"); } @@ -256,7 +256,7 @@ MachVtbl.VideoSetTextCursorPosition = PpcVideoSetTextCursorPosition; MachVtbl.VideoHideShowTextCursor = PpcVideoHideShowTextCursor; MachVtbl.VideoPutChar = PpcVideoPutChar; - MachVtbl.VideoCopyOffScreenBufferToVRAM = + MachVtbl.VideoCopyOffScreenBufferToVRAM = PpcVideoCopyOffScreenBufferToVRAM; MachVtbl.VideoIsPaletteFixed = PpcVideoIsPaletteFixed; MachVtbl.VideoSetPaletteColor = PpcVideoSetPaletteColor; @@ -276,13 +276,13 @@ MachVtbl.HwDetect = PpcHwDetect; printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); - BootMain("freeldr-ppc"); + BootMain("freeldr-ppc"); } void MachInit(char *CmdLine) { int len; printf( "Determining boot device:\n" ); - len = ofw_getprop(chosen_package, "bootpath", + len = ofw_getprop(chosen_package, "bootpath", BootPath, sizeof(BootPath)); printf( "Got %d bytes of path\n", len ); BootPath[len] = 0; _____ Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -89,7 +89,7 @@ CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock); } } - + return NULL; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <freeldr.h> +#include <freeldr.h> #include <cmdline.h> #include <rtl.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <ui.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -109,7 +109,7 @@ // They want an extended partition entry so we will need // to loop through all the extended partitions on the disk // and return the one they want. - + ExtendedPartitionNumber = PartitionNumber - 5; // Set the initial relative starting sector to 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <drivemap.h> #include <rtl.h> @@ -120,7 +120,7 @@ BOOL DriveMapIsValidDriveString(PCHAR DriveString) { ULONG Index; - + // Now verify that the user has given us appropriate strings if ((strlen(DriveString) < 3) || ((DriveString[0] != 'f') && (DriveString[0] != 'F') && (DriveString[0] != 'h') && (DriveString[0] != 'H')) || _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - + #include <freeldr.h> #include <rtl.h> #include <arch.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -949,7 +949,7 @@ { return FALSE; } - + // Copy the data to their buffer RtlCopyMemory(InodeBuffer, (PVOID)(FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -318,8 +318,8 @@ SectorsPerFat = FatBootSector->SectorsPerFat ? FatBootSector->SectorsPerFat : Fat32BootSector->SectorsPerFatBig; TotalSectors = FatBootSector->TotalSectors ? FatBootSector->TotalSectors : FatBootSector->TotalSectorsBig; DataSectorCount = TotalSectors - (FatBootSector->ReservedSectors + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors); - -//mjl + +//mjl if (FatBootSector->SectorsPerCluster == 0) CountOfClusters = 0; else @@ -861,7 +861,7 @@ } fat = *((USHORT *) ((PVOID)FILESYSBUFFER + ThisFatEntOffset)); - if (Cluster & 0x0001) + if (Cluster & 0x0001) fat = fat >> 4; /* Cluster number is ODD */ else fat = fat & 0x0FFF; /* Cluster number is EVEN */ @@ -870,7 +870,7 @@ case FAT16: case FATX16: - + FatOffset = (Cluster * 2); ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); ThisFatEntOffset = (FatOffset % BytesPerSector); @@ -1111,7 +1111,7 @@ break; } } - + return TRUE; } _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -46,7 +46,7 @@ UCHAR BootCodeAndData[448]; // The remainder of the boot sector USHORT BootSectorMagic; // 0xAA55 - + } PACKED FAT_BOOTSECTOR, *PFAT_BOOTSECTOR; typedef struct _FAT32_BOOTSECTOR @@ -82,7 +82,7 @@ UCHAR BootCodeAndData[420]; // The remainder of the boot sector USHORT BootSectorMagic; // 0xAA55 - + } PACKED FAT32_BOOTSECTOR, *PFAT32_BOOTSECTOR; typedef struct _FATX_BOOTSECTOR @@ -93,7 +93,7 @@ USHORT NumberOfFats; /* Number of FAT tables */ ULONG Unknown; /* Always 0? */ UCHAR Unused[494]; /* Actually size should be 4078 (boot block is 4096 bytes) */ - + } PACKED FATX_BOOTSECTOR, *PFATX_BOOTSECTOR; /* _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -139,7 +139,7 @@ { FileName++; } - + // // Check file system type and pass off to appropriate handler // _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-05-08 02:15:21 UTC (rev 15107) @@ -110,7 +110,7 @@ { AttrName = (PWCHAR)((PCHAR)AttrRecord + AttrRecord->NameOffset); if (!RtlCompareMemory(AttrName, Name, NameLength << 1)) - { + { /* Found it, fill up the context and return. */ Context->Record = AttrRecord; if (AttrRecord->IsNonResident) @@ -125,7 +125,7 @@ if (DataRunOffset != -1) { /* Normal run. */ - Context->CacheRunStartLCN = + Context->CacheRunStartLCN = Context->CacheRunLastLCN = DataRunOffset; } else @@ -200,7 +200,7 @@ ULONGLONG CurrentOffset; ULONGLONG ReadLength; ULONGLONG AlreadyRead; - + if (!Context->Record->IsNonResident) { if (Offset > Context->Record->Resident.ValueLength) @@ -286,7 +286,7 @@ /* * Go to next run in the list. */ - + if (*DataRun == 0) break; DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); @@ -341,7 +341,7 @@ BOOL NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer) { ULONGLONG BytesRead; - + BytesRead = NtfsReadAttribute(&NtfsMFTContext, MFTIndex * NtfsMftRecordSize, (PCHAR)Buffer, NtfsMftRecordSize); if (BytesRead != NtfsMftRecordSize) return FALSE; @@ -433,7 +433,7 @@ MmFreeMemory(MftRecord); return FALSE; } - + IndexRecord = MmAllocateMemory(NtfsIndexRecordSize); if (IndexRecord == NULL) { @@ -514,7 +514,7 @@ break; RecordOffset += IndexBlockSize; } - + if (RecordOffset >= IndexAllocationSize) { break; @@ -533,7 +533,7 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) - { + { if (NtfsCompareFileName(FileName, IndexEntry)) { DbgPrint((DPRINT_FILESYSTEM, "File found\n")); @@ -551,7 +551,7 @@ MmFreeMemory(BitmapData); } - + MmFreeMemory(IndexRecord); } else _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -57,7 +57,7 @@ #define NTFS_FILE_NAME_POSIX 0 #define NTFS_FILE_NAME_WIN32 1 #define NTFS_FILE_NAME_DOS 2 -#define NTFS_FILE_NAME_WIN32_AND_DOS 3 +#define NTFS_FILE_NAME_WIN32_AND_DOS 3 typedef struct { _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -37,7 +37,7 @@ #define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) #define ROUND_DOWN(N, S) ((N) & ~((S) - 1)) #define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") - + extern BOOL UserInterfaceUp; /* Tells us if the user interface is displayed */ VOID BootMain(LPSTR CmdLine); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h --- trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -102,9 +102,9 @@ ULONG Code32Start; // here loaders can put a different // start address for 32-bit code. - // + // // 0x1000 = default for zImage - // + // // 0x100000 = default for big kernel ULONG RamdiskAddress; // address of loaded ramdisk image _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h --- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -39,7 +39,7 @@ VOID (*ConsPutChar)(int Ch); BOOL (*ConsKbHit)(VOID); int (*ConsGetCh)(VOID); - + VOID (*VideoClearScreen)(UCHAR Attr); VIDEODISPLAYMODE (*VideoSetDisplayMode)(char *DisplayMode, BOOL Init); VOID (*VideoGetDisplaySize)(PULONG Width, PULONG Height, PULONG Depth); _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h --- trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-08 02:11:54 UTC (rev 15106) +++ trunk/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-05-08 02:15:21 UTC (rev 15107) @@ -1,16 +1,16 @@ /* multiboot.h - the header for Multiboot */ /* Copyright (C) 1999 Free Software Foundation, Inc. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -157,48 +157,48 @@ STDCALL FrLdrCreateModule(LPSTR ModuleName); -ULONG_PTR -STDCALL -FrLdrLoadModule(FILE *ModuleImage, - LPSTR ModuleName, +ULONG_PTR +STDCALL +FrLdrLoadModule(FILE *ModuleImage, + LPSTR ModuleName, PULONG ModuleSize); BOOL STDCALL FrLdrLoadKernel(PCHAR szFileName, INT nPos); - + BOOL -FrLdrLoadNlsFile(PCHAR szSystemRoot, +FrLdrLoadNlsFile(PCHAR szSystemRoot, PCHAR szErrorOut); - + BOOL -FrLdrLoadDriver(PCHAR szFileName, +FrLdrLoadDriver(PCHAR szFileName, INT nPos); BOOL LoadSymbolFile(PCHAR szSystemRoot, PCHAR ModuleName, INT nPos); - + VOID -FrLdrLoadBootDrivers(PCHAR szSystemRoot, +FrLdrLoadBootDrivers(PCHAR szSystemRoot, INT nPos); - + BOOL STDCALL -FrLdrCloseModule(ULONG_PTR ModuleBase, +FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID -STDCALL +STDCALL FrLdrStartup(ULONG Magic); -VOID -FASTCALL +VOID +FASTCALL FrLdrGetKernelBase(VOID); -VOID -FASTCALL +VOID +FASTCALL FrLdrSetupPae(ULONG Magic); VOID [truncated at 1000 lines; 1866 more skipped]

1 0

[sedwards] 15106: remove whitespace from end of lines
by sedwards＠svn.reactos.com 08 May '05

08 May '05

remove whitespace from end of lines Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/clip.c Modified: trunk/reactos/subsys/win32k/eng/debug.c Modified: trunk/reactos/subsys/win32k/eng/device.c Modified: trunk/reactos/subsys/win32k/eng/event.c Modified: trunk/reactos/subsys/win32k/eng/float.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/eng/objects.h Modified: trunk/reactos/subsys/win32k/eng/paint.c Modified: trunk/reactos/subsys/win32k/eng/palette.c Modified: trunk/reactos/subsys/win32k/eng/surface.c Modified: trunk/reactos/subsys/win32k/eng/transblt.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/include/intgdi.h Modified: trunk/reactos/subsys/win32k/include/menu.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/ldr/loader.c Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/main/svctabm.c Modified: trunk/reactos/subsys/win32k/misc/driver.c Modified: trunk/reactos/subsys/win32k/misc/object.c Modified: trunk/reactos/subsys/win32k/misc/ssec.c Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/csr.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/timer.c Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bezier.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c Modified: trunk/reactos/subsys/win32k/objects/coord.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/palette.c Modified: trunk/reactos/subsys/win32k/objects/path.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/subsys/win32k/objects/polyfill.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/stockobj.c Modified: trunk/reactos/subsys/win32k/objects/wingl.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -95,7 +95,7 @@ ULONG ResultNibble; ULONG Result; ULONG i; - static const ULONG ExpandDest[16] = + static const ULONG ExpandDest[16] = { 0x55555555 /* 0000 */, 0x555555AA /* 0001 */, @@ -114,7 +114,7 @@ 0xAAAAAA55 /* 1110 */, 0xAAAAAAAA /* 1111 */, }; - static const ULONG ExpandSource[16] = + static const ULONG ExpandSource[16] = { 0x33333333 /* 0000 */, 0x333333CC /* 0001 */, @@ -133,7 +133,7 @@ 0xCCCCCC33 /* 1110 */, 0xCCCCCCCC /* 1111 */, }; - static const ULONG ExpandPattern[16] = + static const ULONG ExpandPattern[16] = { 0x0F0F0F0F /* 0000 */, 0x0F0F0FF0 /* 0001 */, @@ -180,7 +180,7 @@ for (i = 0; i < 8; i++) { ResultNibble = Rop & ExpandDest[Dest & 0xF] & ExpandSource[Source & 0xF] & ExpandPattern[Pattern & 0xF]; - Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) | ((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) | + Result |= (((ResultNibble & 0xFF000000) ? 0x8 : 0x0) | ((ResultNibble & 0x00FF0000) ? 0x4 : 0x0) | ((ResultNibble & 0x0000FF00) ? 0x2 : 0x0) | ((ResultNibble & 0x000000FF) ? 0x1 : 0x0)) << (i * 4); Dest >>= 4; Source >>= 4; _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -310,8 +310,8 @@ ULONG RoundedRight; UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - + UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); + RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x1); SourceY = BltInfo->SourcePoint.y; @@ -324,7 +324,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -337,11 +337,11 @@ for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -369,7 +369,7 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_16BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF); DestBits = (PULONG)((ULONG_PTR)DestBits + 2); @@ -386,7 +386,7 @@ ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 1) + BltInfo->DestSurface->lDelta); } - + return TRUE; } @@ -415,22 +415,22 @@ }*/ /* if */ // This one should be correct, but it's too long -/* +/* unsigned char r1, g1, b1, r2, g2, b2, rr, gr, br; unsigned short res; - + r1 = (a & 0xF800) >> 11; g1 = (a & 0x7E0) >> 5; b1 = (a & 0x1F); - + r2 = (b & 0xF800) >> 11; g2 = (b & 0x7E0) >> 5; b2 = (b & 0x1F); - + rr = (r1+r2) / 2; gr = (g1+g2) / 2; br = (b1+b2) / 2; - + res = (rr << 11) + (gr << 5) + br; return res; @@ -473,7 +473,7 @@ UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -561,7 +561,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg16(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -629,46 +629,46 @@ case BMF_24BPP: case BMF_32BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; case BMF_16BPP: return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - - + + return TRUE; } -BOOLEAN +BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; ULONG *DestBits; - + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1); SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + (DestRect->left << 1) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 1); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2) { Dest = *DestBits; - + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); if(Source != iTransColor) { @@ -685,7 +685,7 @@ *DestBits = Dest; } - + if(X < DestRect->right) { Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); @@ -693,13 +693,13 @@ { *((USHORT*)DestBits) = (USHORT)XLATEOBJ_iXlate(ColorTranslation, Source); } - + DestBits = (PULONG)((ULONG_PTR)DestBits + 2); } SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -352,7 +352,7 @@ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - RoundedRight = BltInfo->DestRect.right - + RoundedRight = BltInfo->DestRect.right - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 31); SourceY = BltInfo->SourcePoint.y; @@ -360,7 +360,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -383,7 +383,7 @@ { #if 0 /* FIXME: This case is completely untested!!! */ - + Dest = *((PBYTE)DestBits); NoBits = 31 - (DestX & 31); @@ -402,12 +402,12 @@ Pattern |= (DIB_GetSource(PatternObj, (X + BrushOrigin.x + k) % PatternWidth, PatternY, BltInfo->XlatePatternToDest) << (31 - k)); } - Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); + Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); Dest &= ~((1 << (31 - NoBits)) - 1); Dest |= *((PBYTE)DestBits) & ((1 << (31 - NoBits)) - 1); *DestBits = Dest; - + DestX += NoBits; SourceX += NoBits; #endif @@ -441,7 +441,7 @@ } } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } if (DestX < BltInfo->DestRect.right) @@ -474,7 +474,7 @@ PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; } } - + return TRUE; } @@ -490,7 +490,7 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -246,7 +246,7 @@ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - + SourceY = BltInfo->SourcePoint.y; DestBits = (PBYTE)( BltInfo->DestSurface->pvScan0 + @@ -257,7 +257,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -269,11 +269,11 @@ for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits += 3, SourceX++) { Dest = *((PUSHORT)DestBits) + (*(DestBits + 2) << 16); - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -298,7 +298,7 @@ DestBits -= (BltInfo->DestRect.right - BltInfo->DestRect.left) * 3; DestBits += BltInfo->DestSurface->lDelta; } - + return TRUE; } @@ -312,20 +312,20 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG X, Y, SourceX, SourceY, Source, wd, Dest; BYTE *DestBits; - + SourceY = SourcePoint->y; DestBits = (BYTE*)(DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; @@ -339,11 +339,11 @@ *(DestBits + 2) = Dest >> 16; } } - + SourceY++; DestBits = (BYTE*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -306,7 +306,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -314,15 +314,15 @@ Pattern = BltInfo->Brush->iSolidColor; } } - + for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - + for (DestX = BltInfo->DestRect.left; DestX < BltInfo->DestRect.right; DestX++, DestBits++, SourceX++) { Dest = *DestBits; - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); @@ -347,7 +347,7 @@ ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 2) + BltInfo->DestSurface->lDelta); } - + return TRUE; } @@ -398,13 +398,13 @@ while (skip-- > 0) *Target++ = *Source; } - + static BOOLEAN FinalCopy32(PIXEL *Target, PIXEL *Source, PSPAN ClipSpans, UINT ClipSpansCount, UINT *SpanIndex, UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -458,7 +458,7 @@ UINT ClipSpansCount; UINT SpanIndex; LONG DestY; - + if (! ClipobjToSpans(&ClipSpans, &ClipSpansCount, ClipRegion, DestRect)) { return FALSE; @@ -492,7 +492,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg32(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -500,7 +500,7 @@ ScanLine[x] = average32(ScanLine[x], ScanLineAhead[x]); PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta); } /* if */ - + if (! FinalCopy32(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect)) { /* No more spans, everything else is clipped away, we're done */ @@ -560,38 +560,38 @@ case BMF_16BPP: case BMF_24BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; - + case BMF_32BPP: return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: //DPRINT1("DIB_32BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - - + + return TRUE; } -BOOLEAN +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG X, Y, SourceX, SourceY, Source, wd; ULONG *DestBits; - + SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + (DestRect->left << 2) + DestRect->top * DestSurf->lDelta); wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { SourceX = SourcePoint->x; @@ -603,11 +603,11 @@ *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); } } - + SourceY++; DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -231,7 +231,7 @@ BOOLEAN UsesPattern; PULONG DestBits; LONG RoundedRight; - static const ULONG ExpandSolidColor[16] = + static const ULONG ExpandSolidColor[16] = { 0x00000000 /* 0 */, 0x11111111 /* 1 */, @@ -262,7 +262,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -292,7 +292,7 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); @@ -307,13 +307,13 @@ if (UsesSource) { Source = - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest)) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 0, SourceY, BltInfo->XlateSourceToDest) << 4) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 3, SourceY, BltInfo->XlateSourceToDest) << 8) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 2, SourceY, BltInfo->XlateSourceToDest) << 12) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 5, SourceY, BltInfo->XlateSourceToDest) << 16) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 4, SourceY, BltInfo->XlateSourceToDest) << 20) | - (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) | + (DIB_GetSource(BltInfo->SourceSurface, SourceX + 7, SourceY, BltInfo->XlateSourceToDest) << 24) | (DIB_GetSource(BltInfo->SourceSurface, SourceX + 6, SourceY, BltInfo->XlateSourceToDest) << 28); } if (BltInfo->PatternSurface) @@ -327,7 +327,7 @@ Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 7) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 6) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 28; } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } /* Process the rest of pixel on the line */ @@ -341,9 +341,9 @@ if (BltInfo->PatternSurface) { Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } + } DIB_4BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); - } + } SourceY++; if (BltInfo->PatternSurface) @@ -366,7 +366,7 @@ return FALSE; } -BOOLEAN +BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -271,7 +271,7 @@ { if (BltInfo->PatternSurface) { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % + PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % BltInfo->PatternSurface->sizlBitmap.cy; } else @@ -311,7 +311,7 @@ Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; } - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); + *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); } if (DestX < BltInfo->DestRect.right) @@ -319,7 +319,7 @@ for (; DestX < BltInfo->DestRect.right; DestX++) { Dest = DIB_8BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); - + if (UsesSource) { Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest); @@ -397,7 +397,7 @@ UINT DestY, RECTL *DestRect) { LONG Left, Right; - + while (ClipSpans[*SpanIndex].Y < DestY || (ClipSpans[*SpanIndex].Y == DestY && ClipSpans[*SpanIndex].X + ClipSpans[*SpanIndex].Width < DestRect->left)) @@ -485,7 +485,7 @@ } /* if */ PrevSource = Source; } /* if */ - + if (E >= Mid && PrevSourceAhead != (PIXEL *)((BYTE *)Source + SourceSurf->lDelta)) { int x; ScaleLineAvg8(ScanLineAhead, (PIXEL *)((BYTE *)Source + SourceSurf->lDelta), SourceRect->right - SourceRect->left, DestRect->right - DestRect->left); @@ -493,7 +493,7 @@ ScanLine[x] = average8(ScanLine[x], ScanLineAhead[x]); PrevSourceAhead = (PIXEL *)((BYTE *)Source + SourceSurf->lDelta); } /* if */ - + if (! FinalCopy8(Target, ScanLine, ClipSpans, ClipSpansCount, &SpanIndex, DestY, DestRect)) { /* No more spans, everything else is clipped away, we're done */ @@ -552,36 +552,36 @@ case BMF_24BPP: case BMF_32BPP: /* Not implemented yet. */ - return FALSE; + return FALSE; break; - + case BMF_8BPP: return ScaleRectAvg8(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - + default: DPRINT1("DIB_8BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } - + return TRUE; } -BOOLEAN +BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, POINTL *SourcePoint, XLATEOBJ *ColorTranslation, ULONG iTransColor) { ULONG RoundedRight, X, Y, SourceX, SourceY, Source, wd, Dest; ULONG *DestBits; - + RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); SourceY = SourcePoint->y; DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); wd = DestSurf->lDelta - (DestRect->right - DestRect->left); - + for(Y = DestRect->top; Y < DestRect->bottom; Y++) { DestBits = (ULONG*)(DestSurf->pvScan0 + DestRect->left + @@ -590,7 +590,7 @@ for (X = DestRect->left; X < RoundedRight; X += 4, DestBits++) { Dest = *DestBits; - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { @@ -604,14 +604,14 @@ Dest &= 0xFFFF00FF; Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 8) & 0xFF00); } - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { Dest &= 0xFF00FFFF; Dest |= ((XLATEOBJ_iXlate(ColorTranslation, Source) << 16) & 0xFF0000); } - + Source = DIB_GetSourceIndex(SourceSurf, SourceX++, SourceY); if(Source != iTransColor) { @@ -621,7 +621,7 @@ *DestBits = Dest; } - + if(X < DestRect->right) { for (; X < DestRect->right; X++) @@ -636,7 +636,7 @@ } SourceY++; } - + return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -75,7 +75,7 @@ static BOOLEAN STDCALL BltMask(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, @@ -93,7 +93,7 @@ SURFOBJ *PatternObj = NULL; PBITMAPOBJ PatternBitmap; ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; - + if (Mask == NULL) { return FALSE; @@ -126,10 +126,10 @@ { lMask = tMask; c8 = SourcePoint->x & 0x07; - + if(PatternBitmap != NULL) PatternY = (DestRect->top + j) % PatternHeight; - + for (i = 0; i < dx; i++) { if (0 != (*lMask & maskbit[c8])) @@ -165,7 +165,7 @@ static BOOLEAN STDCALL BltPatCopy(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, @@ -375,7 +375,7 @@ OutputRect.right = DestRect->right + Translate.x; OutputRect.top = DestRect->top + Translate.y; OutputRect.bottom = DestRect->bottom + Translate.y; - + if(BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; @@ -644,7 +644,7 @@ ) { // www.osr.com/ddk/graphics/gdifncs_0bs7.htm - + POINTL InputPoint; RECTL InputRect; RECTL OutputRect; @@ -669,7 +669,7 @@ InputPoint.x = InputRect.left + Translate.x; InputPoint.y = InputRect.top + Translate.y; - + OutputRect = *prclDest; /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's @@ -690,7 +690,7 @@ OutputRect.right = prclDest->right + Translate.x; OutputRect.top = prclDest->top + Translate.y; OutputRect.bottom = prclDest->bottom + Translate.y; - + if (NULL != BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; @@ -707,8 +707,8 @@ DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); IntEngLeave(&EnterLeaveDest); IntEngLeave(&EnterLeaveSource); - - return FALSE; + + return FALSE; } else { @@ -803,7 +803,7 @@ static BOOLEAN STDCALL AlphaBltMask(SURFOBJ* Dest, SURFOBJ* Source, - SURFOBJ* Mask, + SURFOBJ* Mask, XLATEOBJ* ColorTranslation, XLATEOBJ* SrcColorTranslation, RECTL* DestRect, @@ -826,7 +826,7 @@ r = (int)GetRValue(BrushColor); g = (int)GetGValue(BrushColor); b = (int)GetBValue(BrushColor); - + tMask = Mask->pvScan0 + (SourcePoint->y * Mask->lDelta) + SourcePoint->x; for (j = 0; j < dy; j++) { @@ -845,7 +845,7 @@ Background = DIB_GetSource(Dest, DestRect->left + i, DestRect->top + j, SrcColorTranslation); - NewColor = + NewColor = RGB((*lMask * (r - GetRValue(Background)) >> 8) + GetRValue(Background), (*lMask * (g - GetGValue(Background)) >> 8) + GetGValue(Background), (*lMask * (b - GetBValue(Background)) >> 8) + GetBValue(Background)); @@ -976,7 +976,7 @@ OutputRect.right = DestRect->right + Translate.x; OutputRect.top = DestRect->top + Translate.y; OutputRect.bottom = DestRect->bottom + Translate.y; - + if(BrushOrigin) { AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; _____ Modified: trunk/reactos/subsys/win32k/eng/clip.c --- trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/clip.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Clipping Functions @@ -206,13 +206,13 @@ IntEngCreateClipRegion(ULONG count, PRECTL pRect, PRECTL rcBounds) { CLIPGDI *Clip; - + if(count > 1) { RECTL *dest; - + Clip = EngAllocMem(0, sizeof(CLIPGDI) + ((count - 1) * sizeof(RECTL)), TAG_CLIPOBJ); - + if(Clip != NULL) { Clip->EnumRects.c = count; @@ -228,7 +228,7 @@ Clip->ClipObj.iFComplexity = ((Clip->EnumRects.c <= 4) ? FC_RECT4 : FC_COMPLEX); Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - + return GDIToObj(Clip, CLIP); } } @@ -241,14 +241,14 @@ Clip->EnumRects.c = 1; Clip->EnumOrder = CD_ANY; Clip->EnumRects.arcl[0] = *rcBounds; - + Clip->ClipObj.iDComplexity = (((rcBounds->top == rcBounds->bottom) && (rcBounds->left == rcBounds->right)) ? DC_TRIVIAL : DC_RECT); Clip->ClipObj.iFComplexity = FC_RECT; Clip->ClipObj.iMode = TC_RECTANGLES; Clip->ClipObj.rclBounds = *rcBounds; - + return GDIToObj(Clip, CLIP); } } @@ -358,7 +358,7 @@ { return FALSE; } - + /* copy rectangles */ src = ClipGDI->EnumRects.arcl + ClipGDI->EnumPos; for(i = 0, dest = pERects->arcl; @@ -367,7 +367,7 @@ { *dest = *src; } - + pERects->c = nCopy; ClipGDI->EnumPos+=nCopy; _____ Modified: trunk/reactos/subsys/win32k/eng/debug.c --- trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/debug.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Brush Functions _____ Modified: trunk/reactos/subsys/win32k/eng/device.c --- trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/device.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -17,7 +17,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Driver Device Functions _____ Modified: trunk/reactos/subsys/win32k/eng/event.c --- trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:08:57 UTC (rev 15105) +++ trunk/reactos/subsys/win32k/eng/event.c 2005-05-08 02:11:54 UTC (rev 15106) @@ -37,7 +37,7 @@ { return FALSE; } - KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE); + KeInitializeEvent((PKEVENT)(*Event), SynchronizationEvent, FALSE); return TRUE; } @@ -69,7 +69,7 @@ if (!NT_SUCCESS(Status)) { return NULL; - } + } return (PEVENT)Event; } _____ Modified: trunk/reactos/subsys/win32k/eng/float.c --- trunk/reactos/subsys/win32k/eng/float.c 2005-05-08 02:08:57 UTC (rev 15105) [truncated at 1000 lines; 14927 more skipped]

1 0

[ion] 15105: Update DDK so generic HAL can build
by ion＠svn.reactos.com 08 May '05

08 May '05

Update DDK so generic HAL can build Modified: branches/new_headers/reactos/hal/hal/hal.c Modified: branches/new_headers/reactos/include/ddk/winddk.h Modified: branches/new_headers/reactos/include/reactos/buildno.h _____ Modified: branches/new_headers/reactos/hal/hal/hal.c --- branches/new_headers/reactos/hal/hal/hal.c 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/hal/hal/hal.c 2005-05-08 02:08:57 UTC (rev 15105) @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> +#include <ndk/haltypes.h> +#include <ndk/kdtypes.h> #include <roscfg.h> #define NDEBUG @@ -758,7 +760,7 @@ return (KIRQL)0; } - +#undef KeLowerIrql VOID STDCALL KeLowerIrql( @@ -782,7 +784,7 @@ return Value; } - +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql( _____ Modified: branches/new_headers/reactos/include/ddk/winddk.h --- branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/include/ddk/winddk.h 2005-05-08 02:08:57 UTC (rev 15105) @@ -169,6 +169,9 @@ typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; typedef struct _DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION; typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX; +typedef struct _BUS_HANDLER *PBUS_HANDLER; +typedef struct _PEB *PPEB; +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; typedef struct _NAMED_PIPE_CREATE_PARAMETERS *PNAMED_PIPE_CREATE_PARAMETERS; typedef struct _MAILSLOT_CREATE_PARAMETERS *PMAILSLOT_CREATE_PARAMETERS; typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; @@ -328,7 +331,6 @@ extern NTOSAPI POBJECT_TYPE SeTokenObjectType; extern NTOSAPI CCHAR KeNumberProcessors; -extern NTOSAPI PHAL_DISPATCH_TABLE HalDispatchTable; extern NTOSAPI PHAL_PRIVATE_DISPATCH_TABLE HalPrivateDispatchTable; @@ -3893,8 +3895,208 @@ IN PVOID Argument1, IN PVOID Argument2); +typedef enum _HAL_QUERY_INFORMATION_CLASS +{ + HalInstalledBusInformation, + HalProfileSourceInformation, + HalInformationClassUnused1, + HalPowerInformation, + HalProcessorSpeedInformation, + HalCallbackInformation, + HalMapRegisterInformation, + HalMcaLogInformation, + HalFrameBufferCachingInformation, + HalDisplayBiosInformation, + HalProcessorFeatureInformation, + HalNumaTopologyInterface, + HalErrorInformation, + HalCmcLogInformation, + HalCpeLogInformation, + HalQueryMcaInterface, + HalQueryAMLIIllegalIOPortAddresses, + HalQueryMaxHotPlugMemoryAddress, + HalPartitionIpiInterface, + HalPlatformInformation, + HalQueryProfileSourceList +} HAL_QUERY_INFORMATION_CLASS, *PHAL_QUERY_INFORMATION_CLASS; +typedef enum _HAL_SET_INFORMATION_CLASS + { + HalProfileSourceInterval, + HalProfileSourceInterruptHandler, + HalMcaRegisterDriver, + HalKernelErrorHandler, + HalCmcRegisterDriver, + HalCpeRegisterDriver, + HalMcaLog, + HalCmcLog, + HalCpeLog, + HalGenerateCmcInterrupt +} HAL_SET_INFORMATION_CLASS, *PHAL_SET_INFORMATION_CLASS; +/* Function Type Defintions for Dispatch Functions */ + +typedef +VOID +(*PDEVICE_CONTROL_COMPLETION)( + IN struct _DEVICE_CONTROL_CONTEXT *ControlContext + ); + +typedef struct _DEVICE_CONTROL_CONTEXT { + NTSTATUS Status; + PDEVICE_HANDLER_OBJECT DeviceHandler; + PDEVICE_OBJECT DeviceObject; + ULONG ControlCode; + PVOID Buffer; + PULONG BufferLength; + PVOID Context; +} DEVICE_CONTROL_CONTEXT, *PDEVICE_CONTROL_CONTEXT; + +typedef struct _PM_DISPATCH_TABLE { + ULONG Signature; + ULONG Version; + PVOID Function[1]; +} PM_DISPATCH_TABLE, *PPM_DISPATCH_TABLE; + +typedef NTSTATUS STDCALL +(*pHalDeviceControl)(IN PDEVICE_HANDLER_OBJECT DeviceHandler, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN OUT PVOID Buffer OPTIONAL, + IN OUT PULONG BufferLength OPTIONAL, + IN PVOID Context, + IN PDEVICE_CONTROL_COMPLETION CompletionRoutine); + +typedef VOID FASTCALL +(*pHalExamineMBR)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MBRTypeIdentifier, + OUT PVOID *Buffer); + +typedef VOID FASTCALL +(*pHalIoAssignDriveLetters)(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); + +typedef NTSTATUS FASTCALL +(*pHalIoReadPartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +typedef NTSTATUS FASTCALL +(*pHalIoSetPartitionInformation)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +typedef NTSTATUS FASTCALL +(*pHalIoWritePartitionTable)(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); + +typedef PBUS_HANDLER FASTCALL +(*pHalHandlerForBus)(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber); + +typedef VOID FASTCALL +(*pHalReferenceBusHandler)(IN PBUS_HANDLER BusHandler); + +typedef NTSTATUS STDCALL +(*pHalQuerySystemInformation)(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength); + + +typedef NTSTATUS STDCALL +(*pHalSetSystemInformation)(IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN PVOID Buffer); + + +typedef NTSTATUS STDCALL +(*pHalQueryBusSlots)(IN PBUS_HANDLER BusHandler, + IN ULONG BufferSize, + OUT PULONG SlotNumbers, + OUT PULONG ReturnedLength); + +typedef NTSTATUS STDCALL +(*pHalInitPnpDriver)(VOID); + +typedef NTSTATUS STDCALL +(*pHalInitPowerManagement)(IN PPM_DISPATCH_TABLE PmDriverDispatchTable, + OUT PPM_DISPATCH_TABLE *PmHalDispatchTable); + +typedef struct _DMA_ADAPTER * STDCALL +(*pHalGetDmaAdapter)(IN PVOID Context, + IN struct _DEVICE_DESCRIPTION *DeviceDescriptor, + OUT PULONG NumberOfMapRegisters); + +typedef NTSTATUS STDCALL +(*pHalGetInterruptTranslator)(IN INTERFACE_TYPE ParentInterfaceType, + IN ULONG ParentBusNumber, + IN INTERFACE_TYPE BridgeInterfaceType, + IN USHORT Size, + IN USHORT Version, + OUT PTRANSLATOR_INTERFACE Translator, + OUT PULONG BridgeBusNumber); + +typedef NTSTATUS STDCALL (*pHalStartMirroring)(VOID); + +typedef NTSTATUS STDCALL (*pHalEndMirroring)(IN ULONG PassNumber); + +typedef NTSTATUS STDCALL +(*pHalMirrorPhysicalMemory)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef NTSTATUS STDCALL +(*pHalMirrorVerify)(IN PHYSICAL_ADDRESS PhysicalAddress, + IN LARGE_INTEGER NumberOfBytes); + +typedef VOID STDCALL +(*pHalEndOfBoot)(VOID); + +typedef BOOLEAN STDCALL +(*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); + +typedef struct { + ULONG Version; + pHalQuerySystemInformation HalQuerySystemInformation; + pHalSetSystemInformation HalSetSystemInformation; + pHalQueryBusSlots HalQueryBusSlots; + ULONG Spare1; + pHalExamineMBR HalExamineMBR; + pHalIoAssignDriveLetters HalIoAssignDriveLetters; + pHalIoReadPartitionTable HalIoReadPartitionTable; + pHalIoSetPartitionInformation HalIoSetPartitionInformation; + pHalIoWritePartitionTable HalIoWritePartitionTable; + + pHalHandlerForBus HalReferenceHandlerForBus; + pHalReferenceBusHandler HalReferenceBusHandler; + pHalReferenceBusHandler HalDereferenceBusHandler; + + pHalInitPnpDriver HalInitPnpDriver; + pHalInitPowerManagement HalInitPowerManagement; + + pHalGetDmaAdapter HalGetDmaAdapter; + pHalGetInterruptTranslator HalGetInterruptTranslator; + + pHalStartMirroring HalStartMirroring; + pHalEndMirroring HalEndMirroring; + pHalMirrorPhysicalMemory HalMirrorPhysicalMemory; + pHalEndOfBoot HalEndOfBoot; + pHalMirrorVerify HalMirrorVerify; + +} HAL_DISPATCH, *PHAL_DISPATCH; + + +extern HAL_DISPATCH HalDispatchTable; +#define HALDISPATCH HalDispatchTable + /* ** Storage structures */ _____ Modified: branches/new_headers/reactos/include/reactos/buildno.h --- branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:47:30 UTC (rev 15104) +++ branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 02:08:57 UTC (rev 15105) @@ -1,9 +1,9 @@ /* Do not edit - Machine generated */ #ifndef _INC_REACTOS_BUILDNO #define _INC_REACTOS_BUILDNO -#define KERNEL_VERSION_BUILD 20050507 -#define KERNEL_VERSION_BUILD_STR "20050507-r15066" -#define KERNEL_VERSION_BUILD_RC "20050507-r15066\0" +#define KERNEL_VERSION_BUILD 20050508 +#define KERNEL_VERSION_BUILD_STR "20050508-r15096" +#define KERNEL_VERSION_BUILD_RC "20050508-r15096\0" #define KERNEL_RELEASE_RC "0.3-SVN\0" #define KERNEL_RELEASE_STR "0.3-SVN" #define KERNEL_VERSION_RC "0.3-SVN\0"

1 0

[ion] 15104: Limited build
by ion＠svn.reactos.com 08 May '05

08 May '05

Limited build Modified: branches/new_headers/reactos/Makefile _____ Modified: branches/new_headers/reactos/Makefile --- branches/new_headers/reactos/Makefile 2005-05-08 01:45:21 UTC (rev 15103) +++ branches/new_headers/reactos/Makefile 2005-05-08 01:47:30 UTC (rev 15104) @@ -58,13 +58,7 @@ # User mode libraries # libpcap packet epsapi -DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ - gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ - msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 serialui setupapi shell32 shlwapi smlib smdll snmpapi \ - syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \ - $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) +DLLS = ntdll smlib smdll snmpapi user32 lsasrv SUBSYS = smss win32k csrss ntvdm @@ -104,14 +98,12 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ - winlogon regedit winefile notepad reactos lsass dhcp +SYS_APPS = # System services SYS_SVC = rpcss eventlog umpnpmgr -APPS = testsets utils +APPS = # External modules and (sub)systems for ReactOS

1 0

[ion] 15103: Update ntoskrnl.h. Probably incorrect for now, it's an old version
by ion＠svn.reactos.com 08 May '05

08 May '05

Update ntoskrnl.h. Probably incorrect for now, it's an old version Modified: branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h --- branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-08 01:41:18 UTC (rev 15102) +++ branches/new_headers/reactos/ntoskrnl/include/ntoskrnl.h 2005-05-08 01:45:21 UTC (rev 15103) @@ -6,37 +6,29 @@ /* include the ntoskrnl config.h file */ #include "config.h" -#include <roscfg.h> +#include <reactos/roscfg.h> #include <reactos/version.h> #include <reactos/resource.h> #include <reactos/bugcodes.h> +#include <reactos/defines.h> +#include <reactos/string.h> #include <limits.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <wchar.h> -#include <roskrnl.h> -#include <ntos/minmax.h> -#include <ntos/synch.h> -#include <ntos/keyboard.h> -#include <ntos/ntdef.h> -#include <ntos/ntpnp.h> -#include <rosrtl/minmax.h> -#include <rosrtl/string.h> -#include <ddk/halfuncs.h> -#include <ddk/kefuncs.h> -#include <ddk/pnptypes.h> -#include <ddk/pnpfuncs.h> -#include <ddk/wdmguid.h> -#include <ntdll/ldr.h> +#include <ddk/ntifs.h> +#include <ndk/ntndk.h> + +/* Leave Intact */ #include <pseh.h> #include <internal/ctype.h> -#include <internal/ntoskrnl.h> +#include <internal/id.h> #include <internal/ke.h> #include <internal/i386/segment.h> #include <internal/i386/mm.h> #include <internal/i386/fpu.h> +#include <internal/i386/tss.h> #include <internal/module.h> #include <internal/handle.h> #include <internal/pool.h> @@ -51,6 +43,7 @@ #include <internal/kd.h> #include <internal/ex.h> #include <internal/ob.h> +#include <internal/nt.h> #include "internal/xhal.h" #include <internal/v86m.h> #include <internal/ifs.h> @@ -63,11 +56,10 @@ #include <internal/trap.h> #include <internal/safe.h> #include <internal/test.h> -#include <napi/core.h> -#include <napi/dbg.h> -#include <napi/teb.h> -#include <napi/win32.h> +#endif /* INCLUDE_NTOSKRNL_H */ + + #ifndef RTL_CONSTANT_STRING #define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ { \

1 0

[ion] 15102: Finally, add NDK. Still needs lot of work
by ion＠svn.reactos.com 08 May '05

08 May '05

Finally, add NDK. Still needs lot of work Added: branches/new_headers/reactos/include/ndk/ Added: branches/new_headers/reactos/include/ndk/cctypes.h Added: branches/new_headers/reactos/include/ndk/extypes.h Added: branches/new_headers/reactos/include/ndk/halfuncs.h Added: branches/new_headers/reactos/include/ndk/haltypes.h Added: branches/new_headers/reactos/include/ndk/i386/ Added: branches/new_headers/reactos/include/ndk/i386/floatsave.h Added: branches/new_headers/reactos/include/ndk/i386/segment.h Added: branches/new_headers/reactos/include/ndk/inbvfuncs.h Added: branches/new_headers/reactos/include/ndk/iofuncs.h Added: branches/new_headers/reactos/include/ndk/iotypes.h Added: branches/new_headers/reactos/include/ndk/kdfuncs.h Added: branches/new_headers/reactos/include/ndk/kdtypes.h Added: branches/new_headers/reactos/include/ndk/kefuncs.h Added: branches/new_headers/reactos/include/ndk/ketypes.h Added: branches/new_headers/reactos/include/ndk/ldrfuncs.h Added: branches/new_headers/reactos/include/ndk/ldrtypes.h Added: branches/new_headers/reactos/include/ndk/lpctypes.h Added: branches/new_headers/reactos/include/ndk/mmtypes.h Added: branches/new_headers/reactos/include/ndk/ntndk.h Added: branches/new_headers/reactos/include/ndk/obfuncs.h Added: branches/new_headers/reactos/include/ndk/obtypes.h Added: branches/new_headers/reactos/include/ndk/potypes.h Added: branches/new_headers/reactos/include/ndk/psfuncs.h Added: branches/new_headers/reactos/include/ndk/pstypes.h Added: branches/new_headers/reactos/include/ndk/rosfuncs.h Added: branches/new_headers/reactos/include/ndk/rostypes.h Added: branches/new_headers/reactos/include/ndk/rtlfuncs.h Added: branches/new_headers/reactos/include/ndk/rtltypes.h Added: branches/new_headers/reactos/include/ndk/sefuncs.h Added: branches/new_headers/reactos/include/ndk/setypes.h Added: branches/new_headers/reactos/include/ndk/umtypes.h Added: branches/new_headers/reactos/include/ndk/zwfuncs.h Added: branches/new_headers/reactos/include/ndk/zwtypes.h _____ Added: branches/new_headers/reactos/include/ndk/cctypes.h --- branches/new_headers/reactos/include/ndk/cctypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/cctypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,45 @@ +/* $Id: cctypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/cctypes.h + * PURPOSE: Definitions for exported Cache Manager Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _CCTYPES_H +#define _CCTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern ULONG EXPORTED CcFastMdlReadWait; +extern ULONG EXPORTED CcFastReadNotPossible; +extern ULONG EXPORTED CcFastReadWait; +#else +extern ULONG IMPORTED CcFastMdlReadWait; +extern ULONG IMPORTED CcFastReadNotPossible; +extern ULONG IMPORTED CcFastReadWait; +#endif + +#endif + _____ Added: branches/new_headers/reactos/include/ndk/extypes.h --- branches/new_headers/reactos/include/ndk/extypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/extypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,63 @@ +/* $Id: extypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/extypes.h + * PURPOSE: Definitions for exported Executive Kernel Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _EXTYPES_H +#define _EXTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern POBJECT_TYPE EXPORTED ExIoCompletionType; +#else +extern POBJECT_TYPE IMPORTED ExIoCompletionType; +#endif + +typedef enum _HARDERROR_RESPONSE_OPTION { + OptionAbortRetryIgnore, + OptionOk, + OptionOkCancel, + OptionRetryCancel, + OptionYesNo, + OptionYesNoCancel, + OptionShutdownSystem +} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION; + +typedef enum _HARDERROR_RESPONSE { + ResponseReturnToCaller, + ResponseNotHandled, + ResponseAbort, + ResponseCancel, + ResponseIgnore, + ResponseNo, + ResponseOk, + ResponseRetry, + ResponseYes +} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE; + +#endif + _____ Added: branches/new_headers/reactos/include/ndk/halfuncs.h --- branches/new_headers/reactos/include/ndk/halfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/halfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,181 @@ +/* $Id: halfuncs.h,v 1.1.2.2 2004/10/25 02:57:20 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/halfuncs.h + * PURPOSE: Prototypes for exported Hardware Abstraction Layer Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _HALFUNCS_H +#define _HALFUNCS_H + +#include "haltypes.h" + +BOOLEAN +STDCALL +HalAllProcessorsStarted(VOID); + +VOID +STDCALL +HalAcquireDisplayOwnership( + IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters +); + +NTSTATUS +STDCALL +HalAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PWAIT_CONTEXT_BLOCK WaitContextBlock, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine +); + +BOOLEAN +STDCALL +HalBeginSystemInterrupt( + ULONG Vector, + KIRQL Irql, + PKIRQL OldIrql +); + +BOOLEAN +STDCALL +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql +); + +VOID +STDCALL +HalDisplayString ( + IN PCHAR String +); + +BOOLEAN +STDCALL +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode +); + +VOID +STDCALL +HalEndSystemInterrupt( + KIRQL Irql, + ULONG Unknown2 +); + +BOOLEAN +STDCALL +HalGetEnvironmentVariable( + PCH Name, + PCH Value, + USHORT ValueLength +); + +VOID +STDCALL +HalInitializeProcessor( + ULONG ProcessorNumber, + PVOID ProcessorStack +); + +BOOLEAN +STDCALL +HalInitSystem( + ULONG BootPhase, + PLOADER_PARAMETER_BLOCK LoaderBlock +); + +BOOLEAN +STDCALL +HalQueryDisplayOwnership(VOID); + +VOID +STDCALL +HalReportResourceUsage(VOID); + +VOID +FASTCALL +HalRequestSoftwareInterrupt( + KIRQL SoftwareInterruptRequested +); + +VOID +STDCALL +HalReleaseDisplayOwnership(VOID); + +VOID +STDCALL +HalReturnToFirmware( + ULONG Action +); + +VOID +STDCALL +HalRequestIpi( + ULONG Unknown +); + +BOOLEAN +STDCALL +HalSetEnvironmentVariable( + IN PCH Name, + IN PCH Value +); + +BOOLEAN +STDCALL +HalStartNextProcessor( + ULONG Unknown1, + ULONG Unknown2 +); + +VOID +STDCALL +IoAssignDriveLetters( + PLOADER_PARAMETER_BLOCK LoaderBlock, + PSTRING NtDeviceName, + PUCHAR NtSystemPath, + PSTRING NtSystemPathString +); + +/* FIXME FIXME FIXME */ + +#define HAL_PRIVATE_DISPATCH_VERSION 1 +#define HAL_DISPATCH_VERSION 3 + +typedef struct _HAL_PRIVATE_DISPATCH { + ULONG Version; +} HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; + +extern HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +#define HALPRIVATEDISPATCH HalPrivateDispatchTable + +/* The Following Functions are called through the Dispatch Table */ +#define HalQuerySystemInformation HALDISPATCH.HalQuerySystemInformation +#define HalIoAssignDriveLetters HALDISPATCH.HalIoAssignDriveLetters +#define HalIoReadPartitionTable HALDISPATCH.HalIoReadPartitionTable +#define HalIoWritePartitionTable HALDISPATCH.HalIoWritePartitionTable +#define HalIoSetPartitionInformation HALDISPATCH.HalIoSetPartitionInformation +#endif _____ Added: branches/new_headers/reactos/include/ndk/haltypes.h --- branches/new_headers/reactos/include/ndk/haltypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/haltypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,89 @@ +/* $Id: haltypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/haltypes.h + * PURPOSE: Definitions for Hardware Abstraction Layer types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _HALTYPES_H +#define _HALTYPES_H + +#include <reactos/helper.h> +#include <ddk/ntdddisk.h> + +/* HalReturnToFirmware */ +#define FIRMWARE_HALT 1 +#define FIRMWARE_POWERDOWN 2 +#define FIRMWARE_REBOOT 3 + +/* Boot Flags */ +#define MB_FLAGS_MEM_INFO (0x1) +#define MB_FLAGS_BOOT_DEVICE (0x2) +#define MB_FLAGS_COMMAND_LINE (0x4) +#define MB_FLAGS_MODULE_INFO (0x8) +#define MB_FLAGS_AOUT_SYMS (0x10) +#define MB_FLAGS_ELF_SYMS (0x20) +#define MB_FLAGS_MMAP_INFO (0x40) +#define MB_FLAGS_DRIVES_INFO (0x80) +#define MB_FLAGS_CONFIG_TABLE (0x100) +#define MB_FLAGS_BOOT_LOADER_NAME (0x200) +#define MB_FLAGS_APM_TABLE (0x400) +#define MB_FLAGS_GRAPHICS_TABLE (0x800) + +typedef struct _LOADER_MODULE { + ULONG ModStart; + ULONG ModEnd; + ULONG String; + ULONG Reserved; +} LOADER_MODULE, *PLOADER_MODULE; + +typedef struct _LOADER_PARAMETER_BLOCK { + ULONG Flags; + ULONG MemLower; + ULONG MemHigher; + ULONG BootDevice; + ULONG CommandLine; + ULONG ModsCount; + ULONG ModsAddr; + UCHAR Syms[12]; + ULONG MmapLength; + ULONG MmapAddr; + ULONG DrivesCount; + ULONG DrivesAddr; + ULONG ConfigTable; + ULONG BootLoaderName; +} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK; + +#ifdef __NTOSKRNL__ +extern ULONG EXPORTED KdComPortInUse; +#else +extern ULONG IMPORTED KdComPortInUse; +#endif + +typedef struct _DRIVE_LAYOUT_INFORMATION { + DWORD PartitionCount; + DWORD Signature; + PARTITION_INFORMATION PartitionEntry[1]; +} DRIVE_LAYOUT_INFORMATION; +#endif + _____ Added: branches/new_headers/reactos/include/ndk/i386/floatsave.h --- branches/new_headers/reactos/include/ndk/i386/floatsave.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/i386/floatsave.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,11 @@ +#ifndef __NAPI_I386_FLOATSAVE_H__ +#define __NAPI_I386_FLOATSAVE_H__ + +#define FLOAT_SAVE_CONTROL (0xFFFF037F) +#define FLOAT_SAVE_STATUS (0xFFFF0000) +#define FLOAT_SAVE_TAG (0xFFFFFFFF) +#define FLOAT_SAVE_DATA (0xFFFF0000) + +#endif /* __NAPI_I386_FLOATSAVE_H__ */ + +/* EOF */ _____ Added: branches/new_headers/reactos/include/ndk/i386/segment.h --- branches/new_headers/reactos/include/ndk/i386/segment.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/i386/segment.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,12 @@ +#ifndef _ASM_SEGMENT_H +#define _ASM_SEGMENT_H + +#define KERNEL_CS (0x8) +#define KERNEL_DS (0x10) +#define USER_CS (0x18 + 0x3) +#define USER_DS (0x20 + 0x3) +#define RESERVED_FOR_TSS (0x28) +#define PCR_SELECTOR (0x30) +#define TEB_SELECTOR (0x38 + 0x3) + +#endif /* _ASM_SEGMENT_H */ _____ Added: branches/new_headers/reactos/include/ndk/inbvfuncs.h --- branches/new_headers/reactos/include/ndk/inbvfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/inbvfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,118 @@ +/* $Id: inbvfuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/haltypes.h + * PURPOSE: Prototypes for Boot Video Driver not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _INBVFUNCS_H +#define _INBVFUNCS_H + +VOID +STDCALL +InbvAcquireDisplayOwnership(VOID); + +BOOLEAN +STDCALL +InbvCheckDisplayOwnership(VOID); + +BOOLEAN +STDCALL +InbvDisplayString( + IN PCHAR String +); + +VOID +STDCALL +InbvEnableBootDriver( + IN BOOLEAN Enable +); + +BOOLEAN +STDCALL +InbvEnableDisplayString( + IN BOOLEAN Enable +); + +VOID +STDCALL +InbvInstallDisplayStringFilter( + IN PVOID Unknown +); + +BOOLEAN +STDCALL +InbvIsBootDriverInstalled(VOID); + +VOID +STDCALL +InbvNotifyDisplayOwnershipLost( + IN PVOID Callback +); + +BOOLEAN +STDCALL +InbvResetDisplay(VOID); + +VOID +STDCALL +InbvSetScrollRegion( + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height +); + +VOID +STDCALL +InbvSetTextColor( + IN ULONG Color +); + +VOID +STDCALL +InbvSolidColorFill( + IN ULONG Left, + IN ULONG Top, + IN ULONG Width, + IN ULONG Height, + IN ULONG Color +); + +VOID +STDCALL +VidCleanUp(VOID); + +BOOLEAN +STDCALL +VidInitialize(VOID); + +BOOLEAN +STDCALL +VidResetDisplay(VOID); + +BOOLEAN +STDCALL +VidIsBootDriverInstalled(VOID); + +#endif _____ Added: branches/new_headers/reactos/include/ndk/iofuncs.h --- branches/new_headers/reactos/include/ndk/iofuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/iofuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,42 @@ +/* + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/iofuncs.h + * PURPOSE: Definitions for exported I/O Manager Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _IOFUNCS_H +#define _IOFUNCS_H + +NTSTATUS +STDCALL +IoSetIoCompletion ( + IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota + ); +#endif + _____ Added: branches/new_headers/reactos/include/ndk/iotypes.h --- branches/new_headers/reactos/include/ndk/iotypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/iotypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,89 @@ +/* + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/iotypes.h + * PURPOSE: Definitions for exported I/O Manager Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ + +#ifndef _IOTYPES_H +#define _IOTYPES_H + +#include <reactos/helper.h> + +#ifdef __NTOSKRNL__ +extern POBJECT_TYPE EXPORTED IoAdapterObjectType; +extern POBJECT_TYPE EXPORTED IoDeviceHandlerObjectType; +extern POBJECT_TYPE EXPORTED IoDeviceObjectType; +extern POBJECT_TYPE EXPORTED IoDriverObjectType; +extern POBJECT_TYPE EXPORTED IoFileObjectType; +extern ULONG EXPORTED IoReadOperationCount; +extern ULONGLONG EXPORTED IoReadTransferCount; +extern ULONG EXPORTED IoWriteOperationCount; +extern ULONGLONG EXPORTED IoWriteTransferCount; +extern KSPIN_LOCK EXPORTED IoStatisticsLock; +#else +extern POBJECT_TYPE IMPORTED IoAdapterObjectType; +extern POBJECT_TYPE IMPORTED IoDeviceHandlerObjectType; +extern POBJECT_TYPE IMPORTED IoDeviceObjectType; +extern POBJECT_TYPE IMPORTED IoDriverObjectType; +extern POBJECT_TYPE IMPORTED IoFileObjectType; +extern ULONG IMPORTED IoReadOperationCount; +extern ULONGLONG IMPORTED IoReadTransferCount; +extern ULONG IMPORTED IoWriteOperationCount; +extern ULONGLONG IMPORTED IoWriteTransferCount; +extern KSPIN_LOCK IMPORTED IoStatisticsLock; +#endif + +typedef struct _MAILSLOT_CREATE_PARAMETERS { + ULONG MailslotQuota; + ULONG MaximumMessageSize; + LARGE_INTEGER ReadTimeout; + BOOLEAN TimeoutSpecified; +} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS; + +typedef struct _NAMED_PIPE_CREATE_PARAMETERS { + ULONG NamedPipeType; + ULONG ReadMode; + ULONG CompletionMode; + ULONG MaximumInstances; + ULONG InboundQuota; + ULONG OutboundQuota; + LARGE_INTEGER DefaultTimeout; + BOOLEAN TimeoutSpecified; +} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS; + +/* + * PURPOSE: Special timer associated with each device + */ +#define IO_TYPE_DRIVER 4L +#define IO_TYPE_TIMER 9L +typedef struct _IO_TIMER { + USHORT Type; /* Every IO Object has a Type */ + USHORT TimerEnabled; /* Tells us if the Timer is enabled or not */ + LIST_ENTRY IoTimerList; /* List of other Timers on the system */ + PIO_TIMER_ROUTINE TimerRoutine; /* The associated timer routine */ + PVOID Context; /* Context */ + PDEVICE_OBJECT DeviceObject; /* Driver that owns this IO Timer */ +} IO_TIMER, *PIO_TIMER; +#endif + _____ Added: branches/new_headers/reactos/include/ndk/kdfuncs.h --- branches/new_headers/reactos/include/ndk/kdfuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kdfuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,108 @@ +/* $Id: kdfuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kdfuncs.h + * PURPOSE: Prototypes for Kernel Debugger Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KDFUNCS_H +#define _KDFUNCS_H + +#include "kdtypes.h" + +BYTE +STDCALL +KdPollBreakIn(VOID); + +BOOLEAN +STDCALL +KdPortInitialize( + PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2 +); + +BOOLEAN +STDCALL +KdPortInitializeEx( + PKD_PORT_INFORMATION PortInformation, + DWORD Unknown1, + DWORD Unknown2 +); + +BOOLEAN +STDCALL +KdPortGetByte( + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortGetByteEx( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortPollByte( + PUCHAR ByteRecieved +); + +BOOLEAN +STDCALL +KdPortPollByteEx( + PKD_PORT_INFORMATION PortInformation, + PUCHAR ByteRecieved +); + +VOID +STDCALL +KdPortPutByte( + UCHAR ByteToSend +); + +VOID +STDCALL +KdPortPutByteEx( + PKD_PORT_INFORMATION PortInformation, + UCHAR ByteToSend +); + +VOID +STDCALL +KdPortRestore(VOID); + +VOID +STDCALL +KdPortSave (VOID); + +BOOLEAN +STDCALL +KdPortDisableInterrupts(VOID); + +BOOLEAN +STDCALL +KdPortEnableInterrupts(VOID); + +#endif _____ Added: branches/new_headers/reactos/include/ndk/kdtypes.h --- branches/new_headers/reactos/include/ndk/kdtypes.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kdtypes.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,37 @@ +/* $Id: kdtypes.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kdtypes.h + * PURPOSE: Definitions for Kernel Debugger Types not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KDTYPES_H +#define _KDTYPES_H + +typedef struct _KD_PORT_INFORMATION { + ULONG ComPort; + ULONG BaudRate; + ULONG BaseAddress; +} KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; + +#endif _____ Added: branches/new_headers/reactos/include/ndk/kefuncs.h --- branches/new_headers/reactos/include/ndk/kefuncs.h 2005-05-08 01:40:13 UTC (rev 15101) +++ branches/new_headers/reactos/include/ndk/kefuncs.h 2005-05-08 01:41:18 UTC (rev 15102) @@ -0,0 +1,294 @@ +/* $Id: kefuncs.h,v 1.1.2.1 2004/10/25 01:24:07 ion Exp $ + * + * ReactOS Headers + * Copyright (C) 1998-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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * PROJECT: ReactOS Native Headers + * FILE: include/ndk/kefuncs.h + * PURPOSE: Prototypes for Kernel Functions not defined in DDK/IFS + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * UPDATE HISTORY: + * Created 06/10/04 + */ +#ifndef _KEFUNCS_H +#define _KEFUNCS_H + +#include "ketypes.h" + +VOID +STDCALL +KeInitializeApc( + IN PKAPC Apc, + IN PKTHREAD Thread, + IN KAPC_ENVIRONMENT TargetEnvironment, + IN PKKERNEL_ROUTINE KernelRoutine, + IN PKRUNDOWN_ROUTINE RundownRoutine OPTIONAL, + IN PKNORMAL_ROUTINE NormalRoutine, + IN KPROCESSOR_MODE Mode, + IN PVOID Context +); + +VOID +STDCALL +KeEnterKernelDebugger(VOID); + +VOID +FASTCALL +KiAcquireSpinLock( + PKSPIN_LOCK SpinLock +); + +VOID +FASTCALL +KiReleaseSpinLock( + PKSPIN_LOCK SpinLock +); + +VOID +STDCALL +KiDeliverApc( + IN KPROCESSOR_MODE PreviousMode, + IN PVOID Reserved, + IN PKTRAP_FRAME TrapFrame +); + +VOID +STDCALL +KiDispatchInterrupt(VOID); + + +BOOLEAN +STDCALL +KeAreApcsDisabled( + VOID + ); + +VOID +STDCALL +KeFlushQueuedDpcs( + VOID + ); + +ULONG +STDCALL +KeGetRecommendedSharedDataAlignment( + VOID + ); + +ULONG +STDCALL +KeQueryRuntimeThread( + IN PKTHREAD Thread, + OUT PULONG UserTime + ); + +BOOLEAN +STDCALL +KeSetKernelStackSwapEnable( + IN BOOLEAN Enable + ); + +BOOLEAN +STDCALL +KeDeregisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord + ); + +BOOLEAN +STDCALL +KeRegisterBugCheckReasonCallback( + IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, + IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, + IN KBUGCHECK_CALLBACK_REASON Reason, + IN PUCHAR Component + ); + +VOID +STDCALL +KeTerminateThread( + IN KPRIORITY Increment +); + +BOOLEAN +STDCALL +KeIsExecutingDpc( + VOID +); + +VOID +STDCALL +KeSetEventBoostPriority( + IN PKEVENT Event, + IN PKTHREAD *Thread OPTIONAL +); + +PVOID +STDCALL +KeFindConfigurationEntry( + IN PVOID Unknown, + IN ULONG Class, + IN CONFIGURATION_TYPE Type, [truncated at 1000 lines; 10962 more skipped]

1 0

[ion] 15101: Add new WIN32K headers
by ion＠svn.reactos.com 08 May '05

08 May '05

Add new WIN32K headers Added: branches/new_headers/reactos/include/win32k/ Added: branches/new_headers/reactos/include/win32k/bitmaps.h Added: branches/new_headers/reactos/include/win32k/brush.h Added: branches/new_headers/reactos/include/win32k/cliprgn.h Added: branches/new_headers/reactos/include/win32k/color.h Added: branches/new_headers/reactos/include/win32k/coord.h Added: branches/new_headers/reactos/include/win32k/cursoricon.h Added: branches/new_headers/reactos/include/win32k/dc.h Added: branches/new_headers/reactos/include/win32k/debug.h Added: branches/new_headers/reactos/include/win32k/debug1.h Added: branches/new_headers/reactos/include/win32k/driver.h Added: branches/new_headers/reactos/include/win32k/fillshap.h Added: branches/new_headers/reactos/include/win32k/float.h Added: branches/new_headers/reactos/include/win32k/font.h Added: branches/new_headers/reactos/include/win32k/gdiobj.h Added: branches/new_headers/reactos/include/win32k/icm.h Added: branches/new_headers/reactos/include/win32k/kapi.h Added: branches/new_headers/reactos/include/win32k/line.h Added: branches/new_headers/reactos/include/win32k/math.h Added: branches/new_headers/reactos/include/win32k/menu.h Added: branches/new_headers/reactos/include/win32k/metafile.h Added: branches/new_headers/reactos/include/win32k/misc.h Added: branches/new_headers/reactos/include/win32k/ntddraw.h Added: branches/new_headers/reactos/include/win32k/ntuser.h Added: branches/new_headers/reactos/include/win32k/paint.h Added: branches/new_headers/reactos/include/win32k/path.h Added: branches/new_headers/reactos/include/win32k/pen.h Added: branches/new_headers/reactos/include/win32k/print.h Added: branches/new_headers/reactos/include/win32k/region.h Added: branches/new_headers/reactos/include/win32k/text.h Added: branches/new_headers/reactos/include/win32k/user32/ Added: branches/new_headers/reactos/include/win32k/user32/accel.h Added: branches/new_headers/reactos/include/win32k/user32/callback.h Added: branches/new_headers/reactos/include/win32k/user32/regcontrol.h Added: branches/new_headers/reactos/include/win32k/user32/wininternal.h Added: branches/new_headers/reactos/include/win32k/wingl.h _____ Added: branches/new_headers/reactos/include/win32k/bitmaps.h --- branches/new_headers/reactos/include/win32k/bitmaps.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/bitmaps.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,317 @@ + +#ifndef __WIN32K_BITMAPS_H +#define __WIN32K_BITMAPS_H + +/* GDI logical bitmap object */ +typedef struct _BITMAPOBJ +{ + SURFOBJ SurfObj; + FLONG flHooks; + FLONG flFlags; + SIZE dimension; /* For SetBitmapDimension(), do NOT use + to get width/height of bitmap, use + bitmap.bmWidth/bitmap.bmHeight for + that */ + + /* For device-independent bitmaps: */ + DIBSECTION *dib; + RGBQUAD *ColorMap; +} BITMAPOBJ, *PBITMAPOBJ; + +#define BITMAPOBJ_IS_APIBITMAP 0x1 + +/* Internal interface */ + +#define BITMAPOBJ_AllocBitmap() \ + ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP)) +#define BITMAPOBJ_FreeBitmap(hBMObj) \ + GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_LockBitmap(hBMObj) GDIOBJ_LockObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP) +#define BITMAPOBJ_UnlockBitmap(hBMObj) GDIOBJ_UnlockObj((HGDIOBJ) hBMObj) +BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); + +INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); +HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); +INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); +int STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth); +INT FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse); +INT STDCALL BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID buffer); +HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice); + +HBITMAP FASTCALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT Height); + +/* User Entry Points */ +BOOL +STDCALL +NtGdiBitBlt ( + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + DWORD ROP + ); +HBITMAP +STDCALL +NtGdiCreateBitmap ( + INT Width, + INT Height, + UINT Planes, + UINT BitsPerPel, + CONST VOID * Bits + ); +HBITMAP +STDCALL +NtGdiCreateCompatibleBitmap ( + HDC hDC, + INT Width, + INT Height + ); +HBITMAP +STDCALL +NtGdiCreateBitmapIndirect ( + CONST BITMAP * BM + ); +HBITMAP +STDCALL +NtGdiCreateDIBitmap ( + HDC hDC, + CONST BITMAPINFOHEADER * bmih, + DWORD Init, + CONST VOID * bInit, + CONST BITMAPINFO * bmi, + UINT Usage + ); +HBITMAP +STDCALL +NtGdiCreateDIBSection ( + HDC hDC, + CONST BITMAPINFO * bmi, + UINT Usage, + VOID * Bits, + HANDLE hSection, + DWORD dwOffset + ); +HBITMAP +STDCALL +NtGdiCreateDiscardableBitmap ( + HDC hDC, + INT Width, + INT Height + ); +BOOL +STDCALL +NtGdiExtFloodFill ( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Color, + UINT FillType + ); +BOOL +STDCALL +NtGdiFloodFill ( + HDC hDC, + INT XStart, + INT YStart, + COLORREF Fill + ); +LONG +STDCALL +NtGdiGetBitmapBits ( + HBITMAP hBitmap, + LONG Buffer, + LPVOID Bits + ); +BOOL +STDCALL +NtGdiGetBitmapDimensionEx ( + HBITMAP hBitmap, + LPSIZE Dimension + ); +UINT +STDCALL +NtGdiGetDIBColorTable ( + HDC hDC, + UINT StartIndex, + UINT Entries, + RGBQUAD * Colors + ); +INT +STDCALL +NtGdiGetDIBits ( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + LPVOID Bits, + LPBITMAPINFO bi, + UINT Usage + ); +COLORREF +STDCALL +NtGdiGetPixel ( + HDC hDC, + INT XPos, + INT YPos + ); +BOOL +STDCALL +NtGdiGradientFill ( + HDC hdc, + PTRIVERTEX pVertex, + ULONG uVertex, + PVOID pMesh, + ULONG uMesh, + ULONG ulMode + ); +BOOL +STDCALL +NtGdiMaskBlt ( + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + HBITMAP hMaskBitmap, + INT xMask, + INT yMask, + DWORD ROP + ); +BOOL +STDCALL +NtGdiPlgBlt ( + HDC hDCDest, + CONST POINT * Point, + HDC hDCSrc, + INT XSrc, + INT YSrc, + INT Width, + INT Height, + HBITMAP hMaskBitmap, + INT xMask, + INT yMask + ); +LONG +STDCALL +NtGdiSetBitmapBits ( + HBITMAP hBitmap, + DWORD Bytes, + CONST VOID * Bits + ); +BOOL +STDCALL +NtGdiSetBitmapDimensionEx ( + HBITMAP hBitmap, + INT Width, + INT Height, + LPSIZE Size + ); +UINT +STDCALL +NtGdiSetDIBColorTable ( + HDC hDC, + UINT StartIndex, + UINT Entries, + CONST RGBQUAD * Colors + ); +INT +STDCALL +NtGdiSetDIBits ( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + CONST VOID * Bits, + CONST BITMAPINFO * bmi, + UINT ColorUse + ); +INT +STDCALL +NtGdiSetDIBitsToDevice ( + HDC hDC, + INT XDest, + INT YDest, + DWORD Width, + DWORD Height, + INT XSrc, + INT YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID * Bits, + CONST BITMAPINFO * bmi, + UINT ColorUse + ); +COLORREF +STDCALL +NtGdiSetPixel ( + HDC hDC, + INT X, + INT Y, + COLORREF Color + ); +BOOL +STDCALL +NtGdiSetPixelV ( + HDC hDC, + INT X, + INT Y, + COLORREF Color + ); +BOOL +STDCALL +NtGdiStretchBlt ( + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP + ); +INT +STDCALL +NtGdiStretchDIBits ( + HDC hDC, + INT XDest, + INT YDest, + INT DestWidth, + INT DestHeight, + INT XSrc, + INT YSrc, + INT SrcWidth, + INT SrcHeight, + CONST VOID * Bits, + CONST BITMAPINFO * BitsInfo, + UINT Usage, + DWORD ROP + ); + +BOOL +STDCALL +NtGdiTransparentBlt( + HDC hdcDst, + INT xDst, + INT yDst, + INT cxDst, + INT cyDst, + HDC hdcSrc, + INT xSrc, + INT ySrc, + INT cxSrc, + INT cySrc, + COLORREF TransColor + ); + +#endif + _____ Added: branches/new_headers/reactos/include/win32k/brush.h --- branches/new_headers/reactos/include/win32k/brush.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/brush.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,146 @@ +#ifndef __WIN32K_BRUSH_H +#define __WIN32K_BRUSH_H + +/* Internal interface */ + +#define NB_HATCH_STYLES 6 + +/* + * The layout of this structure is taken from "Windows Graphics Programming" + * book written by Feng Yuan. + * + * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK ON + * A MAILING LIST FIRST. + */ + +typedef struct +{ + ULONG AttrFlags; + COLORREF lbColor; +} BRUSHATTR, *PBRUSHATTR; + +typedef struct +{ + ULONG ulStyle; + HBITMAP hbmPattern; + HANDLE hbmClient; + ULONG flAttrs; + + ULONG ulBrushUnique; + BRUSHATTR *pBrushAttr; + BRUSHATTR BrushAttr; + POINT ptOrigin; + ULONG bCacheGrabbed; + COLORREF crBack; + COLORREF crFore; + ULONG ulPalTime; + ULONG ulSurfTime; + PVOID ulRealization; + ULONG Unknown4C[3]; + POINT ptPenWidth; + ULONG ulPenStyle; + DWORD *pStyle; + ULONG dwStyleCount; + ULONG Unknown6C; +} GDIBRUSHOBJ, *PGDIBRUSHOBJ; + +typedef struct +{ + BRUSHOBJ BrushObject; + PGDIBRUSHOBJ GdiBrushObject; + XLATEOBJ *XlateObject; +} GDIBRUSHINST, *PGDIBRUSHINST; + +/* GDI Brush Attributes */ + +#define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ +#define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ +#define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ +#define GDIBRUSH_IS_HATCH 0x0020 /* Hatch brush */ +#define GDIBRUSH_IS_BITMAP 0x0040 /* DDB pattern brush */ +#define GDIBRUSH_IS_DIB 0x0080 /* DIB pattern brush */ +#define GDIBRUSH_IS_NULL 0x0100 /* Null/hollow brush */ +#define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ +#define GDIBRUSH_IS_PEN 0x0400 /* Pen */ +#define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ +#define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ +#define GDIBRUSH_CACHED_IS_SOLID 0x80000000 + +#define BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) +#define BRUSHOBJ_LockBrush(hBrush) ((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) +#define BRUSHOBJ_UnlockBrush(hBrush) GDIOBJ_UnlockObj((HGDIOBJ)hBrush) +BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); + +#ifdef __USE_W32API +typedef struct _PATRECT { + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; +#endif + +HBRUSH STDCALL +NtGdiCreateBrushIndirect( + CONST LOGBRUSH *LogBrush); + +HBRUSH STDCALL +NtGdiCreateDIBPatternBrush( + HGLOBAL hDIBPacked, + UINT ColorSpec); + +HBRUSH STDCALL +NtGdiCreateDIBPatternBrushPt( + CONST VOID *PackedDIB, + UINT Usage); + +HBRUSH STDCALL +NtGdiCreateHatchBrush( + INT Style, + COLORREF Color); + +HBRUSH STDCALL +NtGdiCreatePatternBrush( + HBITMAP hBitmap); + +HBRUSH STDCALL +NtGdiCreateSolidBrush( + COLORREF Color); + +BOOL STDCALL +NtGdiFixBrushOrgEx( + VOID); + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + +BOOL STDCALL +NtGdiPolyPatBlt( + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + INT cRects, + ULONG Reserved); + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + +BOOL STDCALL +NtGdiSetBrushOrgEx( + HDC hDC, + INT XOrg, + INT YOrg, + LPPOINT Point); + +#endif _____ Added: branches/new_headers/reactos/include/win32k/cliprgn.h --- branches/new_headers/reactos/include/win32k/cliprgn.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/cliprgn.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,81 @@ +#ifndef _WIN32K_CLIPRGN_H +#define _WIN32K_CLIPRGN_H + +HRGN WINAPI SaveVisRgn(HDC hdc); +INT WINAPI SelectVisRgn(HDC hdc, HRGN hrgn); + +int +STDCALL +NtGdiExcludeClipRect ( + HDC hDC, + int LeftRect, + int TopRect, + int RightRect, + int BottomRect + ); +int +STDCALL +NtGdiExtSelectClipRgn ( + HDC hDC, + HRGN hrgn, + int fnMode + ); +int +STDCALL +NtGdiGetClipBox ( + HDC hDC, + LPRECT rc + ); +int +STDCALL +NtGdiGetMetaRgn ( + HDC hDC, + HRGN hrgn + ); +int +STDCALL +NtGdiIntersectClipRect ( + HDC hDC, + int LeftRect, + int TopRect, + int RightRect, + int BottomRect + ); +int +STDCALL +NtGdiOffsetClipRgn ( + HDC hDC, + int XOffset, + int YOffset + ); +BOOL +STDCALL +NtGdiPtVisible ( + HDC hDC, + int X, + int Y + ); +BOOL +STDCALL +NtGdiRectVisible ( + HDC hDC, + CONST PRECT rc + ); +BOOL +STDCALL +NtGdiSelectClipPath ( + HDC hDC, + int Mode + ); +int +STDCALL +NtGdiSelectClipRgn ( + HDC hDC, + HRGN hrgn + ); +int +STDCALL +NtGdiSetMetaRgn ( + HDC hDC + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/color.h --- branches/new_headers/reactos/include/win32k/color.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/color.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,116 @@ +#ifndef __WIN32K_COLOR_H +#define __WIN32K_COLOR_H + +#ifndef CLR_INVALID +#define CLR_INVALID 0xffffffff +#endif +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ +#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ +#define PC_SYS_MAPPED 0x10 /* logical palentry is a direct alias for system palentry */ + +BOOL +STDCALL +NtGdiAnimatePalette ( + HPALETTE hpal, + UINT StartIndex, + UINT Entries, + CONST PPALETTEENTRY ppe + ); +HPALETTE +STDCALL +NtGdiCreateHalftonePalette ( + HDC hDC + ); +HPALETTE +STDCALL +NtGdiCreatePalette ( + CONST PLOGPALETTE lgpl + ); +BOOL +STDCALL +NtGdiGetColorAdjustment ( + HDC hDC, + LPCOLORADJUSTMENT ca + ); +COLORREF +STDCALL +NtGdiGetNearestColor ( + HDC hDC, + COLORREF Color + ); +UINT +STDCALL +NtGdiGetNearestPaletteIndex ( + HPALETTE hpal, + COLORREF Color + ); +UINT +STDCALL +NtGdiGetPaletteEntries ( + HPALETTE hpal, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiGetSystemPaletteEntries ( + HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiGetSystemPaletteUse ( + HDC hDC + ); +UINT +STDCALL +NtGdiRealizePalette ( + HDC hDC + ); +BOOL +STDCALL +NtGdiResizePalette ( + HPALETTE hpal, + UINT Entries + ); +HPALETTE +STDCALL +NtGdiSelectPalette ( + HDC hDC, + HPALETTE hpal, + BOOL ForceBackground + ); +BOOL +STDCALL +NtGdiSetColorAdjustment ( + HDC hDC, + CONST LPCOLORADJUSTMENT ca + ); +UINT +STDCALL +NtGdiSetPaletteEntries ( + HPALETTE hpal, + UINT Start, + UINT Entries, + CONST LPPALETTEENTRY pe + ); +UINT +STDCALL +NtGdiSetSystemPaletteUse ( + HDC hDC, + UINT Usage + ); +BOOL +STDCALL +NtGdiUnrealizeObject ( + HGDIOBJ hgdiobj + ); +BOOL +STDCALL +NtGdiUpdateColors ( + HDC hDC + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/coord.h --- branches/new_headers/reactos/include/win32k/coord.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/coord.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,151 @@ +#ifndef __WIN32K_COORD_H +#define __WIN32K_COORD_H + +BOOL +STDCALL +NtGdiCombineTransform ( + LPXFORM XformResult, + CONST LPXFORM xform1, + CONST LPXFORM xform2 + ); + +VOID +FASTCALL +IntDPtoLP ( PDC dc, LPPOINT Points, INT Count ); + +VOID +FASTCALL +CoordDPtoLP ( PDC Dc, LPPOINT Point ); + +BOOL +STDCALL +NtGdiDPtoLP ( + HDC hDC, + LPPOINT Points, + int Count + ); + +int +FASTCALL +IntGetGraphicsMode ( PDC dc ); + +int +STDCALL +NtGdiGetGraphicsMode ( HDC hDC ); + +BOOL +STDCALL +NtGdiGetWorldTransform ( + HDC hDC, + LPXFORM Xform + ); + +VOID +FASTCALL +CoordLPtoDP ( PDC Dc, LPPOINT Point ); + +VOID +FASTCALL +IntLPtoDP ( PDC dc, LPPOINT Points, INT Count ); + +BOOL +STDCALL +NtGdiLPtoDP ( + HDC hDC, + LPPOINT Points, + int Count + ); +BOOL +STDCALL +NtGdiModifyWorldTransform ( + HDC hDC, + CONST LPXFORM Xform, + DWORD Mode + ); +BOOL +STDCALL +NtGdiOffsetViewportOrgEx ( + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiOffsetWindowOrgEx ( + HDC hDC, + int XOffset, + int YOffset, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiScaleViewportExtEx ( + HDC hDC, + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiScaleWindowExtEx ( + HDC hDC, + int Xnum, + int Xdenom, + int Ynum, + int Ydenom, + LPSIZE Size + ); +int +STDCALL +NtGdiSetGraphicsMode ( + HDC hDC, + int Mode + ); +int +STDCALL +NtGdiSetMapMode ( + HDC hDC, + int MapMode + ); +BOOL +STDCALL +NtGdiSetViewportExtEx ( + HDC hDC, + int XExtent, + int YExtent, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiSetViewportOrgEx ( + HDC hDC, + int X, + int Y, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiSetWindowExtEx ( + HDC hDC, + int XExtent, + int YExtent, + LPSIZE Size + ); +BOOL +STDCALL +NtGdiSetWindowOrgEx ( + HDC hDC, + int X, + int Y, + LPPOINT Point + ); +BOOL +STDCALL +NtGdiSetWorldTransform ( + HDC hDC, + CONST LPXFORM Xform + ); +#endif _____ Added: branches/new_headers/reactos/include/win32k/cursoricon.h --- branches/new_headers/reactos/include/win32k/cursoricon.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/cursoricon.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,95 @@ + +#ifndef __WIN32K_CURSORICON_H +#define __WIN32K_CURSORICON_H + +#include <pshpack1.h> + +/* Structures for reading icon/cursor files and resources */ +// Structures for reading icon files and resources +typedef struct _ICONIMAGE +{ + BITMAPINFOHEADER icHeader; // DIB header + RGBQUAD icColors[1]; // Color table + BYTE icXOR[1]; // DIB bits for XOR mask + BYTE icAND[1]; // DIB bits for AND mask +} ICONIMAGE, *LPICONIMAGE; + +typedef struct _CURSORIMAGE +{ + BITMAPINFOHEADER icHeader; // DIB header + RGBQUAD icColors[1]; // Color table + BYTE icXOR[1]; // DIB bits for XOR mask + BYTE icAND[1]; // DIB bits for AND mask +} CURSORIMAGE, *LPCURSORIMAGE; + +typedef struct +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; +} ICONRESDIR; + +typedef struct +{ + WORD wWidth; + WORD wHeight; +} CURSORRESDIR; + +typedef struct +{ + WORD wPlanes; // Number of Color Planes in the XOR image + WORD wBitCount; // Bits per pixel in the XOR image +} ICONDIR; + +typedef struct +{ + WORD wXHotspot; // Number of Color Planes in the XOR image + WORD wYHotspot; // Bits per pixel in the XOR image +} CURSORDIR; + +typedef struct +{ + BYTE bWidth; // Width, in pixels, of the icon image + BYTE bHeight; // Height, in pixels, of the icon image + BYTE bColorCount; // Number of colors in image (0 if >=8bpp) + BYTE bReserved; // Reserved ( must be 0) + union + { ICONDIR icon; + CURSORDIR cursor; + } Info; + DWORD dwBytesInRes; // How many bytes in this resource? + DWORD dwImageOffset; // Where in the file is this image? +} CURSORICONDIRENTRY; + +typedef struct +{ + WORD idReserved; // Reserved (must be 0) + WORD idType; // Resource Type (1 for icons, 0 for cursors) + WORD idCount; // How many images? + CURSORICONDIRENTRY idEntries[1]; // An entry for idCount number of images +} CURSORICONDIR; + +typedef struct +{ + union + { ICONRESDIR icon; + CURSORRESDIR cursor; + } ResInfo; + WORD wPlanes; // Color Planes + WORD wBitCount; // Bits per pixel + DWORD dwBytesInRes; // how many bytes in this resource? + WORD nID; // the ID +} GRPCURSORICONDIRENTRY; + +typedef struct +{ + WORD idReserved; // Reserved (must be 0) + WORD idType; // Resource type (1 for icons) + WORD idCount; // How many images? + GRPCURSORICONDIRENTRY idEntries[1]; // The entries for each image +} GRPCURSORICONDIR; + +#include <poppack.h> + +#endif _____ Added: branches/new_headers/reactos/include/win32k/dc.h --- branches/new_headers/reactos/include/win32k/dc.h 2005-05-08 01:39:14 UTC (rev 15100) +++ branches/new_headers/reactos/include/win32k/dc.h 2005-05-08 01:40:13 UTC (rev 15101) @@ -0,0 +1,228 @@ + +#ifndef __WIN32K_DC_H +#define __WIN32K_DC_H + +typedef struct _WIN_DC_INFO +{ + int flags; + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hVisRgn; /* Visible region (must never be 0) */ + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + HPEN hPen; + HBRUSH hBrush; + HFONT hFont; + HBITMAP hBitmap; + HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ + +/* #if 0 */ + HANDLE hDevice; + HPALETTE hPalette; + + GdiPath path; +/* #endif */ + + WORD ROPmode; + WORD polyFillMode; + WORD stretchBltMode; + WORD relAbsMode; + WORD backgroundMode; + COLORREF backgroundColor; + COLORREF textColor; + + short brushOrgX; + short brushOrgY; + + WORD textAlign; /* Text alignment from SetTextAlign() */ + short charExtra; /* Spacing from SetTextCharacterExtra() */ + short breakTotalExtra; /* Total extra space for justification */ + short breakCount; /* Break char. count */ + short breakExtra; /* breakTotalExtra / breakCount */ + short breakRem; /* breakTotalExtra % breakCount */ + + RECT totalExtent; + BYTE bitsPerPixel; + + INT MapMode; + INT GraphicsMode; /* Graphics mode */ + INT DCOrgX; /* DC origin */ + INT DCOrgY; + +#if 0 + FARPROC lpfnPrint; /* AbortProc for Printing */ +#endif + + INT CursPosX; /* Current position */ + INT CursPosY; + INT ArcDirection; + + XFORM xformWorld2Wnd; /* World-to-window transformation */ + XFORM xformWorld2Vport; /* World-to-viewport transformation */ [truncated at 1000 lines; 4556 more skipped]

1 0

[ion] 15100: Add PSEH
by ion＠svn.reactos.com 08 May '05

08 May '05

Add PSEH Added: branches/new_headers/reactos/include/pseh/ Added: branches/new_headers/reactos/include/pseh/excpt.h Added: branches/new_headers/reactos/include/pseh/framebased/ Added: branches/new_headers/reactos/include/pseh/framebased/internal.h Added: branches/new_headers/reactos/include/pseh/framebased.h Added: branches/new_headers/reactos/include/pseh/native.h Added: branches/new_headers/reactos/include/pseh/prettybased.h Added: branches/new_headers/reactos/include/pseh/setjmp.h _____ Added: branches/new_headers/reactos/include/pseh/excpt.h --- branches/new_headers/reactos/include/pseh/excpt.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/excpt.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,32 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_EXCPT_H_ +#define KJK_PSEH_EXCPT_H_ + +#define _SEH_CONTINUE_EXECUTION (-1) +#define _SEH_CONTINUE_SEARCH (0) +#define _SEH_EXECUTE_HANDLER (1) + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/framebased/internal.h --- branches/new_headers/reactos/include/pseh/framebased/internal.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/framebased/internal.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,132 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_FRAMEBASED_INTERNAL_H_ +#define KJK_PSEH_FRAMEBASED_INTERNAL_H_ + +struct _EXCEPTION_RECORD; +struct _EXCEPTION_POINTERS; +struct _CONTEXT; + +typedef int (__cdecl * _SEHFrameHandler_t) +( + struct _EXCEPTION_RECORD *, + void *, + struct _CONTEXT *, + void * +); + +typedef struct __SEHRegistration +{ + struct __SEHRegistration * SER_Prev; + _SEHFrameHandler_t SER_Handler; +} +_SEHRegistration_t; + +struct __SEHPortableFrame; +struct __SEHPortableTryLevel; + +typedef long (__stdcall * _SEHFilter_t) +( + struct _EXCEPTION_POINTERS *, + struct __SEHPortableFrame * +); + +typedef __declspec(noreturn) void (__stdcall * _SEHHandler_t) +( + struct __SEHPortableTryLevel * +); + +typedef void (__stdcall * _SEHFinally_t) +( + struct __SEHPortableFrame * +); + +typedef struct __SEHHandlers +{ + _SEHFilter_t SH_Filter; + _SEHFinally_t SH_Finally; +} +_SEHHandlers_t; + +typedef struct __SEHPortableTryLevel +{ + struct __SEHPortableTryLevel * SPT_Next; + const _SEHHandlers_t * SPT_Handlers; +} +_SEHPortableTryLevel_t; + +typedef struct __SEHPortableFrame +{ + _SEHRegistration_t SPF_Registration; + unsigned long SPF_Code; + _SEHHandler_t SPF_Handler; + _SEHPortableTryLevel_t * SPF_TopTryLevel; +} +_SEHPortableFrame_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +extern void __stdcall _SEHEnterFrame_s +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void __stdcall _SEHEnterTry_s(_SEHPortableTryLevel_t *); +extern void __stdcall _SEHLeave_s(void); + +#if !defined(_SEH_NO_FASTCALL) +# ifdef _M_IX86 +# define _SEH_FASTCALL __fastcall +# else +# define _SEH_FASTCALL __stdcall +# endif + +extern void _SEH_FASTCALL _SEHEnterFrame_f +( + _SEHPortableFrame_t *, + _SEHPortableTryLevel_t * +); + +extern void _SEH_FASTCALL _SEHEnterTry_f(_SEHPortableTryLevel_t *); +extern void _SEH_FASTCALL _SEHLeave_f(void); + +# define _SEHEnterFrame _SEHEnterFrame_f +# define _SEHEnterTry _SEHEnterTry_f +# define _SEHLeave _SEHLeave_f +#else +# define _SEHEnterFrame _SEHEnterFrame_s +# define _SEHEnterTry _SEHEnterTry_s +# define _SEHLeave _SEHLeave_s +#endif + +#ifdef __cplusplus +} +#endif + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/framebased.h --- branches/new_headers/reactos/include/pseh/framebased.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/framebased.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,389 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_FRAMEBASED_H_ +#define KJK_PSEH_FRAMEBASED_H_ + +#include <pseh/framebased/internal.h> +#include <pseh/excpt.h> + +#ifndef offsetof +# include <stddef.h> +#endif + +/* + Fall back to non-optimal, non-native NLG implementation for environments + without their own (e.g., currently, kernel-mode ReactOS/Windows). THIS IS NOT + RECOMMENDED AND IT WILL BE DROPPED IN A FUTURE VERSION BECAUSE IT MAY CAUSE + SEVERE STACK CORRUPTION. REIMPLEMENT OR PORT YOUR COMPILER'S NATIVE NLG + IMPLEMENTATION INSTEAD. +*/ +#ifdef _SEH_NO_NATIVE_NLG +# include <pseh/setjmp.h> +#else +# include <setjmp.h> +# define _SEHLongJmp longjmp +# define _SEHSetJmp setjmp +# define _SEHJmpBuf_t jmp_buf +#endif +unsigned long DbgPrint(char * Format,...); +typedef struct __SEHFrame +{ + _SEHPortableFrame_t SEH_Header; + void * SEH_Locals; +} +_SEHFrame_t; + +typedef struct __SEHTryLevel +{ + _SEHPortableTryLevel_t ST_Header; + _SEHJmpBuf_t ST_JmpBuf; +} +_SEHTryLevel_t; + +static __declspec(noreturn) __inline void __stdcall _SEHCompilerSpecificHandler +( + _SEHPortableTryLevel_t * trylevel +) +{ + _SEHTryLevel_t * mytrylevel; + mytrylevel = _SEH_CONTAINING_RECORD(trylevel, _SEHTryLevel_t, ST_Header); + _SEHLongJmp(mytrylevel->ST_JmpBuf, 1); +} + +static const int _SEHScopeKind = 1; +static _SEHPortableFrame_t * const _SEHPortableFrame = 0; + +/* SHARED LOCALS */ +/* Access the locals for the current frame */ +#define _SEH_ACCESS_LOCALS(LOCALS_) \ + _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \ + _SEHPLocals = \ + _SEH_PVOID_CAST \ + ( \ + _SEH_LOCALS_TYPENAME(LOCALS_) *, \ + _SEH_CONTAINING_RECORD(_SEHPortableFrame, _SEHFrame_t, SEH_Header) \ + ->SEH_Locals \ + ); + +/* Access local variable VAR_ */ +#define _SEH_VAR(VAR_) _SEHPLocals->VAR_ + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + +/* Declares a PSEH filter wrapping a regular filter function */ +#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \ + static __inline _SEH_FILTER(WRAPPER_) \ + { \ + return (NAME_)(_SEHExceptionPointers); \ + } + +/* FINALLY FUNCTIONS */ +/* Declares a finally function's prototype */ +#define _SEH_FINALLYFUNC(NAME_) \ + void __stdcall NAME_ \ + ( \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + +/* Declares a PSEH finally function wrapping a regular function */ +#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \ + _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) + +#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + NAME_ ARGS_; \ + } + +#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + _SEH_ACCESS_LOCALS(LOCALS_); \ + NAME_ ARGS_; \ + } + +/* SAFE BLOCKS */ +#define _SEHX_TRY_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ + (FINALLY_) \ + ) + +#define _SEHX_END_FINALLY _SEH_HANDLE _SEH_END + +#define _SEHX_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), 0) + +#define _SEHX_TRY_HANDLE_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ + (FINALLY_) \ + ) + +#define _SEHX_TRY \ + _SEH_TRY_HANDLE_FINALLY(0) + +#ifdef __cplusplus +# define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ + static const _SEHHandlers_t _SEHHandlers = { (FILTER_), (FINALLY_) }; +#else +# define _SEH_DECLARE_HANDLERS(FILTER_, FINALLY_) \ + _SEHHandlers_t _SEHHandlers = { (0), (0) }; \ + _SEHHandlers.SH_Filter = (FILTER_); \ + _SEHHandlers.SH_Finally = (FINALLY_); +#endif + +#define _SEHX_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ + { \ + _SEHPortableFrame_t * const _SEHCurPortableFrame = _SEHPortableFrame; \ + \ + { \ + _SEHFrame_t _SEHFrame; \ + _SEHTryLevel_t _SEHTryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEHScopeKind ? &_SEHFrame.SEH_Header : _SEHCurPortableFrame; \ + \ + (void)_SEHPortableFrame; \ + \ + _SEH_DECLARE_HANDLERS((FILTER_), (FINALLY_)); \ + \ + _SEHTryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEHScopeKind) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEHFrame.SEH_Locals = &_SEHLocals; \ + \ + _SEHFrame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEHFrame.SEH_Header, &_SEHTryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEHTryLevel.ST_Header); \ + \ + { \ + static const int _SEHScopeKind = 0; \ + (void)_SEHScopeKind; \ + \ + if(_SEHSetJmp(_SEHTryLevel.ST_JmpBuf) == 0) \ + { \ + for(;;) \ + { + +#define _SEHX_HANDLE \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + } \ + else \ + { \ + _SEHLeave(); + +#define _SEHX_END \ + } \ + \ + if(_SEHHandlers.SH_Finally) \ + _SEHHandlers.SH_Finally(_SEHPortableFrame); \ + } \ + } \ + } + +#define _SEHX_LEAVE break + +#define _SEHX_GetExceptionCode() (unsigned long)(_SEHPortableFrame->SPF_Code) + +#define _SEHX_GetExceptionPointers() \ + ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) + +#define _SEHX_AbnormalTermination() (_SEHPortableFrame->SPF_Code != 0) + +/* New syntax */ + +/* + NOTE: do not move, remove or modify any instance of _SEH2_ASSUME and + _SEH2_ASSUMING without doing extensive tests for correctness. Compilers can + generate the wrong code in presence of __assume in unpredictable ways. BE SURE + IT DOESN'T HAPPEN +*/ +#if defined(_MSC_VER) && (_MSC_VER > 1200) +# define _SEH2_ASSUME(X_) __assume(X_) +# if !defined(_SEH_NO_NATIVE_NLG) + /* + If we use the native setjmp, the compiler stops keeping track of variables, so + their actual values don't matter anymore. Optimize out some assignments + */ +# define _SEH2_ASSUMING(X_) +# else + /* No native setjmp, no magic, no assumptions. Actually set the values */ +# define _SEH2_ASSUMING(X_) X_ +# endif +#else +# define _SEH2_ASSUME(X_) +# define _SEH2_ASSUMING(X_) X_ +#endif + +#ifdef __cplusplus +# define _SEH2_INIT_CONST static const +#else +# define _SEH2_INIT_CONST register const +#endif + +#define _SEH_LEAVE break + +#define _SEH_TRY \ + { \ + _SEH2_INIT_CONST int _SEH2TopTryLevel = (_SEHScopeKind != 0); \ + _SEHPortableFrame_t * const _SEH2CurPortableFrame = _SEHPortableFrame; \ + \ + { \ + static const int _SEHScopeKind = 0; \ + register int _SEH2State = 0; \ + register int _SEH2Handle = 0; \ + _SEHFrame_t _SEH2Frame; \ + _SEHTryLevel_t _SEH2TryLevel; \ + _SEHPortableFrame_t * const _SEHPortableFrame = \ + _SEH2TopTryLevel ? &_SEH2Frame.SEH_Header : _SEH2CurPortableFrame; \ + \ + (void)_SEHScopeKind; \ + (void)_SEHPortableFrame; \ + (void)_SEH2Handle; \ + \ + for(;;) \ + { \ + if(_SEH2State) \ + { \ + for(;;) \ + { \ + { + +#define _SEH_EXCEPT(FILTER_) \ + } \ + \ + break; \ + } \ + \ + _SEH2_ASSUME(_SEH2Handle == 0); \ + break; \ + } \ + else \ + { \ + _SEH_DECLARE_HANDLERS((FILTER_), 0); \ + \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ + \ + _SEH2Frame.SEH_Header.SPF_Handler = _SEHCompilerSpecificHandler; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ + \ + if((_SEH2Handle = _SEHSetJmp(_SEH2TryLevel.ST_JmpBuf)) == 0) \ + { \ + _SEH2_ASSUMING(++ _SEH2State); \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ + } \ + else \ + { \ + break; \ + } \ + } \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + \ + if(_SEH2Handle) \ + { + +#define _SEH_FINALLY(FINALLY_) \ + } \ + \ + break; \ + } \ + \ + _SEHLeave(); \ + break; \ + } \ + else \ + { \ + _SEH_DECLARE_HANDLERS(0, (FINALLY_)); \ + \ + _SEH2TryLevel.ST_Header.SPT_Handlers = &_SEHHandlers; \ + \ + if(_SEH2TopTryLevel) \ + { \ + if(&_SEHLocals != _SEHDummyLocals) \ + _SEH2Frame.SEH_Locals = &_SEHLocals; \ + \ + _SEH2Frame.SEH_Header.SPF_Handler = 0; \ + _SEHEnterFrame(&_SEH2Frame.SEH_Header, &_SEH2TryLevel.ST_Header); \ + } \ + else \ + _SEHEnterTry(&_SEH2TryLevel.ST_Header); \ + \ + ++ _SEH2State; \ + _SEH2_ASSUME(_SEH2State != 0); \ + continue; \ + } \ + \ + break; \ + } \ + \ + (FINALLY_)(&_SEH2Frame.SEH_Header); \ + if(0) \ + { + +#define _SEH_END \ + } \ + } \ + } + +#define _SEH_HANDLE _SEH_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + +#define _SEH_GetExceptionCode _SEHX_GetExceptionCode +#define _SEH_GetExceptionPointers _SEHX_GetExceptionPointers +#define _SEH_AbnormalTermination _SEHX_AbnormalTermination + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/native.h --- branches/new_headers/reactos/include/pseh/native.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/native.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,242 @@ +/* + Copyright (c) 2004/2005 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef KJK_PSEH_NATIVE_H_ +#define KJK_PSEH_NATIVE_H_ + +#include <excpt.h> +#include <pseh/excpt.h> + +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + +typedef long (__stdcall * _SEHFilter_t) +( + long, + struct _EXCEPTION_POINTERS *, + void * +); + +typedef void (__stdcall * _SEHFinally_t) +( + int, + void * +); + +static __inline long _SEHCallFilter +( + _SEHFilter_t _SEHFilter, + long _SEHExceptionCode, + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, + void * _SEHPVLocals +) +{ + if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + return _SEH_EXECUTE_HANDLER; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH)) + return _SEH_CONTINUE_SEARCH; + else if(_SEHFilter == _SEH_STATIC_FILTER(_SEH_CONTINUE_EXECUTION)) + return _SEH_CONTINUE_EXECUTION; + else if(_SEHFilter) + return _SEHFilter(_SEHExceptionCode, _SEHExceptionPointers, _SEHPVLocals); + else + return _SEH_CONTINUE_SEARCH; +} + +static __inline void _SEHCallFinally +( + _SEHFinally_t _SEHFinally, + int _SEHAbnormalTermination, + void * _SEHPVLocals +) +{ + if(_SEHFinally) + (_SEHFinally)(_SEHAbnormalTermination, _SEHPVLocals); +} + +/* SHARED LOCALS */ +/* Access the locals for the current frame */ +#define _SEH_ACCESS_LOCALS(LOCALS_) \ + _SEH_LOCALS_TYPENAME(LOCALS_) * _SEHPLocals; \ + _SEHPLocals = _SEH_PVOID_CAST(_SEH_LOCALS_TYPENAME(LOCALS_) *, _SEHPVLocals); + +/* Access local variable VAR_ */ +#define _SEH_VAR(VAR_) _SEHPLocals->VAR_ + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + long _SEHExceptionCode, \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + void * _SEHPVLocals \ + ) + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + +/* Declares a PSEH filter wrapping a regular filter function */ +#define _SEH_WRAP_FILTER(WRAPPER_, NAME_) \ + static __inline _SEH_FILTER(WRAPPER_) \ + { \ + return (NAME_)(_SEHExceptionPointers); \ + } + +/* FINALLY FUNCTIONS */ +/* Declares a finally function's prototype */ +#define _SEH_FINALLYFUNC(NAME_) \ + void __stdcall NAME_ \ + ( \ + int _SEHAbnormalTermination, \ + void * _SEHPVLocals \ + ) + +/* Declares a PSEH finally function wrapping a regular function */ +#define _SEH_WRAP_FINALLY(WRAPPER_, NAME_) \ + _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ()) + +#define _SEH_WRAP_FINALLY_ARGS(WRAPPER_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + NAME_ ARGS_; \ + } + +#define _SEH_WRAP_FINALLY_LOCALS_ARGS(WRAPPER_, LOCALS_, NAME_, ARGS_) \ + static __inline _SEH_FINALLYFUNC(WRAPPER_) \ + { \ + _SEH_ACCESS_LOCALS(LOCALS_); \ + NAME_ ARGS_; \ + } + +/* SAFE BLOCKS */ +#define _SEH_TRY_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_CONTINUE_SEARCH), \ + (FINALLY_) \ + ) + +#define _SEH_END_FINALLY _SEH_HANDLE _SEH_END + +#define _SEH_TRY_FILTER(FILTER_) \ + _SEH_TRY_FILTER_FINALLY((FILTER_), NULL) + +#define _SEH_TRY_HANDLE_FINALLY(FINALLY_) \ + _SEH_TRY_FILTER_FINALLY \ + ( \ + _SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER), \ + (FINALLY_) \ + ) + +#define _SEH_TRY \ + _SEH_TRY_HANDLE_FINALLY(NULL) + +#define _SEH_CALL_FILTER(FILTER_) \ + _SEHCallFilter \ + ( \ + (FILTER_), \ + GetExceptionCode(), \ + GetExceptionPointers(), \ + _SEHPVLocals \ + ) + +#define _SEH_CALL_FINALLY(FINALLY_) \ + _SEHCallFinally((FINALLY_), (AbnormalTermination() != 0), _SEHPVLocals) + +#define _SEH_TRY_FILTER_FINALLY(FILTER_, FINALLY_) \ + __try \ + { \ + _SEHFinally_t _SEHFinally = (FINALLY_); \ + _SEHFilter_t _SEHFilter = (FILTER_); \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH_HANDLE \ + } \ + __except(_SEH_CALL_FILTER(_SEHFilter)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH_END \ + } \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(_SEHFinally); \ + } + +#define _SEH_LEAVE __leave + +#define _SEH_GetExceptionCode() (_SEHExceptionCode) +#define _SEH_GetExceptionPointers() (_SEHExceptionPointers) +#define _SEH_AbnormalTermination() (_SEHAbnormalTermination) + +/* New syntax */ + +#define _SEH2_TRY \ + { \ + void * _SEHPVLocals = &_SEHLocals; \ + (void)_SEHPVLocals; \ + \ + __try \ + { + +#define _SEH2_EXCEPT(FILTER_) \ + } \ + __except(_SEH_CALL_FILTER(FILTER_)) \ + { \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers = GetExceptionPointers();\ + long _SEHExceptionCode = GetExceptionCode(); \ + +#define _SEH2_FINALLY(FINALLY_) \ + } \ + __finally \ + { \ + _SEH_CALL_FINALLY(FINALLY_) + +#define _SEH2_END \ + } \ + } + +#define _SEH2_HANDLE _SEH2_EXCEPT(_SEH_STATIC_FILTER(_SEH_EXECUTE_HANDLER)) + +#define _SEH2_LEAVE _SEH_LEAVE + +#define _SEH2_GetExceptionCode _SEH_GetExceptionCode +#define _SEH2_GetExceptionPointers _SEH_GetExceptionPointers +#define _SEH2_AbnormalTermination _SEH_AbnormalTermination + +#endif + +/* EOF */ _____ Added: branches/new_headers/reactos/include/pseh/prettybased.h --- branches/new_headers/reactos/include/pseh/prettybased.h 2005-05-08 01:38:42 UTC (rev 15099) +++ branches/new_headers/reactos/include/pseh/prettybased.h 2005-05-08 01:39:14 UTC (rev 15100) @@ -0,0 +1,299 @@ +/* + Copyright (c) 2004 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ +/* +Pretty PSEH + +Made to be macro compatible with ms seh syntax and to be pretty, having the +finally block inline etc. Being pretty is not cheap. PPSEH has more +overhead than PSEH, thou mostly during exception/unwinding. Normal execution +only add the overhead of one setjmp, and only in the try/finally case. +PPSEH is probably much less portable than PSEH also..... + +ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT!ALERT !ALERT! +-must always use non-native NLG cause a special version of longjmp (which doesn't +restore esp) is needed + +-compiler must use ebp as stack frame pointer, cause the finally block rely +on this to access external variables + +-all external variables that are used in the except/finally block MUST be volatile +to prevent variables from being optimized into registers. +See: http://alphalinux.org/archives/axp-list/1998/February1998/0330.html + +-you can't use return within a try/except/finally block + +-you can't use __LEAVE within a (for/do/while) loop. it will only leave the loop +and not the try-block itself + + +USAGE: + +__TRY{ + __LEAVE; +} +__EXCEPT(_SEH_STATIC_FILTER(EXCEPTION_EXECUTE_HANDLER)){ +} +__ENDTRY; + + +__TRY{ +} +__FINALLY{ +} +__ENDTRY; + + +_SEH_FILTER(filter){ + return EXCEPTION_EXECUTE_HANDLER; +} +__TRY2{ +} +__EXCEPT2(filter){ +} +__FINALLY2{ +} +__ENDTRY2; + + + +-Gunnar + +*/ + + +#ifndef KJK_PPSEH_FRAMEBASED_H_ +#define KJK_PPSEH_FRAMEBASED_H_ + +#include <pseh/framebased/internal.h> +#include <pseh/excpt.h> +#include <malloc.h> + +#ifndef offsetof +# include <stddef.h> +#endif + +/* +Must always use non-native NLG since we need a special version of longjmp which does +not restore esp +*/ +#include <pseh/setjmp.h> + + +typedef struct __SEHFrame +{ + _SEHPortableFrame_t SEH_Header; + _SEHJmpBuf_t SEH_JmpBuf; + _SEHJmpBuf_t* SEH_JmpRetPtr; +} +_SEHFrame_t; + +/* + Note: just define __inline to an empty symbol if your C compiler doesn't + support it +*/ +#ifdef __cplusplus +# ifndef __inline +# define __inline inline +# endif +#endif + + +/* FILTER FUNCTIONS */ +/* Declares a filter function's prototype */ +#define _SEH_FILTER(NAME_) \ + long __stdcall NAME_ \ + ( \ + struct _EXCEPTION_POINTERS * _SEHExceptionPointers, \ + struct __SEHPortableFrame * _SEHPortableFrame \ + ) + + +/* Declares a static filter */ +#define _SEH_STATIC_FILTER(ACTION_) ((_SEHFilter_t)((ACTION_) + 2)) + + +static __declspec(noreturn) __inline void __stdcall _SEHCompilerSpecificHandler +( + _SEHPortableFrame_t * frame +) +{ + _SEHFrame_t * myframe; + myframe = (_SEHFrame_t *)(((char *)frame) - offsetof(_SEHFrame_t, SEH_Header)); + _SEHLongJmp(myframe->SEH_JmpBuf, 1); +} + + + +void __stdcall _FinallyPretty +( + struct __SEHPortableFrame * frame +) +{ + _SEHFrame_t * myframe; + _SEHJmpBuf_t jmpRetBuf; + + myframe = (_SEHFrame_t *)(((char *)frame) - offsetof(_SEHFrame_t, SEH_Header)); + + if(_SEHSetJmp(jmpRetBuf) == 0) + { + myframe->SEH_JmpRetPtr = &jmpRetBuf; + _SEHLongJmp_KeepEsp(myframe->SEH_JmpBuf, 2); + } +} + + + +#define ___EXCEPT_DUAL(filter) \ + } while(0); \ + \ + _SEHLeave(&_SEHFrame->SEH_Header); \ + } \ + else \ + { \ + _SEHHandlers.SH_Filter = (filter); \ + _SEHHandlers.SH_Finally = _FinallyPretty; \ + \ + if(_loop == 2 || (_ret = _SEHSetJmp(_SEHFrame->SEH_JmpBuf))) \ + { \ + if (_ret == 1) \ + { \ + _SEHLeave(&_SEHFrame->SEH_Header); \ + do \ [truncated at 1000 lines; 178 more skipped]

1 0

[ion] 15099: Add basic headers from trunk
by ion＠svn.reactos.com 08 May '05

08 May '05

Add basic headers from trunk Added: branches/new_headers/reactos/include/csrss/ Added: branches/new_headers/reactos/include/csrss/csrss.h Added: branches/new_headers/reactos/include/reactos/ Added: branches/new_headers/reactos/include/reactos/buildno.h Added: branches/new_headers/reactos/include/reactos/config.h Added: branches/new_headers/reactos/include/reactos/errcodes.h Added: branches/new_headers/reactos/include/reactos/exeformat.h Added: branches/new_headers/reactos/include/reactos/resource.h Added: branches/new_headers/reactos/include/reactos/rossym.h Added: branches/new_headers/reactos/include/reactos/version.h Added: branches/new_headers/reactos/include/reactos/version.rc Added: branches/new_headers/reactos/include/reactos/winlogon.h Added: branches/new_headers/reactos/include/wine/ Added: branches/new_headers/reactos/include/wine/cfgmgr32.h Added: branches/new_headers/reactos/include/wine/cguid.h Added: branches/new_headers/reactos/include/wine/commctrl.h Added: branches/new_headers/reactos/include/wine/commdlg.h Added: branches/new_headers/reactos/include/wine/config.h Added: branches/new_headers/reactos/include/wine/debug.h Added: branches/new_headers/reactos/include/wine/dlgs.h Added: branches/new_headers/reactos/include/wine/docobj.h Added: branches/new_headers/reactos/include/wine/exception.h Added: branches/new_headers/reactos/include/wine/exdisp.h Added: branches/new_headers/reactos/include/wine/guiddef.h Added: branches/new_headers/reactos/include/wine/initguid.h Added: branches/new_headers/reactos/include/wine/list.h Added: branches/new_headers/reactos/include/wine/mmddk.h Added: branches/new_headers/reactos/include/wine/mmreg.h Added: branches/new_headers/reactos/include/wine/mmsystem.h Added: branches/new_headers/reactos/include/wine/msacm.h Added: branches/new_headers/reactos/include/wine/msacmdlg.h Added: branches/new_headers/reactos/include/wine/msacmdrv.h Added: branches/new_headers/reactos/include/wine/msi.h Added: branches/new_headers/reactos/include/wine/msidefs.h Added: branches/new_headers/reactos/include/wine/msiquery.h Added: branches/new_headers/reactos/include/wine/netspi.h Added: branches/new_headers/reactos/include/wine/npapi.h Added: branches/new_headers/reactos/include/wine/ntstatus.h Added: branches/new_headers/reactos/include/wine/oaidl.h Added: branches/new_headers/reactos/include/wine/objbase.h Added: branches/new_headers/reactos/include/wine/objidl.h Added: branches/new_headers/reactos/include/wine/ocidl.h Added: branches/new_headers/reactos/include/wine/ole2.h Added: branches/new_headers/reactos/include/wine/oleidl.h Added: branches/new_headers/reactos/include/wine/port.h Added: branches/new_headers/reactos/include/wine/prsht.h Added: branches/new_headers/reactos/include/wine/richedit.h Added: branches/new_headers/reactos/include/wine/richole.h Added: branches/new_headers/reactos/include/wine/rpcfc.h Added: branches/new_headers/reactos/include/wine/rpcss_shared.h Added: branches/new_headers/reactos/include/wine/servprov.h Added: branches/new_headers/reactos/include/wine/setupapi.h Added: branches/new_headers/reactos/include/wine/shellapi.h Added: branches/new_headers/reactos/include/wine/shldisp.h Added: branches/new_headers/reactos/include/wine/shlguid.h Added: branches/new_headers/reactos/include/wine/shlobj.h Added: branches/new_headers/reactos/include/wine/shlwapi.h Added: branches/new_headers/reactos/include/wine/shobjidl.h Added: branches/new_headers/reactos/include/wine/shtypes.h Added: branches/new_headers/reactos/include/wine/test.h Added: branches/new_headers/reactos/include/wine/unicode.h Added: branches/new_headers/reactos/include/wine/unknwn.h Added: branches/new_headers/reactos/include/wine/urlmon.h Added: branches/new_headers/reactos/include/wine/winbase16.h Added: branches/new_headers/reactos/include/wine/windef.h Added: branches/new_headers/reactos/include/wine/windef16.h Added: branches/new_headers/reactos/include/wine/wine_common_ver.rc Added: branches/new_headers/reactos/include/wine/wingdi.h Added: branches/new_headers/reactos/include/wine/wingdi16.h Added: branches/new_headers/reactos/include/wine/wininet.h Added: branches/new_headers/reactos/include/wine/winnetwk.h Added: branches/new_headers/reactos/include/wine/winnt.h Added: branches/new_headers/reactos/include/wine/winternl.h Added: branches/new_headers/reactos/include/wine/winuser.h Added: branches/new_headers/reactos/include/wine/winuser16.h Added: branches/new_headers/reactos/include/wine/wownt32.h Added: branches/new_headers/reactos/include/wine/wpp.h Added: branches/new_headers/reactos/include/wine/wtypes.h _____ Added: branches/new_headers/reactos/include/csrss/csrss.h --- branches/new_headers/reactos/include/csrss/csrss.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/csrss/csrss.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,830 @@ +#ifndef __INCLUDE_CSRSS_CSRSS_H +#define __INCLUDE_CSRSS_CSRSS_H + +#include <windows.h> +#include <ddk/ntddblue.h> +#include <ntos.h> + +#define CSR_CSRSS_SECTION_SIZE (65536) + +typedef __declspec(noreturn) VOID CALLBACK(*PCONTROLDISPATCHER)(DWORD); + +typedef struct +{ +} CSRSS_CONNECT_PROCESS_REQUEST, *PCSRSS_CONNECT_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_CONNECT_PROCESS_REPLY, *PCSRSS_CONNECT_PROCESS_REPLY; + +typedef struct +{ + HANDLE NewProcessId; + ULONG Flags; + PCONTROLDISPATCHER CtrlDispatcher; +} CSRSS_CREATE_PROCESS_REQUEST, *PCSRSS_CREATE_PROCESS_REQUEST; + +typedef struct +{ + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; +} CSRSS_CREATE_PROCESS_REPLY, *PCSRSS_CREATE_PROCESS_REPLY; + +typedef struct +{ +} CSRSS_TERMINATE_PROCESS_REQUEST, *PCSRSS_TERMINATE_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_TERMINATE_PROCESS_REPLY, *PCSRSS_TERMINATE_PROCESS_REPLY; + +typedef struct +{ + ULONG nMaxIds; +} CSRSS_GET_PROCESS_LIST_REQUEST, *PCSRSS_GET_PROCESS_LIST_REQUEST; + +typedef struct +{ + ULONG nProcessIdsCopied; + ULONG nProcessIdsTotal; + HANDLE ProcessId[1]; +} CSRSS_GET_PROCESS_LIST_REPLY, *PCSRSS_GET_PROCESS_LIST_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + ULONG NrCharactersToWrite; + BYTE Buffer[1]; +} CSRSS_WRITE_CONSOLE_REQUEST, *PCSRSS_WRITE_CONSOLE_REQUEST; + +typedef struct +{ + ULONG NrCharactersWritten; +} CSRSS_WRITE_CONSOLE_REPLY, *PCSRSS_WRITE_CONSOLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + WORD NrCharactersToRead; + WORD nCharsCanBeDeleted; /* number of chars already in buffer that can be backspaced */ +} CSRSS_READ_CONSOLE_REQUEST, *PCSRSS_READ_CONSOLE_REQUEST; + +typedef struct +{ + HANDLE EventHandle; + ULONG NrCharactersRead; + BYTE Buffer[1]; +} CSRSS_READ_CONSOLE_REPLY, *PCSRSS_READ_CONSOLE_REPLY; + +typedef struct +{ + PCONTROLDISPATCHER CtrlDispatcher; +} CSRSS_ALLOC_CONSOLE_REQUEST, *PCSRSS_ALLOC_CONSOLE_REQUEST; + +typedef struct +{ + HANDLE Console; + HANDLE InputHandle; + HANDLE OutputHandle; +} CSRSS_ALLOC_CONSOLE_REPLY, *PCSRSS_ALLOC_CONSOLE_REPLY; + +typedef struct +{ +} CSRSS_FREE_CONSOLE_REQUEST, *PCSRSS_FREE_CONSOLE_REQUEST; + +typedef struct +{ +} CSRSS_FREE_CONSOLE_REPLY, *PCSRSS_FREE_CONSOLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_SCREEN_BUFFER_INFO_REQUEST, *PCSRSS_SCREEN_BUFFER_INFO_REQUEST; + +typedef struct +{ + CONSOLE_SCREEN_BUFFER_INFO Info; +} CSRSS_SCREEN_BUFFER_INFO_REPLY, *PCSRSS_SCREEN_BUFFER_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + COORD Position; +} CSRSS_SET_CURSOR_REQUEST, *PCSRSS_SET_CURSOR_REQUEST; + +typedef struct +{ +} CSRSS_SET_CURSOR_REPLY, *PCSRSS_SET_CURSOR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + union + { + CHAR AsciiChar; + WCHAR UnicodeChar; + } Char; + COORD Position; + WORD Length; +} CSRSS_FILL_OUTPUT_REQUEST, *PCSRSS_FILL_OUTPUT_REQUEST; + +typedef struct +{ + ULONG NrCharactersWritten; +} CSRSS_FILL_OUTPUT_REPLY, *PCSRSS_FILL_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CHAR Attribute; + COORD Coord; + WORD Length; +} CSRSS_FILL_OUTPUT_ATTRIB_REQUEST, *PCSRSS_FILL_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ +} CSRSS_FILL_OUTPUT_ATTRIB_REPLY, *PCSRSS_FILL_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; +} CSRSS_READ_INPUT_REQUEST, *PCSRSS_READ_INPUT_REQUEST; + +typedef struct +{ + INPUT_RECORD Input; + BOOL MoreEvents; + HANDLE Event; +} CSRSS_READ_INPUT_REPLY, *PCSRSS_READ_INPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + WORD Length; + COORD Coord; + CHAR String[1]; +} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST; + +typedef struct +{ + COORD EndCoord; + ULONG NrCharactersWritten; +} CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + WORD Length; + COORD Coord; + CHAR String[1]; +} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ + COORD EndCoord; +} CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_CURSOR_INFO_REQUEST, *PCSRSS_GET_CURSOR_INFO_REQUEST; + +typedef struct +{ + CONSOLE_CURSOR_INFO Info; +} CSRSS_GET_CURSOR_INFO_REPLY, *PCSRSS_GET_CURSOR_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CONSOLE_CURSOR_INFO Info; +} CSRSS_SET_CURSOR_INFO_REQUEST, *PCSRSS_SET_CURSOR_INFO_REQUEST; + +typedef struct +{ +} CSRSS_SET_CURSOR_INFO_REPLY, *PCSRSS_SET_CURSOR_INFO_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + CHAR Attrib; +} CSRSS_SET_ATTRIB_REQUEST, *PCSRSS_SET_ATTRIB_REQUEST; + +typedef struct +{ +} CSRSS_SET_ATTRIB_REPLY, *PCSRSS_SET_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD Mode; +} CSRSS_SET_CONSOLE_MODE_REQUEST, *PCSRSS_SET_CONSOLE_MODE_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_MODE_REPLY, *PCSRSS_SET_CONSOLE_MODE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_CONSOLE_MODE_REQUEST, *PCSRSS_GET_CONSOLE_MODE_REQUEST; + +typedef struct +{ + DWORD ConsoleMode; +} CSRSS_GET_CONSOLE_MODE_REPLY, *PCSRSS_GET_CONSOLE_MODE_REPLY; + +typedef struct +{ + /* may want to add some parameters here someday */ +} CSRSS_CREATE_SCREEN_BUFFER_REQUEST, *PCSRSS_CREATE_SCREEN_BUFFER_REQUEST; + +typedef struct +{ + HANDLE OutputHandle; /* handle to newly created screen buffer */ +} CSRSS_CREATE_SCREEN_BUFFER_REPLY, *PCSRSS_CREATE_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE OutputHandle; /* handle to screen buffer to switch to */ +} CSRSS_SET_SCREEN_BUFFER_REQUEST, *PCSRSS_SET_SCREEN_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_SET_SCREEN_BUFFER_REPLY, *PCSRSS_SET_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE UniqueThread; +} CSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REQUEST; + +typedef struct +{ + CLIENT_ID Cid; +} CSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY, *PCSRSS_IDENTIFY_ALERTABLE_THREAD_REPLY; + +typedef struct +{ + HANDLE Console; + DWORD Length; + WCHAR Title[1]; +} CSRSS_SET_TITLE_REQUEST, *PCSRSS_SET_TITLE_REQUEST; + +typedef struct +{ +} CSRSS_SET_TITLE_REPLY, *PCSRSS_SET_TITLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +} CSRSS_GET_TITLE_REQUEST, *PCSRSS_GET_TITLE_REQUEST; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD Length; + WCHAR Title[1]; +} CSRSS_GET_TITLE_REPLY, *PCSRSS_GET_TITLE_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT WriteRegion; + CHAR_INFO* CharInfo; +} CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_OUTPUT_REQUEST; + +typedef struct +{ + SMALL_RECT WriteRegion; +} CSRSS_WRITE_CONSOLE_OUTPUT_REPLY, *PCSRSS_WRITE_CONSOLE_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleInput; +} CSRSS_FLUSH_INPUT_BUFFER_REQUEST, *PCSRSS_FLUSH_INPUT_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_FLUSH_INPUT_BUFFER_REPLY, *PCSRSS_FLUSH_INPUT_BUFFER_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + SMALL_RECT ScrollRectangle; + BOOLEAN UseClipRectangle; + SMALL_RECT ClipRectangle; + COORD DestinationOrigin; + CHAR_INFO Fill; +} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST; + +typedef struct +{ +} CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY, *PCSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD NumCharsToRead; + COORD ReadCoord; +}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST; + +typedef struct +{ + COORD EndCoord; + DWORD CharsRead; + CHAR String[1]; +}CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD NumAttrsToRead; + COORD ReadCoord; +}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST; + +typedef struct +{ + COORD EndCoord; + CHAR String[1]; +}CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; +}CSRSS_GET_NUM_INPUT_EVENTS_REQUEST, *PCSRSS_GET_NUM_INPUT_EVENTS_REQUEST; + +typedef struct +{ + DWORD NumInputEvents; +}CSRSS_GET_NUM_INPUT_EVENTS_REPLY, *PCSRSS_GET_NUM_INPUT_EVENTS_REPLY; + +typedef struct +{ + HANDLE ProcessId; +} CSRSS_REGISTER_SERVICES_PROCESS_REQUEST, *PCSRSS_REGISTER_SERVICES_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_REGISTER_SERVICES_PROCESS_REPLY, *PCSRSS_REGISTER_SERVICES_PROCESS_REPLY; + +typedef struct +{ + UINT Flags; + DWORD Reserved; +} CSRSS_EXIT_REACTOS_REQUEST, *PCSRSS_EXIT_REACTOS_REQUEST; + +typedef struct +{ +} CSRSS_EXIT_REACTOS_REPLY, *PCSRSS_EXIT_REACTOS_REPLY; + +typedef struct +{ + DWORD Level; + DWORD Flags; +} CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST; + +typedef struct +{ +} CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_SET_SHUTDOWN_PARAMETERS_REPLY; + +typedef struct +{ +} CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST; + +typedef struct +{ + DWORD Level; + DWORD Flags; +} CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY, *PCSRSS_GET_SHUTDOWN_PARAMETERS_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; +} CSRSS_PEEK_CONSOLE_INPUT_REQUEST, *PCSRSS_PEEK_CONSOLE_INPUT_REQUEST; + +typedef struct +{ + DWORD Length; +} CSRSS_PEEK_CONSOLE_INPUT_REPLY, *PCSRSS_PEEK_CONSOLE_INPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + COORD BufferSize; + COORD BufferCoord; + SMALL_RECT ReadRegion; + CHAR_INFO* CharInfo; +} CSRSS_READ_CONSOLE_OUTPUT_REQUEST, *PCSRSS_READ_CONSOLE_OUTPUT_REQUEST; + +typedef struct +{ + SMALL_RECT ReadRegion; +} CSRSS_READ_CONSOLE_OUTPUT_REPLY, *PCSRSS_READ_CONSOLE_OUTPUT_REPLY; + +typedef struct +{ + HANDLE ConsoleHandle; + BOOL Unicode; + DWORD Length; + INPUT_RECORD* InputRecord; +} CSRSS_WRITE_CONSOLE_INPUT_REQUEST, *PCSRSS_WRITE_CONSOLE_INPUT_REQUEST; + +typedef struct +{ + DWORD Length; +} CSRSS_WRITE_CONSOLE_INPUT_REPLY, *PCSRSS_WRITE_CONSOLE_INPUT_REPLY; + +typedef struct +{ +} CSRSS_GET_INPUT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE InputHandle; +} CSRSS_GET_INPUT_HANDLE_REPLY, *PCSRSS_GET_INPUT_HANDLE_REPLY; + +typedef struct +{ +} CSRSS_GET_OUTPUT_HANDLE_REQUEST, *PCSRSS_GET_OUTPUT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE OutputHandle; +} CSRSS_GET_OUTPUT_HANDLE_REPLY, *PCSRSS_GET_OUTPUT_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; +} CSRSS_CLOSE_HANDLE_REQUEST, *PCSRSS_CLOSE_HANDLE_REQUEST; + +typedef struct +{ +} CSRSS_CLOSE_HANDLE_REPLY, *PCSRSS_CLOSE_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; +} CSRSS_VERIFY_HANDLE_REQUEST, *PCSRSS_VERIFY_HANDLE_REQUEST; + +typedef struct +{ +} CSRSS_VERIFY_HANDLE_REPLY, *PCSRSS_VERIFY_HANDLE_REPLY; + +typedef struct +{ + HANDLE Handle; + HANDLE ProcessId; +} CSRSS_DUPLICATE_HANDLE_REQUEST, *PCSRSS_DUPLICATE_HANDLE_REQUEST; + +typedef struct +{ + HANDLE Handle; +} CSRSS_DUPLICATE_HANDLE_REPLY, *PCSRSS_DUPLICATE_HANDLE_REPLY; + +#define CONSOLE_HARDWARE_STATE_GET 0 +#define CONSOLE_HARDWARE_STATE_SET 1 + +#define CONSOLE_HARDWARE_STATE_GDI_MANAGED 0 +#define CONSOLE_HARDWARE_STATE_DIRECT 1 + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; +} CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST, *PCSRSS_SETGET_CONSOLE_HW_STATE_REQUEST; + +typedef struct +{ + HANDLE ConsoleHandle; + DWORD SetGet; /* 0=get; 1=set */ + DWORD State; +} CSRSS_SETGET_CONSOLE_HW_STATE_REPLY, *PCSRSS_SETGET_CONSOLE_HW_STATE_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_WINDOW_REQUEST, *PCSRSS_GET_CONSOLE_WINDOW_REQUEST; + +typedef struct +{ + HWND WindowHandle; +} CSRSS_GET_CONSOLE_WINDOW_REPLY, *PCSRSS_GET_CONSOLE_WINDOW_REPLY; + +typedef struct +{ + HICON WindowIcon; +} CSRSS_SET_CONSOLE_ICON_REQUEST, *PCSRSS_SET_CONSOLE_ICON_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_ICON_REPLY, *PCSRSS_SET_CONSOLE_ICON_REPLY; + +typedef struct +{ + HDESK DesktopHandle; +} CSRSS_CREATE_DESKTOP_REQUEST, *PCSRSS_CREATE_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_CREATE_DESKTOP_REPLY, *PCSRSS_CREATE_DESKTOP_REPLY; + +typedef struct +{ + HWND DesktopWindow; + ULONG Width; + ULONG Height; +} CSRSS_SHOW_DESKTOP_REQUEST, *PCSRSS_SHOW_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_SHOW_DESKTOP_REPLY, *PCSRSS_SHOW_DESKTOP_REPLY; + +typedef struct +{ + HWND DesktopWindow; +} CSRSS_HIDE_DESKTOP_REQUEST, *PCSRSS_HIDE_DESKTOP_REQUEST; + +typedef struct +{ +} CSRSS_HIDE_DESKTOP_REPLY, *PCSRSS_HIDE_DESKTOP_REPLY; + +typedef struct +{ + HWND LogonNotifyWindow; +} CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST; + +typedef struct +{ +} CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY, *PCSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY; + +typedef struct +{ + HANDLE ProcessId; + BOOL Register; +} CSRSS_REGISTER_LOGON_PROCESS_REQUEST, *PCSRSS_REGISTER_LOGON_PROCESS_REQUEST; + +typedef struct +{ +} CSRSS_REGISTER_LOGON_PROCESS_REPLY, *PCSRSS_REGISTER_LOGON_PROCESS_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_CP_REQUEST, *PCSRSS_GET_CONSOLE_CP_REQUEST; + +typedef struct +{ + UINT CodePage; +} CSRSS_GET_CONSOLE_CP_REPLY, *PCSRSS_GET_CONSOLE_CP_REPLY; + +typedef struct +{ + UINT CodePage; +} CSRSS_SET_CONSOLE_CP_REQUEST, *PCSRSS_SET_CONSOLE_CP_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_CP_REPLY, *PCSRSS_SET_CONSOLE_CP_REPLY; + +typedef struct +{ +} CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST; + +typedef struct +{ + UINT CodePage; +} CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_GET_CONSOLE_OUTPUT_CP_REPLY; + +typedef struct +{ + UINT CodePage; +} CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST; + +typedef struct +{ +} CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY, *PCSRSS_SET_CONSOLE_OUTPUT_CP_REPLY; + +typedef struct +{ +} CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST, *PCSRSS_GET_INPUT_WAIT_HANDLE_REQUEST; + +typedef struct +{ + HANDLE InputWaitHandle; +} CSRSS_GET_INPUT_WAIT_HANDLE_REPLY, *PCSRSS_GET_INPUT_WAIT_HANDLE_REPLY; + +#define CSRSS_MAX_WRITE_CONSOLE_REQUEST \ + (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(CSRSS_WRITE_CONSOLE_REQUEST)) + +#define CSRSS_MAX_SET_TITLE_REQUEST (MAX_MESSAGE_DATA - sizeof( HANDLE ) - sizeof( DWORD ) - sizeof( ULONG ) - LPC_MESSAGE_BASE_SIZE) + +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST )) + +#define CSRSS_MAX_WRITE_CONSOLE_OUTPUT_ATTRIB ((MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST )) / 2) + +#define CSRSS_MAX_READ_CONSOLE_REQUEST (MAX_MESSAGE_DATA - sizeof( ULONG ) - sizeof( CSRSS_READ_CONSOLE_REQUEST )) + +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_CHAR (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST)) + +#define CSRSS_MAX_READ_CONSOLE_OUTPUT_ATTRIB (MAX_MESSAGE_DATA - sizeof(ULONG) - sizeof(HANDLE) - sizeof(DWORD) - sizeof(CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST)) + +/* WCHARs, not bytes! */ +#define CSRSS_MAX_TITLE_LENGTH 80 + +#define CSRSS_CREATE_PROCESS (0x0) +#define CSRSS_TERMINATE_PROCESS (0x1) +#define CSRSS_WRITE_CONSOLE (0x2) +#define CSRSS_READ_CONSOLE (0x3) +#define CSRSS_ALLOC_CONSOLE (0x4) +#define CSRSS_FREE_CONSOLE (0x5) +#define CSRSS_CONNECT_PROCESS (0x6) +#define CSRSS_SCREEN_BUFFER_INFO (0x7) +#define CSRSS_SET_CURSOR (0x8) +#define CSRSS_FILL_OUTPUT (0x9) +#define CSRSS_READ_INPUT (0xA) +#define CSRSS_WRITE_CONSOLE_OUTPUT_CHAR (0xB) +#define CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB (0xC) +#define CSRSS_FILL_OUTPUT_ATTRIB (0xD) +#define CSRSS_GET_CURSOR_INFO (0xE) +#define CSRSS_SET_CURSOR_INFO (0xF) +#define CSRSS_SET_ATTRIB (0x10) +#define CSRSS_GET_CONSOLE_MODE (0x11) +#define CSRSS_SET_CONSOLE_MODE (0x12) +#define CSRSS_CREATE_SCREEN_BUFFER (0x13) +#define CSRSS_SET_SCREEN_BUFFER (0x14) +#define CSRSS_SET_TITLE (0x15) +#define CSRSS_GET_TITLE (0x16) +#define CSRSS_WRITE_CONSOLE_OUTPUT (0x17) +#define CSRSS_FLUSH_INPUT_BUFFER (0x18) +#define CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER (0x19) +#define CSRSS_READ_CONSOLE_OUTPUT_CHAR (0x1A) +#define CSRSS_READ_CONSOLE_OUTPUT_ATTRIB (0x1B) +#define CSRSS_GET_NUM_INPUT_EVENTS (0x1C) +#define CSRSS_REGISTER_SERVICES_PROCESS (0x1D) +#define CSRSS_EXIT_REACTOS (0x1E) +#define CSRSS_GET_SHUTDOWN_PARAMETERS (0x1F) +#define CSRSS_SET_SHUTDOWN_PARAMETERS (0x20) +#define CSRSS_PEEK_CONSOLE_INPUT (0x21) +#define CSRSS_READ_CONSOLE_OUTPUT (0x22) +#define CSRSS_WRITE_CONSOLE_INPUT (0x23) +#define CSRSS_GET_INPUT_HANDLE (0x24) +#define CSRSS_GET_OUTPUT_HANDLE (0x25) +#define CSRSS_CLOSE_HANDLE (0x26) +#define CSRSS_VERIFY_HANDLE (0x27) +#define CSRSS_DUPLICATE_HANDLE (0x28) +#define CSRSS_SETGET_CONSOLE_HW_STATE (0x29) +#define CSRSS_GET_CONSOLE_WINDOW (0x2A) +#define CSRSS_CREATE_DESKTOP (0x2B) +#define CSRSS_SHOW_DESKTOP (0x2C) +#define CSRSS_HIDE_DESKTOP (0x2D) +#define CSRSS_SET_CONSOLE_ICON (0x2E) +#define CSRSS_SET_LOGON_NOTIFY_WINDOW (0x2F) +#define CSRSS_REGISTER_LOGON_PROCESS (0x30) +#define CSRSS_GET_CONSOLE_CP (0x31) +#define CSRSS_SET_CONSOLE_CP (0x32) +#define CSRSS_GET_CONSOLE_OUTPUT_CP (0x33) +#define CSRSS_SET_CONSOLE_OUTPUT_CP (0x34) +#define CSRSS_GET_INPUT_WAIT_HANDLE (0x35) +#define CSRSS_GET_PROCESS_LIST (0x36) + +/* Keep in sync with definition below. */ +#define CSRSS_REQUEST_HEADER_SIZE (LPC_MESSAGE_BASE_SIZE + sizeof(ULONG)) + +typedef struct +{ + union + { + LPC_MESSAGE Header; + struct + { + BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; + ULONG Type; + union + { + CSRSS_CREATE_PROCESS_REQUEST CreateProcessRequest; + CSRSS_CONNECT_PROCESS_REQUEST ConnectRequest; + CSRSS_WRITE_CONSOLE_REQUEST WriteConsoleRequest; + CSRSS_READ_CONSOLE_REQUEST ReadConsoleRequest; + CSRSS_ALLOC_CONSOLE_REQUEST AllocConsoleRequest; + CSRSS_SCREEN_BUFFER_INFO_REQUEST ScreenBufferInfoRequest; + CSRSS_SET_CURSOR_REQUEST SetCursorRequest; + CSRSS_FILL_OUTPUT_REQUEST FillOutputRequest; + CSRSS_READ_INPUT_REQUEST ReadInputRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REQUEST WriteConsoleOutputCharRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REQUEST WriteConsoleOutputAttribRequest; + CSRSS_FILL_OUTPUT_ATTRIB_REQUEST FillOutputAttribRequest; + CSRSS_SET_CURSOR_INFO_REQUEST SetCursorInfoRequest; + CSRSS_GET_CURSOR_INFO_REQUEST GetCursorInfoRequest; + CSRSS_SET_ATTRIB_REQUEST SetAttribRequest; + CSRSS_SET_CONSOLE_MODE_REQUEST SetConsoleModeRequest; + CSRSS_GET_CONSOLE_MODE_REQUEST GetConsoleModeRequest; + CSRSS_CREATE_SCREEN_BUFFER_REQUEST CreateScreenBufferRequest; + CSRSS_SET_SCREEN_BUFFER_REQUEST SetScreenBufferRequest; + CSRSS_SET_TITLE_REQUEST SetTitleRequest; + CSRSS_GET_TITLE_REQUEST GetTitleRequest; + CSRSS_WRITE_CONSOLE_OUTPUT_REQUEST WriteConsoleOutputRequest; + CSRSS_FLUSH_INPUT_BUFFER_REQUEST FlushInputBufferRequest; + CSRSS_SCROLL_CONSOLE_SCREEN_BUFFER_REQUEST ScrollConsoleScreenBufferRequest; + CSRSS_READ_CONSOLE_OUTPUT_CHAR_REQUEST ReadConsoleOutputCharRequest; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REQUEST ReadConsoleOutputAttribRequest; + CSRSS_GET_NUM_INPUT_EVENTS_REQUEST GetNumInputEventsRequest; + CSRSS_REGISTER_SERVICES_PROCESS_REQUEST RegisterServicesProcessRequest; + CSRSS_EXIT_REACTOS_REQUEST ExitReactosRequest; + CSRSS_SET_SHUTDOWN_PARAMETERS_REQUEST SetShutdownParametersRequest; + CSRSS_GET_SHUTDOWN_PARAMETERS_REQUEST GetShutdownParametersRequest; + CSRSS_PEEK_CONSOLE_INPUT_REQUEST PeekConsoleInputRequest; + CSRSS_READ_CONSOLE_OUTPUT_REQUEST ReadConsoleOutputRequest; + CSRSS_WRITE_CONSOLE_INPUT_REQUEST WriteConsoleInputRequest; + CSRSS_CLOSE_HANDLE_REQUEST CloseHandleRequest; + CSRSS_VERIFY_HANDLE_REQUEST VerifyHandleRequest; + CSRSS_DUPLICATE_HANDLE_REQUEST DuplicateHandleRequest; + CSRSS_SETGET_CONSOLE_HW_STATE_REQUEST ConsoleHardwareStateRequest; + CSRSS_GET_CONSOLE_WINDOW_REQUEST GetConsoleWindowRequest; + CSRSS_CREATE_DESKTOP_REQUEST CreateDesktopRequest; + CSRSS_SHOW_DESKTOP_REQUEST ShowDesktopRequest; + CSRSS_HIDE_DESKTOP_REQUEST HideDesktopRequest; + CSRSS_SET_CONSOLE_ICON_REQUEST SetConsoleIconRequest; + CSRSS_SET_LOGON_NOTIFY_WINDOW_REQUEST SetLogonNotifyWindowRequest; + CSRSS_REGISTER_LOGON_PROCESS_REQUEST RegisterLogonProcessRequest; + CSRSS_GET_CONSOLE_CP_REQUEST GetConsoleCodePage; + CSRSS_SET_CONSOLE_CP_REQUEST SetConsoleCodePage; + CSRSS_GET_CONSOLE_OUTPUT_CP_REQUEST GetConsoleOutputCodePage; + CSRSS_SET_CONSOLE_OUTPUT_CP_REQUEST SetConsoleOutputCodePage; + CSRSS_GET_INPUT_WAIT_HANDLE_REQUEST GetConsoleInputWaitHandle; + CSRSS_GET_PROCESS_LIST_REQUEST GetProcessListRequest; + } Data; + }; + }; +} CSRSS_API_REQUEST, *PCSRSS_API_REQUEST; + +typedef struct +{ + union + { + LPC_MESSAGE Header; + struct + { + BYTE HeaderReserved[LPC_MESSAGE_BASE_SIZE]; + NTSTATUS Status; + union + { + CSRSS_CREATE_PROCESS_REPLY CreateProcessReply; + CSRSS_CONNECT_PROCESS_REPLY ConnectReply; + CSRSS_FILL_OUTPUT_REPLY FillOutputReply; + CSRSS_WRITE_CONSOLE_REPLY WriteConsoleReply; + CSRSS_READ_CONSOLE_REPLY ReadConsoleReply; + CSRSS_ALLOC_CONSOLE_REPLY AllocConsoleReply; + CSRSS_SCREEN_BUFFER_INFO_REPLY ScreenBufferInfoReply; + CSRSS_READ_INPUT_REPLY ReadInputReply; + CSRSS_WRITE_CONSOLE_OUTPUT_CHAR_REPLY WriteConsoleOutputCharReply; + CSRSS_WRITE_CONSOLE_OUTPUT_ATTRIB_REPLY WriteConsoleOutputAttribReply; + CSRSS_GET_CURSOR_INFO_REPLY GetCursorInfoReply; + CSRSS_GET_CONSOLE_MODE_REPLY GetConsoleModeReply; + CSRSS_CREATE_SCREEN_BUFFER_REPLY CreateScreenBufferReply; + CSRSS_GET_TITLE_REPLY GetTitleReply; + CSRSS_WRITE_CONSOLE_OUTPUT_REPLY WriteConsoleOutputReply; + CSRSS_READ_CONSOLE_OUTPUT_CHAR_REPLY ReadConsoleOutputCharReply; + CSRSS_READ_CONSOLE_OUTPUT_ATTRIB_REPLY ReadConsoleOutputAttribReply; + CSRSS_GET_NUM_INPUT_EVENTS_REPLY GetNumInputEventsReply; + CSRSS_SET_SHUTDOWN_PARAMETERS_REPLY SetShutdownParametersReply; + CSRSS_GET_SHUTDOWN_PARAMETERS_REPLY GetShutdownParametersReply; + CSRSS_PEEK_CONSOLE_INPUT_REPLY PeekConsoleInputReply; + CSRSS_READ_CONSOLE_OUTPUT_REPLY ReadConsoleOutputReply; + CSRSS_WRITE_CONSOLE_INPUT_REPLY WriteConsoleInputReply; + CSRSS_GET_INPUT_HANDLE_REPLY GetInputHandleReply; + CSRSS_GET_OUTPUT_HANDLE_REPLY GetOutputHandleReply; + CSRSS_DUPLICATE_HANDLE_REPLY DuplicateHandleReply; + CSRSS_SETGET_CONSOLE_HW_STATE_REPLY ConsoleHardwareStateReply; + CSRSS_GET_CONSOLE_WINDOW_REPLY GetConsoleWindowReply; + CSRSS_CREATE_DESKTOP_REPLY CreateDesktopReply; + CSRSS_SHOW_DESKTOP_REPLY ShowDesktopReply; + CSRSS_HIDE_DESKTOP_REPLY HideDesktopReply; + CSRSS_SET_CONSOLE_ICON_REPLY SetConsoleIconReply; + CSRSS_SET_LOGON_NOTIFY_WINDOW_REPLY SetLogonNotifyWindowReply; + CSRSS_REGISTER_LOGON_PROCESS_REPLY RegisterLogonProcessReply; + CSRSS_GET_CONSOLE_CP_REPLY GetConsoleCodePage; + CSRSS_SET_CONSOLE_CP_REPLY SetConsoleCodePage; + CSRSS_GET_CONSOLE_OUTPUT_CP_REPLY GetConsoleOutputCodePage; + CSRSS_SET_CONSOLE_OUTPUT_CP_REPLY SetConsoleOutputCodePage; + CSRSS_GET_INPUT_WAIT_HANDLE_REPLY GetConsoleInputWaitHandle; + CSRSS_GET_PROCESS_LIST_REPLY GetProcessListReply; + } Data; + }; + }; +} CSRSS_API_REPLY, *PCSRSS_API_REPLY; + +#endif /* __INCLUDE_CSRSS_CSRSS_H */ _____ Added: branches/new_headers/reactos/include/reactos/buildno.h --- branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/buildno.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,17 @@ +/* Do not edit - Machine generated */ +#ifndef _INC_REACTOS_BUILDNO +#define _INC_REACTOS_BUILDNO +#define KERNEL_VERSION_BUILD 20050507 +#define KERNEL_VERSION_BUILD_STR "20050507-r15066" +#define KERNEL_VERSION_BUILD_RC "20050507-r15066\0" +#define KERNEL_RELEASE_RC "0.3-SVN\0" +#define KERNEL_RELEASE_STR "0.3-SVN" +#define KERNEL_VERSION_RC "0.3-SVN\0" +#define KERNEL_VERSION_STR "0.3-SVN" +#define REACTOS_DLL_VERSION_MAJOR 42 +#define REACTOS_DLL_RELEASE_RC "42.3-SVN\0" +#define REACTOS_DLL_RELEASE_STR "42.3-SVN" +#define REACTOS_DLL_VERSION_RC "42.3-SVN\0" +#define REACTOS_DLL_VERSION_STR "42.3-SVN" +#endif +/* EOF */ _____ Added: branches/new_headers/reactos/include/reactos/config.h --- branches/new_headers/reactos/include/reactos/config.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/config.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,41 @@ +#ifndef _INC_REACTOS_CONFIG_H +#define _INC_REACTOS_CONFIG_H +/* $Id: config.h 12852 2005-01-06 13:58:04Z mf $ */ +/* ReactOS global configuration options */ + +#define CONFIG_PROCESSOR_FAMILY_I386 386L +#define CONFIG_PROCESSOR_FAMILY_I486 486L +#define CONFIG_PROCESSOR_FAMILY_I586 586L +#define CONFIG_PROCESSOR_FAMILY_IPII 686L + +#define CONFIG_PROCESSOR_FAMILY_ALPHA 0x10000000 + +#define CONFIG_ARCHITECTURE_IBMPC 0x00000000 +/* + * Processor and architecture. + */ +#define CONFIG_PROCESSOR_FAMILY CONFIG_PROCESSOR_FAMILY_I586 +#define CONFIG_ARCHITECTURE CONFIG_ARCHITECTURE_IBMPC +/* + * Hardware page size + */ +#define CONFIG_MEMORY_PAGE_SIZE 4096 +/* + * Use __fastcall calling conventions when needed + * in system components that require it. + */ + +/* #define CONFIG_USE_FASTCALL */ + +/* + * Enable debugging output on a per module + * base. + */ +#define DBG_NTOSKRNL_KE_MAIN +#define DBG_NTOSKRNL_MM_MM +#define DBG_NTOSKRNL_MM_NPOOL + +#define DBG_NTDLL_LDR_STARTUP +#define DBG_NTDLL_LDR_UTILS + +#endif /* ndef _INC_REACTOS_CONFIG_H */ _____ Added: branches/new_headers/reactos/include/reactos/errcodes.h --- branches/new_headers/reactos/include/reactos/errcodes.h 2005-05-08 01:32:28 UTC (rev 15098) +++ branches/new_headers/reactos/include/reactos/errcodes.h 2005-05-08 01:38:42 UTC (rev 15099) @@ -0,0 +1,8761 @@ +/* This file is generated with wmc version 1.0.0 (12-Jun-2000). Do not edit! */ +/* Source : kernel32.mc */ +/* Cmdline: wmc -H ../../include/reactos/errcodes.h -o errcodes.rc kernel32.mc */ +/* Date : Fri May 6 23:08:59 2005 */ + +#ifndef __WMCGENERATED_427c314b_H +#define __WMCGENERATED_427c314b_H + +/* Severity codes */ +#define STATUS_SEVERITY_ERROR 0x3 +#define STATUS_SEVERITY_INFORMATIONAL 0x1 +#define STATUS_SEVERITY_SUCCESS 0x0 +#define STATUS_SEVERITY_WARNING 0x2 + +/* Facility codes */ +#define FACILITY_ITF 0x4 +#define FACILITY_SYSTEM 0x0 +#define FACILITY_GENERAL 0x7 + +/* Message definitions */ + +/* kernel32.mc MESSAGE resources for kernel32.dll */ + + +/* message definitions */ + +/* Facility=System */ + +/* MessageId : 0x00000000 */ +/* Approx. msg: ERROR_SUCCESS - The operation completed successfully. */ +#define ERROR_SUCCESS ((ULONG)0x00000000L) + +/* MessageId : 0x00000001 */ +/* Approx. msg: ERROR_INVALID_FUNCTION - Incorrect function. */ +#define ERROR_INVALID_FUNCTION ((ULONG)0x00000001L) + +/* MessageId : 0x00000002 */ +/* Approx. msg: ERROR_FILE_NOT_FOUND - The system cannot find the file specified. */ +#define ERROR_FILE_NOT_FOUND ((ULONG)0x00000002L) + +/* MessageId : 0x00000003 */ +/* Approx. msg: ERROR_PATH_NOT_FOUND - The system cannot find the path specified. */ +#define ERROR_PATH_NOT_FOUND ((ULONG)0x00000003L) + +/* MessageId : 0x00000004 */ +/* Approx. msg: ERROR_TOO_MANY_OPEN_FILES - The system cannot open the file. */ +#define ERROR_TOO_MANY_OPEN_FILES ((ULONG)0x00000004L) + +/* MessageId : 0x00000005 */ +/* Approx. msg: ERROR_ACCESS_DENIED - Access is denied. */ +#define ERROR_ACCESS_DENIED ((ULONG)0x00000005L) + +/* MessageId : 0x00000006 */ +/* Approx. msg: ERROR_INVALID_HANDLE - The handle is invalid. */ +#define ERROR_INVALID_HANDLE ((ULONG)0x00000006L) + +/* MessageId : 0x00000007 */ +/* Approx. msg: ERROR_ARENA_TRASHED - The storage control blocks were destroyed. */ +#define ERROR_ARENA_TRASHED ((ULONG)0x00000007L) + +/* MessageId : 0x00000008 */ +/* Approx. msg: ERROR_NOT_ENOUGH_MEMORY - Not enough storage is available to process this command. */ +#define ERROR_NOT_ENOUGH_MEMORY ((ULONG)0x00000008L) + +/* MessageId : 0x00000009 */ +/* Approx. msg: ERROR_INVALID_BLOCK - The storage control block address is invalid. */ +#define ERROR_INVALID_BLOCK ((ULONG)0x00000009L) + +/* MessageId : 0x0000000a */ +/* Approx. msg: ERROR_BAD_ENVIRONMENT - The environment is incorrect. */ +#define ERROR_BAD_ENVIRONMENT ((ULONG)0x0000000aL) + +/* MessageId : 0x0000000b */ +/* Approx. msg: ERROR_BAD_FORMAT - An attempt was made to load a program with an incorrect format. */ +#define ERROR_BAD_FORMAT ((ULONG)0x0000000bL) + +/* MessageId : 0x0000000c */ +/* Approx. msg: ERROR_INVALID_ACCESS - The access code is invalid. */ +#define ERROR_INVALID_ACCESS ((ULONG)0x0000000cL) + +/* MessageId : 0x0000000d */ +/* Approx. msg: ERROR_INVALID_DATA - The data is invalid. */ +#define ERROR_INVALID_DATA ((ULONG)0x0000000dL) + +/* MessageId : 0x0000000e */ +/* Approx. msg: ERROR_OUTOFMEMORY - Not enough storage is available to complete this operation. */ +#define ERROR_OUTOFMEMORY ((ULONG)0x0000000eL) + +/* MessageId : 0x0000000f */ +/* Approx. msg: ERROR_INVALID_DRIVE - The system cannot find the drive specified. */ +#define ERROR_INVALID_DRIVE ((ULONG)0x0000000fL) + [truncated at 1000 lines; 27746 more skipped]

1 0

[ion] 15098: Start by adding current w32api headers from HEAD
by ion＠svn.reactos.com 08 May '05

08 May '05

Start by adding current w32api headers from HEAD Added: branches/new_headers/reactos/include/ Added: branches/new_headers/reactos/include/GL/ Added: branches/new_headers/reactos/include/GL/gl.h Added: branches/new_headers/reactos/include/GL/glext.h Added: branches/new_headers/reactos/include/GL/glu.h Added: branches/new_headers/reactos/include/GdiPlus.h Added: branches/new_headers/reactos/include/GdiPlusBase.h Added: branches/new_headers/reactos/include/GdiPlusBrush.h Added: branches/new_headers/reactos/include/GdiPlusColor.h Added: branches/new_headers/reactos/include/GdiPlusColorMatrix.h Added: branches/new_headers/reactos/include/GdiPlusEffects.h Added: branches/new_headers/reactos/include/GdiPlusEnums.h Added: branches/new_headers/reactos/include/GdiPlusFlat.h Added: branches/new_headers/reactos/include/GdiPlusGpStubs.h Added: branches/new_headers/reactos/include/GdiPlusGraphics.h Added: branches/new_headers/reactos/include/GdiPlusHeaders.h Added: branches/new_headers/reactos/include/GdiPlusImageAttributes.h Added: branches/new_headers/reactos/include/GdiPlusImaging.h Added: branches/new_headers/reactos/include/GdiPlusInit.h Added: branches/new_headers/reactos/include/GdiPlusLineCaps.h Added: branches/new_headers/reactos/include/GdiPlusMatrix.h Added: branches/new_headers/reactos/include/GdiPlusMem.h Added: branches/new_headers/reactos/include/GdiPlusMetaFile.h Added: branches/new_headers/reactos/include/GdiPlusMetaHeader.h Added: branches/new_headers/reactos/include/GdiPlusPath.h Added: branches/new_headers/reactos/include/GdiPlusPen.h Added: branches/new_headers/reactos/include/GdiPlusPixelFormats.h Added: branches/new_headers/reactos/include/GdiPlusStringFormat.h Added: branches/new_headers/reactos/include/GdiPlusTypes.h Added: branches/new_headers/reactos/include/accctrl.h Added: branches/new_headers/reactos/include/aclapi.h Added: branches/new_headers/reactos/include/aclui.h Added: branches/new_headers/reactos/include/afxres.h Added: branches/new_headers/reactos/include/basetsd.h Added: branches/new_headers/reactos/include/basetyps.h Added: branches/new_headers/reactos/include/cderr.h Added: branches/new_headers/reactos/include/cguid.h Added: branches/new_headers/reactos/include/comcat.h Added: branches/new_headers/reactos/include/commctrl.h Added: branches/new_headers/reactos/include/commdlg.h Added: branches/new_headers/reactos/include/cpl.h Added: branches/new_headers/reactos/include/cplext.h Added: branches/new_headers/reactos/include/custcntl.h Added: branches/new_headers/reactos/include/dbt.h Added: branches/new_headers/reactos/include/dde.h Added: branches/new_headers/reactos/include/ddeml.h Added: branches/new_headers/reactos/include/ddk/ Added: branches/new_headers/reactos/include/ddk/afilter.h Added: branches/new_headers/reactos/include/ddk/atm.h Added: branches/new_headers/reactos/include/ddk/batclass.h Added: branches/new_headers/reactos/include/ddk/cfg.h Added: branches/new_headers/reactos/include/ddk/cfgmgr32.h Added: branches/new_headers/reactos/include/ddk/d4drvif.h Added: branches/new_headers/reactos/include/ddk/d4iface.h Added: branches/new_headers/reactos/include/ddk/ddkmapi.h Added: branches/new_headers/reactos/include/ddk/hidclass.h Added: branches/new_headers/reactos/include/ddk/hidpi.h Added: branches/new_headers/reactos/include/ddk/hidusage.h Added: branches/new_headers/reactos/include/ddk/mcd.h Added: branches/new_headers/reactos/include/ddk/miniport.h Added: branches/new_headers/reactos/include/ddk/minitape.h Added: branches/new_headers/reactos/include/ddk/mountdev.h Added: branches/new_headers/reactos/include/ddk/mountmgr.h Added: branches/new_headers/reactos/include/ddk/ndis.h Added: branches/new_headers/reactos/include/ddk/ndisguid.h Added: branches/new_headers/reactos/include/ddk/ndistapi.h Added: branches/new_headers/reactos/include/ddk/ndiswan.h Added: branches/new_headers/reactos/include/ddk/netevent.h Added: branches/new_headers/reactos/include/ddk/netpnp.h Added: branches/new_headers/reactos/include/ddk/newdev.h Added: branches/new_headers/reactos/include/ddk/ntagp.h Added: branches/new_headers/reactos/include/ddk/ntapi.h Added: branches/new_headers/reactos/include/ddk/ntdd8042.h Added: branches/new_headers/reactos/include/ddk/ntddbeep.h Added: branches/new_headers/reactos/include/ddk/ntddcdrm.h Added: branches/new_headers/reactos/include/ddk/ntddcdvd.h Added: branches/new_headers/reactos/include/ddk/ntddchgr.h Added: branches/new_headers/reactos/include/ddk/ntdddisk.h Added: branches/new_headers/reactos/include/ddk/ntddk.h Added: branches/new_headers/reactos/include/ddk/ntddkbd.h Added: branches/new_headers/reactos/include/ddk/ntddmou.h Added: branches/new_headers/reactos/include/ddk/ntddndis.h Added: branches/new_headers/reactos/include/ddk/ntddpar.h Added: branches/new_headers/reactos/include/ddk/ntddpcm.h Added: branches/new_headers/reactos/include/ddk/ntddscsi.h Added: branches/new_headers/reactos/include/ddk/ntddser.h Added: branches/new_headers/reactos/include/ddk/ntddstor.h Added: branches/new_headers/reactos/include/ddk/ntddtape.h Added: branches/new_headers/reactos/include/ddk/ntddtdi.h Added: branches/new_headers/reactos/include/ddk/ntddvdeo.h Added: branches/new_headers/reactos/include/ddk/ntddvol.h Added: branches/new_headers/reactos/include/ddk/ntifs.h Added: branches/new_headers/reactos/include/ddk/ntpoapi.h Added: branches/new_headers/reactos/include/ddk/ntstatus.h Added: branches/new_headers/reactos/include/ddk/parallel.h Added: branches/new_headers/reactos/include/ddk/pfhook.h Added: branches/new_headers/reactos/include/ddk/poclass.h Added: branches/new_headers/reactos/include/ddk/prntfont.h Added: branches/new_headers/reactos/include/ddk/scsi.h Added: branches/new_headers/reactos/include/ddk/scsiscan.h [truncated at 100 lines; 198 more skipped] _____ Added: branches/new_headers/reactos/include/GL/gl.h --- branches/new_headers/reactos/include/GL/gl.h 2005-05-08 01:30:30 UTC (rev 15097) +++ branches/new_headers/reactos/include/GL/gl.h 2005-05-08 01:32:28 UTC (rev 15098) @@ -0,0 +1,1472 @@ +/* $Id: gl.h 12852 2005-01-06 13:58:04Z mf $ */ + +/* + * Mesa 3-D graphics library + * Version: 4.0 + * + * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +/********************************************************************** ** + * 2002-Apr-22, JosÚ Fonseca: + * Removed non Win32 system-specific stuff + * + * 2002-Apr-17, Marcus Geelnard: + * For win32, OpenGL 1.2 & 1.3 definitions are not made in this file + * anymore, since under Windows those are regarded as extensions, and + * are better defined in glext.h (especially the function prototypes may + * conflict with extension function pointers). A few "cosmetical" + * changes were also made to this file. + * + * 2002-Apr-15, Marcus Geelnard: + * Modified this file to better fit a wider range of compilers, removed + * Mesa specific stuff, and removed extension definitions (this file now + * relies on GL/glext.h). Hopefully this file should now function as a + * generic OpenGL gl.h include file for most compilers and environments. + * Changed GLAPIENTRY to APIENTRY (to be consistent with GL/glext.h). + ************************************************************************ / + + +#ifndef __gl_h_ +#define __gl_h_ + + + +/********************************************************************** ** + * Begin system-specific stuff. + */ +/* __WIN32__ */ +#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__)) +# define __WIN32__ +#endif + +/* GLAPI, part 1 (use WINGDIAPI, if defined) */ +#if defined(__WIN32__) && defined(WINGDIAPI) +# define GLAPI WINGDIAPI +#endif + +/* GLAPI, part 2 */ +#if !defined(GLAPI) +# if defined(_MSC_VER) /* Microsoft Visual C++ */ +# define GLAPI __declspec(dllimport) +# elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */ +# define GLAPI __stdcall +# else /* Others (e.g. MinGW, Cygwin, non-win32) */ +# define GLAPI extern +# endif +#endif + +/* APIENTRY */ +#if !defined(APIENTRY) +# if defined(__WIN32__) +# define APIENTRY __stdcall +# else +# define APIENTRY +# endif +#endif +/* + * End system-specific stuff. + ************************************************************************ / + + + +#ifdef __cplusplus +extern "C" { +#endif + + + +#define GL_VERSION_1_1 1 + +#if !defined(__WIN32__) +#define GL_VERSION_1_2 1 +#define GL_VERSION_1_3 1 +#define GL_ARB_imaging 1 +#endif + + +/* + * + * Datatypes + * + */ +#ifdef CENTERLINE_CLPP +#define signed +#endif +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; /* 1-byte signed */ +typedef short GLshort; /* 2-byte signed */ +typedef int GLint; /* 4-byte signed */ +typedef unsigned char GLubyte; /* 1-byte unsigned */ +typedef unsigned short GLushort; /* 2-byte unsigned */ +typedef unsigned int GLuint; /* 4-byte unsigned */ +typedef int GLsizei; /* 4-byte signed */ +typedef float GLfloat; /* single precision float */ +typedef float GLclampf; /* single precision float in [0,1] */ +typedef double GLdouble; /* double precision float */ +typedef double GLclampd; /* double precision float in [0,1] */ + + + +/********************************************************************** ** + * + * Constants + * + ************************************************************************ / + +/* Boolean values */ +#define GL_FALSE 0x0 +#define GL_TRUE 0x1 + +/* Data types */ +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 +#define GL_DOUBLE 0x140A +#define GL_2_BYTES 0x1407 +#define GL_3_BYTES 0x1408 +#define GL_4_BYTES 0x1409 + +/* Primitives */ +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +#define GL_LINE_LOOP 0x0002 +#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +#define GL_TRIANGLE_STRIP 0x0005 +#define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 +#define GL_QUAD_STRIP 0x0008 +#define GL_POLYGON 0x0009 + +/* Vertex Arrays */ +#define GL_VERTEX_ARRAY 0x8074 +#define GL_NORMAL_ARRAY 0x8075 +#define GL_COLOR_ARRAY 0x8076 +#define GL_INDEX_ARRAY 0x8077 +#define GL_TEXTURE_COORD_ARRAY 0x8078 +#define GL_EDGE_FLAG_ARRAY 0x8079 +#define GL_VERTEX_ARRAY_SIZE 0x807A +#define GL_VERTEX_ARRAY_TYPE 0x807B +#define GL_VERTEX_ARRAY_STRIDE 0x807C +#define GL_NORMAL_ARRAY_TYPE 0x807E +#define GL_NORMAL_ARRAY_STRIDE 0x807F +#define GL_COLOR_ARRAY_SIZE 0x8081 +#define GL_COLOR_ARRAY_TYPE 0x8082 +#define GL_COLOR_ARRAY_STRIDE 0x8083 +#define GL_INDEX_ARRAY_TYPE 0x8085 +#define GL_INDEX_ARRAY_STRIDE 0x8086 +#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +#define GL_VERTEX_ARRAY_POINTER 0x808E +#define GL_NORMAL_ARRAY_POINTER 0x808F +#define GL_COLOR_ARRAY_POINTER 0x8090 +#define GL_INDEX_ARRAY_POINTER 0x8091 +#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +#define GL_V2F 0x2A20 +#define GL_V3F 0x2A21 +#define GL_C4UB_V2F 0x2A22 +#define GL_C4UB_V3F 0x2A23 +#define GL_C3F_V3F 0x2A24 +#define GL_N3F_V3F 0x2A25 +#define GL_C4F_N3F_V3F 0x2A26 +#define GL_T2F_V3F 0x2A27 +#define GL_T4F_V4F 0x2A28 +#define GL_T2F_C4UB_V3F 0x2A29 +#define GL_T2F_C3F_V3F 0x2A2A +#define GL_T2F_N3F_V3F 0x2A2B +#define GL_T2F_C4F_N3F_V3F 0x2A2C +#define GL_T4F_C4F_N3F_V4F 0x2A2D + +/* Matrix Mode */ +#define GL_MATRIX_MODE 0x0BA0 +#define GL_MODELVIEW 0x1700 +#define GL_PROJECTION 0x1701 +#define GL_TEXTURE 0x1702 + +/* Points */ +#define GL_POINT_SMOOTH 0x0B10 +#define GL_POINT_SIZE 0x0B11 +#define GL_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_POINT_SIZE_RANGE 0x0B12 + +/* Lines */ +#define GL_LINE_SMOOTH 0x0B20 +#define GL_LINE_STIPPLE 0x0B24 +#define GL_LINE_STIPPLE_PATTERN 0x0B25 +#define GL_LINE_STIPPLE_REPEAT 0x0B26 +#define GL_LINE_WIDTH 0x0B21 +#define GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_LINE_WIDTH_RANGE 0x0B22 + +/* Polygons */ +#define GL_POINT 0x1B00 +#define GL_LINE 0x1B01 +#define GL_FILL 0x1B02 +#define GL_CW 0x0900 +#define GL_CCW 0x0901 +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 +#define GL_POLYGON_MODE 0x0B40 +#define GL_POLYGON_SMOOTH 0x0B41 +#define GL_POLYGON_STIPPLE 0x0B42 +#define GL_EDGE_FLAG 0x0B43 +#define GL_CULL_FACE 0x0B44 +#define GL_CULL_FACE_MODE 0x0B45 +#define GL_FRONT_FACE 0x0B46 +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +#define GL_POLYGON_OFFSET_POINT 0x2A01 +#define GL_POLYGON_OFFSET_LINE 0x2A02 +#define GL_POLYGON_OFFSET_FILL 0x8037 + +/* Display Lists */ +#define GL_COMPILE 0x1300 +#define GL_COMPILE_AND_EXECUTE 0x1301 +#define GL_LIST_BASE 0x0B32 +#define GL_LIST_INDEX 0x0B33 +#define GL_LIST_MODE 0x0B30 + +/* Depth buffer */ +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 +#define GL_DEPTH_TEST 0x0B71 +#define GL_DEPTH_BITS 0x0D56 +#define GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GL_DEPTH_FUNC 0x0B74 +#define GL_DEPTH_RANGE 0x0B70 +#define GL_DEPTH_WRITEMASK 0x0B72 +#define GL_DEPTH_COMPONENT 0x1902 + +/* Lighting */ +#define GL_LIGHTING 0x0B50 +#define GL_LIGHT0 0x4000 +#define GL_LIGHT1 0x4001 +#define GL_LIGHT2 0x4002 +#define GL_LIGHT3 0x4003 +#define GL_LIGHT4 0x4004 +#define GL_LIGHT5 0x4005 +#define GL_LIGHT6 0x4006 +#define GL_LIGHT7 0x4007 +#define GL_SPOT_EXPONENT 0x1205 +#define GL_SPOT_CUTOFF 0x1206 +#define GL_CONSTANT_ATTENUATION 0x1207 +#define GL_LINEAR_ATTENUATION 0x1208 +#define GL_QUADRATIC_ATTENUATION 0x1209 +#define GL_AMBIENT 0x1200 +#define GL_DIFFUSE 0x1201 +#define GL_SPECULAR 0x1202 +#define GL_SHININESS 0x1601 +#define GL_EMISSION 0x1600 +#define GL_POSITION 0x1203 +#define GL_SPOT_DIRECTION 0x1204 +#define GL_AMBIENT_AND_DIFFUSE 0x1602 +#define GL_COLOR_INDEXES 0x1603 +#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +#define GL_LIGHT_MODEL_AMBIENT 0x0B53 +#define GL_FRONT_AND_BACK 0x0408 +#define GL_SHADE_MODEL 0x0B54 +#define GL_FLAT 0x1D00 +#define GL_SMOOTH 0x1D01 +#define GL_COLOR_MATERIAL 0x0B57 +#define GL_COLOR_MATERIAL_FACE 0x0B55 +#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 +#define GL_NORMALIZE 0x0BA1 + +/* User clipping planes */ +#define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE5 0x3005 + +/* Accumulation buffer */ +#define GL_ACCUM_RED_BITS 0x0D58 +#define GL_ACCUM_GREEN_BITS 0x0D59 +#define GL_ACCUM_BLUE_BITS 0x0D5A +#define GL_ACCUM_ALPHA_BITS 0x0D5B +#define GL_ACCUM_CLEAR_VALUE 0x0B80 +#define GL_ACCUM 0x0100 +#define GL_ADD 0x0104 +#define GL_LOAD 0x0101 +#define GL_MULT 0x0103 +#define GL_RETURN 0x0102 + +/* Alpha testing */ +#define GL_ALPHA_TEST 0x0BC0 +#define GL_ALPHA_TEST_REF 0x0BC2 +#define GL_ALPHA_TEST_FUNC 0x0BC1 + +/* Blending */ +#define GL_BLEND 0x0BE2 +#define GL_BLEND_SRC 0x0BE1 +#define GL_BLEND_DST 0x0BE0 +#define GL_ZERO 0x0 +#define GL_ONE 0x1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 + +/* Render Mode */ +#define GL_FEEDBACK 0x1C01 +#define GL_RENDER 0x1C00 +#define GL_SELECT 0x1C02 + +/* Feedback */ +#define GL_2D 0x0600 +#define GL_3D 0x0601 +#define GL_3D_COLOR 0x0602 +#define GL_3D_COLOR_TEXTURE 0x0603 +#define GL_4D_COLOR_TEXTURE 0x0604 +#define GL_POINT_TOKEN 0x0701 +#define GL_LINE_TOKEN 0x0702 +#define GL_LINE_RESET_TOKEN 0x0707 +#define GL_POLYGON_TOKEN 0x0703 +#define GL_BITMAP_TOKEN 0x0704 +#define GL_DRAW_PIXEL_TOKEN 0x0705 +#define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_PASS_THROUGH_TOKEN 0x0700 +#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 +#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 +#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 + +/* Selection */ +#define GL_SELECTION_BUFFER_POINTER 0x0DF3 +#define GL_SELECTION_BUFFER_SIZE 0x0DF4 + +/* Fog */ +#define GL_FOG 0x0B60 +#define GL_FOG_MODE 0x0B65 +#define GL_FOG_DENSITY 0x0B62 +#define GL_FOG_COLOR 0x0B66 +#define GL_FOG_INDEX 0x0B61 +#define GL_FOG_START 0x0B63 +#define GL_FOG_END 0x0B64 +#define GL_LINEAR 0x2601 +#define GL_EXP 0x0800 +#define GL_EXP2 0x0801 + +/* Logic Ops */ +#define GL_LOGIC_OP 0x0BF1 +#define GL_INDEX_LOGIC_OP 0x0BF1 +#define GL_COLOR_LOGIC_OP 0x0BF2 +#define GL_LOGIC_OP_MODE 0x0BF0 +#define GL_CLEAR 0x1500 +#define GL_SET 0x150F +#define GL_COPY 0x1503 +#define GL_COPY_INVERTED 0x150C +#define GL_NOOP 0x1505 +#define GL_INVERT 0x150A +#define GL_AND 0x1501 +#define GL_NAND 0x150E +#define GL_OR 0x1507 +#define GL_NOR 0x1508 +#define GL_XOR 0x1506 +#define GL_EQUIV 0x1509 +#define GL_AND_REVERSE 0x1502 +#define GL_AND_INVERTED 0x1504 +#define GL_OR_REVERSE 0x150B +#define GL_OR_INVERTED 0x150D + +/* Stencil */ +#define GL_STENCIL_TEST 0x0B90 +#define GL_STENCIL_WRITEMASK 0x0B98 +#define GL_STENCIL_BITS 0x0D57 +#define GL_STENCIL_FUNC 0x0B92 +#define GL_STENCIL_VALUE_MASK 0x0B93 +#define GL_STENCIL_REF 0x0B97 +#define GL_STENCIL_FAIL 0x0B94 +#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GL_STENCIL_INDEX 0x1901 +#define GL_KEEP 0x1E00 +#define GL_REPLACE 0x1E01 +#define GL_INCR 0x1E02 +#define GL_DECR 0x1E03 + +/* Buffers, Pixel Drawing/Reading */ +#define GL_NONE 0x0 +#define GL_LEFT 0x0406 +#define GL_RIGHT 0x0407 +/*GL_FRONT 0x0404 */ +/*GL_BACK 0x0405 */ +/*GL_FRONT_AND_BACK 0x0408 */ +#define GL_FRONT_LEFT 0x0400 +#define GL_FRONT_RIGHT 0x0401 +#define GL_BACK_LEFT 0x0402 +#define GL_BACK_RIGHT 0x0403 +#define GL_AUX0 0x0409 +#define GL_AUX1 0x040A +#define GL_AUX2 0x040B +#define GL_AUX3 0x040C +#define GL_COLOR_INDEX 0x1900 +#define GL_RED 0x1903 +#define GL_GREEN 0x1904 +#define GL_BLUE 0x1905 +#define GL_ALPHA 0x1906 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A +#define GL_ALPHA_BITS 0x0D55 +#define GL_RED_BITS 0x0D52 +#define GL_GREEN_BITS 0x0D53 +#define GL_BLUE_BITS 0x0D54 +#define GL_INDEX_BITS 0x0D51 +#define GL_SUBPIXEL_BITS 0x0D50 +#define GL_AUX_BUFFERS 0x0C00 +#define GL_READ_BUFFER 0x0C02 +#define GL_DRAW_BUFFER 0x0C01 +#define GL_DOUBLEBUFFER 0x0C32 +#define GL_STEREO 0x0C33 +#define GL_BITMAP 0x1A00 +#define GL_COLOR 0x1800 +#define GL_DEPTH 0x1801 +#define GL_STENCIL 0x1802 +#define GL_DITHER 0x0BD0 +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 + +/* Implementation limits */ +#define GL_MAX_LIST_NESTING 0x0B31 +#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 +#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 +#define GL_MAX_NAME_STACK_DEPTH 0x0D37 +#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 +#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 +#define GL_MAX_EVAL_ORDER 0x0D30 +#define GL_MAX_LIGHTS 0x0D31 +#define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_TEXTURE_SIZE 0x0D33 +#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 +#define GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B + +/* Gets */ +#define GL_ATTRIB_STACK_DEPTH 0x0BB0 +#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_COLOR_CLEAR_VALUE 0x0C22 +#define GL_COLOR_WRITEMASK 0x0C23 +#define GL_CURRENT_INDEX 0x0B01 +#define GL_CURRENT_COLOR 0x0B00 +#define GL_CURRENT_NORMAL 0x0B02 +#define GL_CURRENT_RASTER_COLOR 0x0B04 +#define GL_CURRENT_RASTER_DISTANCE 0x0B09 +#define GL_CURRENT_RASTER_INDEX 0x0B05 +#define GL_CURRENT_RASTER_POSITION 0x0B07 +#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +#define GL_CURRENT_TEXTURE_COORDS 0x0B03 +#define GL_INDEX_CLEAR_VALUE 0x0C20 +#define GL_INDEX_MODE 0x0C30 +#define GL_INDEX_WRITEMASK 0x0C21 +#define GL_MODELVIEW_MATRIX 0x0BA6 +#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 +#define GL_NAME_STACK_DEPTH 0x0D70 +#define GL_PROJECTION_MATRIX 0x0BA7 +#define GL_PROJECTION_STACK_DEPTH 0x0BA4 +#define GL_RENDER_MODE 0x0C40 +#define GL_RGBA_MODE 0x0C31 +#define GL_TEXTURE_MATRIX 0x0BA8 +#define GL_TEXTURE_STACK_DEPTH 0x0BA5 +#define GL_VIEWPORT 0x0BA2 + +/* Evaluators */ +#define GL_AUTO_NORMAL 0x0D80 +#define GL_MAP1_COLOR_4 0x0D90 +#define GL_MAP1_GRID_DOMAIN 0x0DD0 +#define GL_MAP1_GRID_SEGMENTS 0x0DD1 +#define GL_MAP1_INDEX 0x0D91 +#define GL_MAP1_NORMAL 0x0D92 +#define GL_MAP1_TEXTURE_COORD_1 0x0D93 +#define GL_MAP1_TEXTURE_COORD_2 0x0D94 +#define GL_MAP1_TEXTURE_COORD_3 0x0D95 +#define GL_MAP1_TEXTURE_COORD_4 0x0D96 +#define GL_MAP1_VERTEX_3 0x0D97 +#define GL_MAP1_VERTEX_4 0x0D98 +#define GL_MAP2_COLOR_4 0x0DB0 +#define GL_MAP2_GRID_DOMAIN 0x0DD2 +#define GL_MAP2_GRID_SEGMENTS 0x0DD3 +#define GL_MAP2_INDEX 0x0DB1 +#define GL_MAP2_NORMAL 0x0DB2 +#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 +#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 +#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 +#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 +#define GL_MAP2_VERTEX_3 0x0DB7 +#define GL_MAP2_VERTEX_4 0x0DB8 +#define GL_COEFF 0x0A00 +#define GL_DOMAIN 0x0A02 +#define GL_ORDER 0x0A01 + +/* Hints */ +#define GL_FOG_HINT 0x0C54 +#define GL_LINE_SMOOTH_HINT 0x0C52 +#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +#define GL_POINT_SMOOTH_HINT 0x0C51 +#define GL_POLYGON_SMOOTH_HINT 0x0C53 +#define GL_DONT_CARE 0x1100 +#define GL_FASTEST 0x1101 +#define GL_NICEST 0x1102 + +/* Scissor box */ +#define GL_SCISSOR_TEST 0x0C11 +#define GL_SCISSOR_BOX 0x0C10 + +/* Pixel Mode / Transfer */ +#define GL_MAP_COLOR 0x0D10 +#define GL_MAP_STENCIL 0x0D11 +#define GL_INDEX_SHIFT 0x0D12 +#define GL_INDEX_OFFSET 0x0D13 +#define GL_RED_SCALE 0x0D14 +#define GL_RED_BIAS 0x0D15 +#define GL_GREEN_SCALE 0x0D18 +#define GL_GREEN_BIAS 0x0D19 +#define GL_BLUE_SCALE 0x0D1A +#define GL_BLUE_BIAS 0x0D1B +#define GL_ALPHA_SCALE 0x0D1C +#define GL_ALPHA_BIAS 0x0D1D +#define GL_DEPTH_SCALE 0x0D1E +#define GL_DEPTH_BIAS 0x0D1F +#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 +#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 +#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 +#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 +#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 +#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 +#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 +#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 +#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 +#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 +#define GL_PIXEL_MAP_S_TO_S 0x0C71 +#define GL_PIXEL_MAP_I_TO_I 0x0C70 +#define GL_PIXEL_MAP_I_TO_R 0x0C72 +#define GL_PIXEL_MAP_I_TO_G 0x0C73 +#define GL_PIXEL_MAP_I_TO_B 0x0C74 +#define GL_PIXEL_MAP_I_TO_A 0x0C75 +#define GL_PIXEL_MAP_R_TO_R 0x0C76 +#define GL_PIXEL_MAP_G_TO_G 0x0C77 +#define GL_PIXEL_MAP_B_TO_B 0x0C78 +#define GL_PIXEL_MAP_A_TO_A 0x0C79 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_PACK_LSB_FIRST 0x0D01 +#define GL_PACK_ROW_LENGTH 0x0D02 +#define GL_PACK_SKIP_PIXELS 0x0D04 +#define GL_PACK_SKIP_ROWS 0x0D03 +#define GL_PACK_SWAP_BYTES 0x0D00 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SWAP_BYTES 0x0CF0 +#define GL_ZOOM_X 0x0D16 +#define GL_ZOOM_Y 0x0D17 + +/* Texture mapping */ +#define GL_TEXTURE_ENV 0x2300 +#define GL_TEXTURE_ENV_MODE 0x2200 +#define GL_TEXTURE_1D 0x0DE0 +#define GL_TEXTURE_2D 0x0DE1 +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 +#define GL_TEXTURE_ENV_COLOR 0x2201 +#define GL_TEXTURE_GEN_S 0x0C60 +#define GL_TEXTURE_GEN_T 0x0C61 +#define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_TEXTURE_WIDTH 0x1000 +#define GL_TEXTURE_HEIGHT 0x1001 +#define GL_TEXTURE_BORDER 0x1005 +#define GL_TEXTURE_COMPONENTS 0x1003 +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_GREEN_SIZE 0x805D +#define GL_TEXTURE_BLUE_SIZE 0x805E +#define GL_TEXTURE_ALPHA_SIZE 0x805F +#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GL_TEXTURE_INTENSITY_SIZE 0x8061 +#define GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GL_LINEAR_MIPMAP_LINEAR 0x2703 +#define GL_OBJECT_LINEAR 0x2401 +#define GL_OBJECT_PLANE 0x2501 +#define GL_EYE_LINEAR 0x2400 +#define GL_EYE_PLANE 0x2502 +#define GL_SPHERE_MAP 0x2402 +#define GL_DECAL 0x2101 +#define GL_MODULATE 0x2100 +#define GL_NEAREST 0x2600 +#define GL_REPEAT 0x2901 +#define GL_CLAMP 0x2900 +#define GL_S 0x2000 +#define GL_T 0x2001 +#define GL_R 0x2002 +#define GL_Q 0x2003 +#define GL_TEXTURE_GEN_R 0x0C62 +#define GL_TEXTURE_GEN_Q 0x0C63 + +/* Utility */ +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +/* Errors */ +#define GL_NO_ERROR 0x0 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_OPERATION 0x0502 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#define GL_OUT_OF_MEMORY 0x0505 + +/* glPush/PopAttrib bits */ +#define GL_CURRENT_BIT 0x00000001 +#define GL_POINT_BIT 0x00000002 +#define GL_LINE_BIT 0x00000004 +#define GL_POLYGON_BIT 0x00000008 +#define GL_POLYGON_STIPPLE_BIT 0x00000010 +#define GL_PIXEL_MODE_BIT 0x00000020 +#define GL_LIGHTING_BIT 0x00000040 +#define GL_FOG_BIT 0x00000080 +#define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_ACCUM_BUFFER_BIT 0x00000200 +#define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_VIEWPORT_BIT 0x00000800 +#define GL_TRANSFORM_BIT 0x00001000 +#define GL_ENABLE_BIT 0x00002000 +#define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_HINT_BIT 0x00008000 +#define GL_EVAL_BIT 0x00010000 +#define GL_LIST_BIT 0x00020000 +#define GL_TEXTURE_BIT 0x00040000 +#define GL_SCISSOR_BIT 0x00080000 +#define GL_ALL_ATTRIB_BITS 0x000FFFFF + + +/* OpenGL 1.1 */ +#define GL_PROXY_TEXTURE_1D 0x8063 +#define GL_PROXY_TEXTURE_2D 0x8064 +#define GL_TEXTURE_PRIORITY 0x8066 +#define GL_TEXTURE_RESIDENT 0x8067 +#define GL_TEXTURE_BINDING_1D 0x8068 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 +#define GL_ALPHA4 0x803B +#define GL_ALPHA8 0x803C +#define GL_ALPHA12 0x803D +#define GL_ALPHA16 0x803E +#define GL_LUMINANCE4 0x803F +#define GL_LUMINANCE8 0x8040 +#define GL_LUMINANCE12 0x8041 +#define GL_LUMINANCE16 0x8042 +#define GL_LUMINANCE4_ALPHA4 0x8043 +#define GL_LUMINANCE6_ALPHA2 0x8044 +#define GL_LUMINANCE8_ALPHA8 0x8045 +#define GL_LUMINANCE12_ALPHA4 0x8046 +#define GL_LUMINANCE12_ALPHA12 0x8047 +#define GL_LUMINANCE16_ALPHA16 0x8048 +#define GL_INTENSITY 0x8049 +#define GL_INTENSITY4 0x804A +#define GL_INTENSITY8 0x804B +#define GL_INTENSITY12 0x804C +#define GL_INTENSITY16 0x804D +#define GL_R3_G3_B2 0x2A10 +#define GL_RGB4 0x804F +#define GL_RGB5 0x8050 +#define GL_RGB8 0x8051 +#define GL_RGB10 0x8052 +#define GL_RGB12 0x8053 +#define GL_RGB16 0x8054 +#define GL_RGBA2 0x8055 +#define GL_RGBA4 0x8056 +#define GL_RGB5_A1 0x8057 +#define GL_RGBA8 0x8058 +#define GL_RGB10_A2 0x8059 +#define GL_RGBA12 0x805A +#define GL_RGBA16 0x805B +#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 +#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF +#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF + + +/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since + it is treated as extensions (defined in glext.h) */ +#if !defined(__WIN32__) + +/* OpenGL 1.2 */ +#define GL_RESCALE_NORMAL 0x803A +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_MAX_ELEMENTS_VERTICES 0x80E8 +#define GL_MAX_ELEMENTS_INDICES 0x80E9 +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_INT_8_8_8_8 0x8035 +#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +#define GL_UNSIGNED_INT_10_10_10_2 0x8036 +#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +#define GL_SINGLE_COLOR 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR 0x81FA +#define GL_TEXTURE_MIN_LOD 0x813A +#define GL_TEXTURE_MAX_LOD 0x813B +#define GL_TEXTURE_BASE_LEVEL 0x813C +#define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GL_PACK_SKIP_IMAGES 0x806B +#define GL_PACK_IMAGE_HEIGHT 0x806C +#define GL_UNPACK_SKIP_IMAGES 0x806D +#define GL_UNPACK_IMAGE_HEIGHT 0x806E +#define GL_TEXTURE_3D 0x806F +#define GL_PROXY_TEXTURE_3D 0x8070 +#define GL_TEXTURE_DEPTH 0x8071 +#define GL_TEXTURE_WRAP_R 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#define GL_TEXTURE_BINDING_3D 0x806A + +/* OpenGL 1.2 imaging subset */ +/* GL_EXT_color_table */ +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_COLOR_TABLE_SCALE 0x80D6 +#define GL_COLOR_TABLE_BIAS 0x80D7 +#define GL_COLOR_TABLE_FORMAT 0x80D8 +#define GL_COLOR_TABLE_WIDTH 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF +/* GL_EXT_convolution and GL_HP_convolution_border_modes */ +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_CONVOLUTION_BORDER_MODE 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS 0x8015 +#define GL_REDUCE 0x8016 +#define GL_CONVOLUTION_FORMAT 0x8017 +#define GL_CONVOLUTION_WIDTH 0x8018 +#define GL_CONVOLUTION_HEIGHT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 +#define GL_CONSTANT_BORDER 0x8151 +#define GL_REPLICATE_BORDER 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR 0x8154 +/* GL_SGI_color_matrix */ +#define GL_COLOR_MATRIX 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB +/* GL_EXT_histogram */ +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_HISTOGRAM_WIDTH 0x8026 +#define GL_HISTOGRAM_FORMAT 0x8027 +#define GL_HISTOGRAM_RED_SIZE 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C +#define GL_HISTOGRAM_SINK 0x802D +#define GL_MINMAX 0x802E +#define GL_MINMAX_FORMAT 0x802F +#define GL_MINMAX_SINK 0x8030 +#define GL_TABLE_TOO_LARGE 0x8031 +/* GL_EXT_blend_color, GL_EXT_blend_minmax */ +#define GL_BLEND_EQUATION 0x8009 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_BLEND_COLOR 0x8005 + + +/* OpenGL 1.3 */ +/* multitexture */ +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +#define GL_MAX_TEXTURE_UNITS 0x84E2 +/* texture_cube_map */ +#define GL_NORMAL_MAP 0x8511 +#define GL_REFLECTION_MAP 0x8512 +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +/* texture_compression */ +#define GL_COMPRESSED_ALPHA 0x84E9 +#define GL_COMPRESSED_LUMINANCE 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +#define GL_COMPRESSED_INTENSITY 0x84EC +#define GL_COMPRESSED_RGB 0x84ED +#define GL_COMPRESSED_RGBA 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +#define GL_TEXTURE_COMPRESSED 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +/* multisample */ +#define GL_MULTISAMPLE 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE 0x809F +#define GL_SAMPLE_COVERAGE 0x80A0 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GL_MULTISAMPLE_BIT 0x20000000 +/* transpose_matrix */ +#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +/* texture_env_combine */ +#define GL_COMBINE 0x8570 +#define GL_COMBINE_RGB 0x8571 +#define GL_COMBINE_ALPHA 0x8572 +#define GL_SOURCE0_RGB 0x8580 +#define GL_SOURCE1_RGB 0x8581 +#define GL_SOURCE2_RGB 0x8582 +#define GL_SOURCE0_ALPHA 0x8588 +#define GL_SOURCE1_ALPHA 0x8589 +#define GL_SOURCE2_ALPHA 0x858A +#define GL_OPERAND0_RGB 0x8590 +#define GL_OPERAND1_RGB 0x8591 +#define GL_OPERAND2_RGB 0x8592 +#define GL_OPERAND0_ALPHA 0x8598 +#define GL_OPERAND1_ALPHA 0x8599 +#define GL_OPERAND2_ALPHA 0x859A +#define GL_RGB_SCALE 0x8573 +#define GL_ADD_SIGNED 0x8574 +#define GL_INTERPOLATE 0x8575 +#define GL_SUBTRACT 0x84E7 +#define GL_CONSTANT 0x8576 +#define GL_PRIMARY_COLOR 0x8577 +#define GL_PREVIOUS 0x8578 +/* texture_env_dot3 */ +#define GL_DOT3_RGB 0x86AE +#define GL_DOT3_RGBA 0x86AF +/* texture_border_clamp */ +#define GL_CLAMP_TO_BORDER 0x812D + +#endif /* __WIN32__ */ + + + +/********************************************************************** ** + * + * Function prototypes + * + ************************************************************************ / + +/* Miscellaneous */ +GLAPI void APIENTRY glClearIndex( GLfloat c ); +GLAPI void APIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); +GLAPI void APIENTRY glClear( GLbitfield mask ); +GLAPI void APIENTRY glIndexMask( GLuint mask ); +GLAPI void APIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); +GLAPI void APIENTRY glAlphaFunc( GLenum func, GLclampf ref ); +GLAPI void APIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor ); +GLAPI void APIENTRY glLogicOp( GLenum opcode ); +GLAPI void APIENTRY glCullFace( GLenum mode ); +GLAPI void APIENTRY glFrontFace( GLenum mode ); +GLAPI void APIENTRY glPointSize( GLfloat size ); [truncated at 1000 lines; 132131 more skipped]

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