Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[navaraf] 16149: Forgot this file in r16147.

by navaraf＠svn.reactos.com

Forgot this file in r16147. Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h --- trunk/reactos/ntoskrnl/include/internal/kbd.h 2005-06-20 13:43:26 UTC (rev 16148) +++ trunk/reactos/ntoskrnl/include/internal/kbd.h 2005-06-20 13:54:52 UTC (rev 16149) @@ -17,7 +17,7 @@ typedef struct _MODIFIERS { PVK_TO_BIT pVkToBit; WORD wMaxModBits; - BYTE ModNumber[1]; + BYTE ModNumber[]; } MODIFIERS, *PMODIFIERS; #define TYPEDEF_VK_TO_WCHARS(i) \

19 years, 6 months

[navaraf] 16148: Remove Jamfiles.

by navaraf＠svn.reactos.com

Remove Jamfiles. Deleted: trunk/reactos/lib/kbddv/Jamfile Deleted: trunk/reactos/lib/kbdfr/Jamfile Deleted: trunk/reactos/lib/kbdgr/Jamfile Deleted: trunk/reactos/lib/kbdru/Jamfile Deleted: trunk/reactos/lib/kbdse/Jamfile Deleted: trunk/reactos/lib/kbdsg/Jamfile _____ Deleted: trunk/reactos/lib/kbddv/Jamfile --- trunk/reactos/lib/kbddv/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbddv/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbddv ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbddv - -SharedLibrary kbddv : $(SRCS) ; -LINKLIBS = ; _____ Deleted: trunk/reactos/lib/kbdfr/Jamfile --- trunk/reactos/lib/kbdfr/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbdfr/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdfr ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdfr - -SharedLibrary kbdfr : $(SRCS) ; -LINKLIBS = ; _____ Deleted: trunk/reactos/lib/kbdgr/Jamfile --- trunk/reactos/lib/kbdgr/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbdgr/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdgr ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdgr - -SharedLibrary kbdgr : $(SRCS) ; -LINKLIBS = ; _____ Deleted: trunk/reactos/lib/kbdru/Jamfile --- trunk/reactos/lib/kbdru/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbdru/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdru ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdru - -SharedLibrary kbdru : $(SRCS) ; -LINKLIBS = ; _____ Deleted: trunk/reactos/lib/kbdse/Jamfile --- trunk/reactos/lib/kbdse/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbdse/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdse ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdse - -SharedLibrary kbdse : $(SRCS) ; -LINKLIBS = ; _____ Deleted: trunk/reactos/lib/kbdsg/Jamfile --- trunk/reactos/lib/kbdsg/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) +++ trunk/reactos/lib/kbdsg/Jamfile 2005-06-20 13:43:26 UTC (rev 16148) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdsg ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdsg - -SharedLibrary kbdsg : $(SRCS) ; -LINKLIBS = ;

19 years, 6 months

[navaraf] 16147: Fix warnings and remove Jamfiles.

by navaraf＠svn.reactos.com

Fix warnings and remove Jamfiles. Deleted: trunk/reactos/lib/kbduk/Jamfile Modified: trunk/reactos/lib/kbduk/kbduk.c Deleted: trunk/reactos/lib/kbdus/Jamfile Modified: trunk/reactos/lib/kbdus/kbdus.c _____ Deleted: trunk/reactos/lib/kbduk/Jamfile --- trunk/reactos/lib/kbduk/Jamfile 2005-06-20 13:17:21 UTC (rev 16146) +++ trunk/reactos/lib/kbduk/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbduk ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbduk - -SharedLibrary kbduk : $(SRCS) ; -LINKLIBS = ; _____ Modified: trunk/reactos/lib/kbduk/kbduk.c --- trunk/reactos/lib/kbduk/kbduk.c 2005-06-20 13:17:21 UTC (rev 16146) +++ trunk/reactos/lib/kbduk/kbduk.c 2005-06-20 13:43:05 UTC (rev 16147) @@ -13,9 +13,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -28,47 +32,6 @@ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -162,13 +125,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[8]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 7, { 0, 1, 2, 3 ,0, 0,4,5} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ @@ -180,112 +137,112 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { '1', NOCAPS, '1', '!' }, - { '2', NOCAPS, '2', '\"'}, - { '3', NOCAPS, '3', 0x00a3}, - { '5', NOCAPS, '5', '%'}, - { '7', NOCAPS, '7', '&'}, - { '8', NOCAPS, '8', '*'}, - { '9', NOCAPS, '9', '('}, - { '0', NOCAPS, '0', ')'}, - { VK_OEM_PLUS ,NOCAPS, '=', '+'}, + { '1', NOCAPS, {'1', '!'} }, + { '2', NOCAPS, {'2', '\"'} }, + { '3', NOCAPS, {'3', 0xa3} }, + { '5', NOCAPS, {'5', '%'} }, + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, /* First letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'W', CAPS, 'w', 'W' }, - - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'P', CAPS, 'p', 'P' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'E', CAPS, {'e', 'E'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, - { VK_OEM_1 ,NOCAPS, ';', ':' }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, /* Third letter row */ - { 'Z', CAPS, 'z', 'Z' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, - { 'M', CAPS, 'm', 'M' }, - { VK_OEM_COMMA, NOCAPS, ',', '<' }, - { VK_OEM_PERIOD, NOCAPS, '.', '>' }, - { VK_OEM_2, NOCAPS, '/', '?' }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'M', CAPS, {'m', 'M'} }, + { VK_OEM_COMMA, NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, + { VK_OEM_2, NOCAPS, {'/', '?'} }, /* Keys that do not have shift states */ - { VK_TAB, NOCAPS, '\t','\t'}, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, - { VK_MULTIPLY, NOCAPS, '*', '*' }, - { VK_DIVIDE, NOCAPS, '/', '/' }, - { VK_ESCAPE, NOCAPS, '\x1b','\x1b' }, - { VK_SPACE, NOCAPS, ' ', ' ' }, - { 0, 0, 0, 0 } + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, NOCAPS, '[', '{', 0x001b}, - { VK_OEM_6, NOCAPS, ']', '}', 0x001d}, - { VK_OEM_7, NOCAPS, '#', '~', 0x001c}, - { VK_OEM_5, 0, '\\', '|', 0x001c}, - { VK_RETURN,0, '\r', '\r', '\n' }, - { 0, 0, 0, 0, 0 } + { VK_OEM_4, NOCAPS, {'[', '{', 0x1b} }, + { VK_OEM_6, NOCAPS, {']', '}', 0x1d} }, + { VK_OEM_7, NOCAPS, {'#', '~', 0x1c} }, + { VK_OEM_5, 0, {'\\', '|', 0x1c} }, + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-Shift */ /* Legacy Ascii generators */ - { '6', NOCAPS, '6', '^', WCH_NONE, 0x1e }, - { VK_OEM_MINUS, NOCAPS, '-', '_', WCH_NONE,0x1f }, - { VK_OEM_3, NOCAPS, '\'', '@', WCH_NONE, 0x0000 }, - { 0, 0, 0, 0, 0, 0 } + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f} }, + { VK_OEM_3, NOCAPS, {'\'', '@', WCH_NONE, 0x00} }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { /* Normal, Shifted, Ctrl, Sh-Ctrl,Sh-Alt,Ctl-Alt */ /* Ctrl-sh-6 generates RS */ - {VK_OEM_8, NOCAPS, '`', 0x00ac, WCH_NONE, WCH_NONE, 0x00a6}, - { '4', NOCAPS, '4', '$', WCH_NONE, WCH_NONE, 0x20ac}, - { 0, 0, 0, 0, 0, 0, 0 } + {VK_OEM_8, NOCAPS, {'`', 0x00ac, WCH_NONE, WCH_NONE, 0xa6} }, + { '4', NOCAPS, {'4', '$', WCH_NONE, WCH_NONE, 0x20ac} }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { /* Normal, Shifted, Ctrl, Sh-Ctrl,Sh-Alt,Ctl-Alt,Ctl-Sh-Alt */ - { 'E', CAPS, 'e', 'E', WCH_NONE, WCH_NONE, 0x00e9, 0x00c9}, - { 'U', CAPS, 'u', 'U', WCH_NONE, WCH_NONE, 0x00fa, 0x00da}, - { 'I', CAPS, 'i', 'I', WCH_NONE, WCH_NONE, 0x00ed, 0x00cd}, - { 'O', CAPS, 'o', 'O', WCH_NONE, WCH_NONE, 0x00f3, 0x00d3}, - { 'A', CAPS, 'a', 'A', WCH_NONE, WCH_NONE, 0x00e1, 0x00c1}, + { 'E', CAPS, {'e', 'E', WCH_NONE, WCH_NONE, 0x00e9, 0x00c9} }, + { 'U', CAPS, {'u', 'U', WCH_NONE, WCH_NONE, 0x00fa, 0x00da} }, + { 'I', CAPS, {'i', 'I', WCH_NONE, WCH_NONE, 0x00ed, 0x00cd} }, + { 'O', CAPS, {'o', 'O', WCH_NONE, WCH_NONE, 0x00f3, 0x00d3} }, + { 'A', CAPS, {'a', 'A', WCH_NONE, WCH_NONE, 0x00e1, 0x00c1} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, '.' }, - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, - { VK_BACK, 0, '\010' }, - { 0, 0, 0 } + { VK_DECIMAL, 0, {'.'} }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_BACK, 0, {'\010'} }, + { 0, 0 } }; #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } @@ -385,7 +342,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, _____ Deleted: trunk/reactos/lib/kbdus/Jamfile --- trunk/reactos/lib/kbdus/Jamfile 2005-06-20 13:17:21 UTC (rev 16146) +++ trunk/reactos/lib/kbdus/Jamfile 2005-06-20 13:43:05 UTC (rev 16147) @@ -1,15 +0,0 @@ -SubDir ROS_TOP lib kbdus ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - -SRCS = kbdus - -SharedLibrary kbdus : $(SRCS) ; -LINKLIBS = ; _____ Modified: trunk/reactos/lib/kbdus/kbdus.c --- trunk/reactos/lib/kbdus/kbdus.c 2005-06-20 13:17:21 UTC (rev 16146) +++ trunk/reactos/lib/kbdus/kbdus.c 2005-06-20 13:43:05 UTC (rev 16147) @@ -13,9 +13,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -28,47 +32,6 @@ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -158,13 +121,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[4]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */ @@ -176,98 +133,98 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { '1', NOCAPS, '1', '!' }, + { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ - { '3', NOCAPS, '3', '#' }, - { '4', NOCAPS, '4', '$' }, - { '5', NOCAPS, '5', '%' }, + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, /* Ctrl-6 generates RS */ - { '7', NOCAPS, '7', '&' }, - { '8', NOCAPS, '8', '*' }, - { '9', NOCAPS, '9', '(' }, - { '0', NOCAPS, '0', ')' }, + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, /* First letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'W', CAPS, 'w', 'W' }, - { 'E', CAPS, 'e', 'E' }, - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'E', CAPS, {'e', 'E'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, + { 'A', CAPS, {'a', 'A'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, /* Third letter row */ - { 'Z', CAPS, 'z', 'Z' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, - { 'M', CAPS, 'm', 'M' }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'M', CAPS, {'m', 'M'} }, /* Specials */ /* Ctrl-_ generates US */ - { VK_OEM_PLUS ,NOCAPS, '=', '+' }, - { VK_OEM_1 ,NOCAPS, ';', ':' }, - { VK_OEM_7 ,NOCAPS, '\'','\"'}, - { VK_OEM_3 ,NOCAPS, '`', '~' }, - { VK_OEM_COMMA ,NOCAPS, ',', '<' }, - { VK_OEM_PERIOD ,NOCAPS, '.', '>' }, - { VK_OEM_2 ,NOCAPS, '/', '?' }, + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, /* Keys that do not have shift states */ - { VK_TAB ,NOCAPS, '\t','\t'}, - { VK_ADD ,NOCAPS, '+', '+' }, - { VK_SUBTRACT,NOCAPS, '-', '-' }, - { VK_MULTIPLY,NOCAPS, '*', '*' }, - { VK_DIVIDE ,NOCAPS, '/', '/' }, - { VK_ESCAPE ,NOCAPS, '\x1b','\x1b' }, - { VK_SPACE ,NOCAPS, ' ', ' ' }, + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, 0, '[', '{', 0x1b /* ESC */ }, - { VK_OEM_6, 0, ']', '}', 0x1d /* GS */ }, - { VK_OEM_5, 0, '\\','|', 0x1c /* FS */ }, - { VK_RETURN,0, '\r', '\r', '\n' }, + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ /* Legacy Ascii generators */ - { '2', NOCAPS, '2', '@', WCH_NONE, 0 }, - { '6', NOCAPS, '6', '^', WCH_NONE, 0x1e /* RS */ }, - { VK_OEM_MINUS, NOCAPS, '-', '_', WCH_NONE, 0x1f /* US */ }, + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, - { VK_DECIMAL, 0, '.' }, - { VK_BACK, 0, '\010' }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, { 0,0 } }; @@ -366,7 +323,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table,

19 years, 6 months

[navaraf] 16146: Fix warnings.

by navaraf＠svn.reactos.com

Fix warnings. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/defaults.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/rtsock.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-06-20 13:17:21 UTC (rev 16146) @@ -129,7 +129,7 @@ int __cdecl vprintf(const char *, va_list); #define log bsd_log -static int bsd_log ( int blah, const char* fmt, ... ) +static __inline int bsd_log ( int blah, const char* fmt, ... ) { va_list arg; int i; _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h --- trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h 2005-06-20 13:17:21 UTC (rev 16146) @@ -1,18 +1,16 @@ #ifndef _OSKITFREEBSD_H #define _OSKITFREEBSD_H +#include <ddk/ntddk.h> + #ifdef linux #include <netinet/in.h> #endif extern void oskittcp_die(const char *file, int line); -#ifdef _MSC_VER -#define DbgPrint printf -#define DbgVPrint vprintf -#else//_MSC_VER #define printf DbgPrint -#endif//_MSC_VER +#define vprintf DbgVPrint #define ovbcopy(x,y,z) bcopy(x,y,z) void *memset( void *dest, int c, size_t count ); #define bzero(x,y) memset(x,0,y) @@ -22,14 +20,14 @@ { va_list arg; va_start(arg, fmt); - DbgPrint ( "oskit PANIC: " ); - DbgVPrint ( fmt, arg ); + printf ( "oskit PANIC: " ); + vprintf ( fmt, arg ); va_end(arg); // TODO FIXME - print stack trace... oskittcp_die("<unknown file>",-1); } #else//_MSC_VER -#define panic(...) do { DbgPrint(__VA_ARGS__); \ +#define panic(...) do { printf(__VA_ARGS__); \ oskittcp_die(__FILE__,__LINE__); } while(0) #endif//_MSC_VER #define kmem_malloc(x,y,z) malloc(y) _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/defaults.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/defaults.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/defaults.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -189,27 +189,8 @@ return (error); } -/* ---------------------------------------------------------------------- */ -/* - * normally, this is a builtin function in gcc - * net/if.c doesn't seem to get it, though - */ -static int -memcmp(const void *s1v, const void *s2v, size_t size) -{ - register const char *s1 = s1v, *s2 = s2v; - register unsigned int a, b; - - while (size-- > 0) { - if ((a = *s1++) != (b = *s2++)) - return (a-b); - } - - return 0; -} - int bcmp(const void *b1, const void *b2, size_t len) { - return memcmp(b1, b2, len); + return RtlCompareMemory(b1, b2, len); } _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/in.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/in.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -56,7 +56,9 @@ * This structure is used to keep track of in_multi chains which belong to * deleted interface addresses. */ +#ifndef __REACTOS__ static LIST_HEAD(in_mk_type, multi_kludge) in_mk; /* XXX BSS initialization */ +#endif struct multi_kludge { LIST_ENTRY(multi_kludge) mk_entry; _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -56,6 +56,8 @@ #include <netinet/in_var.h> #include <netinet/ip_var.h> +#include <oskittcp.h> + struct in_addr zeroin_addr; int @@ -89,10 +91,14 @@ struct inpcbhead *head = inp->inp_pcbinfo->listhead; unsigned short *lastport = &inp->inp_pcbinfo->lastport; struct sockaddr_in *sin; +#ifndef __REACTOS__ struct proc *p = curproc; /* XXX */ +#endif u_short lport = 0; int wild = 0, reuseport = (so->so_options & SO_REUSEPORT); +#ifndef __REACTOS__ int error; +#endif OS_DbgPrint(OSK_MID_TRACE,("Called\n")); @@ -208,7 +214,9 @@ struct sockaddr_in **plocal_sin; { struct in_ifaddr *ia; +#ifndef __REACTOS__ struct sockaddr_in *ifaddr = 0; +#endif register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *); OS_DbgPrint(OSK_MID_TRACE,("Called\n")); @@ -339,7 +347,7 @@ /* * Call inner routine, to assign local interface address. */ - if (error = in_pcbladdr(inp, nam, &ifaddr)) + if ((error = in_pcbladdr(inp, nam, &ifaddr))) return(error); if (in_pcblookuphash(inp->inp_pcbinfo, sin->sin_addr, sin->sin_port, _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -1,5 +1,7 @@ #include <oskittcp.h> #include <oskitdebug.h> +#include <net/raw_cb.h> + #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> @@ -14,10 +16,6 @@ #include <sys/socketvar.h> #include <sys/uio.h> -#ifdef WIN32 -#define snprintf _snprintf -#endif//WIN32 - struct linker_set domain_set; OSKITTCP_EVENT_HANDLERS OtcpEvent = { 0 }; @@ -31,6 +29,10 @@ unsigned volatile ipending; struct timeval boottime; +void clock_init(); +int isprint(int c); +int _snprintf(char * buf, size_t cnt, const char *fmt, ...); + void *fbsd_malloc( unsigned int bytes, ... ) { if( !OtcpEvent.TCPMalloc ) panic("no malloc"); return OtcpEvent.TCPMalloc @@ -51,8 +53,6 @@ raw_init(); OS_DbgPrint(OSK_MID_TRACE,("Route Init\n")); route_init(); - OS_DbgPrint(OSK_MID_TRACE,("Init fake freebsd scheduling\n")); - init_freebsd_sched(); OS_DbgPrint(OSK_MID_TRACE,("Init clock\n")); clock_init(); OS_DbgPrint(OSK_MID_TRACE,("Init TCP\n")); @@ -92,7 +92,7 @@ if ( !align ) { if ( i ) DbgPrint( line ); - snprintf ( line, sizeof(line)-1, "%08x: \n", &Data[i] ); + _snprintf ( line, sizeof(line)-1, "%08x: \n", &Data[i] ); line[sizeof(line)-1] = '\0'; } @@ -133,12 +133,10 @@ OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT Flags ) { - char *output_ptr = Data; struct uio uio = { 0 }; struct iovec iov = { 0 }; int error = 0; int tcp_flags = 0; - int tocopy = 0; *OutLen = 0; @@ -167,33 +165,11 @@ return error; } -static int -getsockaddr(namp, uaddr, len) -/* [<][>][^][v][top][bottom][index][help] */ - struct sockaddr **namp; -caddr_t uaddr; -size_t len; -{ - struct sockaddr *sa; - int error; - - if (len > SOCK_MAXADDRLEN) - return ENAMETOOLONG; - MALLOC(sa, struct sockaddr *, len, M_SONAME, M_WAITOK); - error = copyin(uaddr, sa, len); - if (error) { - FREE(sa, M_SONAME); - } else { - *namp = sa; - } - return error; -} - int OskitTCPBind( void *socket, void *connection, void *nam, OSK_UINT namelen ) { int error = EFAULT; struct socket *so = socket; - struct mbuf sabuf = { 0 }; + struct mbuf sabuf; struct sockaddr addr; OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); @@ -201,6 +177,7 @@ if( nam ) addr = *((struct sockaddr *)nam); + RtlZeroMemory(&sabuf, sizeof(sabuf)); sabuf.m_data = (void *)&addr; sabuf.m_len = sizeof(addr); @@ -216,11 +193,8 @@ int OskitTCPConnect( void *socket, void *connection, void *nam, OSK_UINT namelen ) { struct socket *so = socket; - struct connect_args _uap = { - 0, nam, namelen - }, *uap = &_uap; - int error = EFAULT, s; - struct mbuf sabuf = { 0 }; + int error = EFAULT; + struct mbuf sabuf; struct sockaddr addr; OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); @@ -236,6 +210,7 @@ if( nam ) addr = *((struct sockaddr *)nam); + RtlZeroMemory(&sabuf, sizeof(sabuf)); sabuf.m_data = (void *)&addr; sabuf.m_len = sizeof(addr); @@ -264,7 +239,6 @@ } int OskitTCPShutdown( void *socket, int disconn_type ) { - struct socket *so = socket; return soshutdown( socket, disconn_type ); } _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -63,8 +63,10 @@ u_short ip_id; static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *)); +#ifndef __REACTOS__ static void ip_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in *)); +#endif /* * IP output. The packet in mbuf chain m contains a skeletal IP @@ -81,7 +83,9 @@ struct ip_moptions *imo; { register struct ip *ip, *mhip; +#ifndef __REACTOS__ register struct ifnet *ifp; +#endif register struct mbuf *m = m0; register int hlen = sizeof (struct ip); int len, off, error = 0; @@ -340,8 +344,8 @@ m->m_flags &= ~M_BCAST; #endif +#ifndef __REACTOS__ sendit: -#ifndef __REACTOS__ /* * Check with the firewall... */ @@ -382,6 +386,7 @@ */ if (ip->ip_off & IP_DF) { error = EMSGSIZE; +#ifndef __REACTOS__ #if 1 /* * This case can happen if the user changed the MTU @@ -396,6 +401,7 @@ ro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu; } #endif +#endif ipstat.ips_cantfrag++; goto bad; } @@ -509,8 +515,9 @@ ipstat.ips_fragmented++; } done: - if (ro == &iproute && (flags & IP_ROUTETOIF) == 0 && ro->ro_rt) + if (ro == &iproute && (flags & IP_ROUTETOIF) == 0 && ro->ro_rt) { RTFREE(ro->ro_rt); + } return (error); bad: @@ -773,7 +780,7 @@ struct mbuf **pcbopt; register struct mbuf *m; { - register cnt, optlen; + register int cnt, optlen; register u_char *cp; u_char opt; @@ -875,15 +882,19 @@ struct mbuf *m; { register int error = 0; +#ifndef __REACTOS__ u_char loop; register int i; struct in_addr addr; register struct ip_mreq *mreq; register struct ifnet *ifp; +#endif register struct ip_moptions *imo = *imop; +#ifndef __REACTOS__ struct route ro; register struct sockaddr_in *dst; int s; +#endif if (imo == NULL) { /* @@ -1149,10 +1160,12 @@ register struct ip_moptions *imo; register struct mbuf **mp; { +#ifndef __REACTOS__ u_char *ttl; u_char *loop; struct in_addr *addr; struct in_ifaddr *ia; +#endif *mp = m_get(M_WAIT, MT_SOOPTS); _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -156,7 +156,9 @@ { register struct ip *ip; register struct inpcb *inp = sotoinpcb(so); +#ifndef __REACTOS__ struct mbuf *opts; +#endif int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; /* _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -365,7 +365,9 @@ #define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#ifndef __REACTOS__ static int rt_fixdelete(struct radix_node *, void *); +#endif static int rt_fixchange(struct radix_node *, void *); struct rtfc_arg { @@ -385,7 +387,9 @@ register struct radix_node_head *rnh; struct ifaddr *ifa; struct sockaddr *ndst; +#ifndef __REACTOS__ u_long prflags = 0UL; +#endif #define senderr(x) { error = x ; goto bad; } if ((rnh = rt_tables[dst->sa_family]) == 0) @@ -561,6 +565,7 @@ * rnh->rnh_walktree_from() above, and those that actually are children of * the late parent (passed in as VP here) are themselves deleted. */ +#ifndef __REACTOS__ static int rt_fixdelete(struct radix_node *rn, void *vp) { @@ -574,6 +579,7 @@ } return 0; } +#endif /* * This routine is called from rt_setgate() to do the analogous thing for _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/rtsock.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/rtsock.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/rtsock.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -206,8 +206,8 @@ case RTM_LOCK: if ((rnh = rt_tables[dst->sa_family]) == 0) { senderr(EAFNOSUPPORT); - } else if (rt = (struct rtentry *) - rnh->rnh_lookup(dst, netmask, rnh)) + } else if ((rt = (struct rtentry *) + rnh->rnh_lookup(dst, netmask, rnh))) rt->rt_refcnt++; else senderr(ESRCH); _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -83,8 +83,10 @@ struct tcpiphdr *ti; int req; { +#ifdef TCPDEBUG tcp_seq seq, ack; int len, flags; +#endif struct tcp_debug *td = &tcp_debug[tcp_debx++]; if (tcp_debx == TCP_NDEBUG) _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -516,7 +516,7 @@ * if the segment has a CC option equal to CCrecv */ ((tp->t_flags & (TF_REQ_CC|TF_RCVD_CC)) != (TF_REQ_CC|TF_RCVD_CC) || - (to.to_flag & TOF_CC) != 0 && to.to_cc == tp->cc_recv) && + ((to.to_flag & TOF_CC) != 0 && to.to_cc == tp->cc_recv)) && ti->ti_seq == tp->rcv_nxt && tiwin && tiwin == tp->snd_wnd && tp->snd_nxt == tp->snd_max) { _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -780,7 +780,7 @@ tcp_setpersist(tp) register struct tcpcb *tp; { - register t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1; + register int t = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1; if (tp->t_timer[TCPT_REXMT]) panic("tcp_output REXMT"); _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -101,7 +101,9 @@ register int ncl; int nowait; { +#ifndef __REACTOS__ static int logged; +#endif register caddr_t p; register int i; int npg; @@ -456,7 +458,7 @@ { register int len = req_len; register struct mbuf *m; - register count; + register int count; if ((m = mp) == NULL) return; _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c 2005-06-20 12:10:46 UTC (rev 16145) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c 2005-06-20 13:17:21 UTC (rev 16146) @@ -71,7 +71,9 @@ register int type; int proto; { +#ifndef __REACTOS__ struct proc *p = curproc; /* XXX */ +#endif register struct protosw *prp; register struct socket *so; register int error; @@ -335,7 +337,9 @@ struct mbuf *control; int flags; { +#ifndef __REACTOS__ struct proc *p = curproc; /* XXX */ +#endif struct mbuf **mp; register struct mbuf *m; register long space, len, resid;

19 years, 6 months

[navaraf] 16145: The DK directory doesn't seem to be used anymore.

by navaraf＠svn.reactos.com

The DK directory doesn't seem to be used anymore. Deleted: trunk/reactos/dk/

19 years, 6 months

[navaraf] 16144: Compile CSRSS and WIN32CSR with NDK headers.

by navaraf＠svn.reactos.com

Compile CSRSS and WIN32CSR with NDK headers. Modified: trunk/reactos/subsys/csrss/api/handle.c Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/api/user.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/csrss/print.c Modified: trunk/reactos/subsys/csrss/video.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c _____ Modified: trunk/reactos/subsys/csrss/api/handle.c --- trunk/reactos/subsys/csrss/api/handle.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/api/handle.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -9,9 +9,10 @@ /* INCLUDES ******************************************************************/ -#include <csrss/csrss.h> -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include "api.h" #define NDEBUG _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/api/process.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -9,9 +9,10 @@ /* INCLUDES ******************************************************************/ -#include <csrss/csrss.h> -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #include "api.h" #include "conio.h" _____ Modified: trunk/reactos/subsys/csrss/api/user.c --- trunk/reactos/subsys/csrss/api/user.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/api/user.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -9,11 +9,11 @@ /* INCLUDES ******************************************************************/ -#include <ddk/ntddk.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> -#include <csrss/csrss.h> #include "api.h" -#include <ntdll/rtl.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -10,18 +10,16 @@ /* INCLUDES ******************************************************************/ +#include <windows.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <csrss/csrss.h> -#include <ddk/ntddk.h> +#include <ndk/ntndk.h> +#include <rosrtl/thread.h> +#include "api.h" - #define NDEBUG #include <debug.h> -#include "api.h" - /* GLOBALS *******************************************************************/ HANDLE CsrssApiHeap = (HANDLE) 0; _____ Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/csrss.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -31,8 +31,10 @@ * First standalone run under ReactOS (it * actually does nothing but running). */ -#include <ddk/ntddk.h> -#include <ntdll/rtl.h> + +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <csrss/csrss.h> #include <rosrtl/string.h> #include <reactos/buildno.h> _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/include/api.h 2005-06-20 11:56:10 UTC (rev 16144) @@ -9,7 +9,8 @@ #ifndef API_H_INCLUDED #define API_H_INCLUDED -#include <ntos.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <csrss/csrss.h> _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/init.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -10,12 +10,12 @@ /* INCLUDES ******************************************************************/ -#include <csrss/csrss.h> -#include <ddk/ntddk.h> +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <ntdll/csr.h> #include <ntdll/rtl.h> #include <ntdll/ldr.h> -#include <win32k/win32k.h> #include <rosrtl/string.h> #include <sm/helper.h> @@ -423,15 +423,15 @@ if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0])) { WCHAR ImagePath [MAX_PATH + 1] = {0}; - SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo; + UNICODE_STRING ModuleName; wcscpy (ImagePath, L"\\??\\"); wcscat (ImagePath, Data); - RtlZeroMemory (& ImageInfo, sizeof ImageInfo); - RtlInitUnicodeString (& ImageInfo.ModuleName, ImagePath); - Status = NtSetSystemInformation(SystemLoadAndCallImage, - & ImageInfo, - sizeof ImageInfo); + RtlInitUnicodeString (& ModuleName, ImagePath); + Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */ + SystemExtendServiceTableInformation, + & ModuleName, + sizeof ModuleName); if(!NT_SUCCESS(Status)) { DPRINT("WIN: %s: loading Kmode failed (Status=0x%08lx)\n", _____ Modified: trunk/reactos/subsys/csrss/print.c --- trunk/reactos/subsys/csrss/print.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/print.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -27,9 +27,10 @@ * Compiled successfully with egcs 1.1.2 */ +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <csrss/csrss.h> -#include <ddk/ntddk.h> -#include <ntos.h> VOID STDCALL DisplayString(LPCWSTR lpwString) { _____ Modified: trunk/reactos/subsys/csrss/video.c --- trunk/reactos/subsys/csrss/video.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/video.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -4,8 +4,8 @@ */ #include <windows.h> -#include <ddk/ntddk.h> -#include <ddk/ntapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <rosrtl/string.h> ULONG _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -8,15 +8,15 @@ /* INCLUDES ******************************************************************/ -#include <string.h> #include <windows.h> - -#include <csrss/csrss.h> -#include <ntdll/rtl.h> -#include <ntdll/ldr.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <ddk/ntddblue.h> #include <rosrtl/string.h> #include <rosrtl/minmax.h> + +#include <string.h> + #include "api.h" #include "conio.h" #include "desktopbg.h" _____ Modified: trunk/reactos/subsys/csrss/win32csr/desktopbg.c --- trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/win32csr/desktopbg.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -7,20 +7,9 @@ * ReactOS Operating System */ -/* - * There is a problem with size of LPC_MESSAGE structure. In the old ReactOS - * headers it doesn't contain the data field and so it has a different size. - * We must use this workaround to get our Data field 0-sized. - */ - -#include <windef.h> -#include <winnt.h> -#undef ANYSIZE_ARRAY -#define ANYSIZE_ARRAY 0 -#include <ddk/ntapi.h> - #include <windows.h> -#include <csrss/csrss.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include "api.h" #include "desktopbg.h" _____ Modified: trunk/reactos/subsys/csrss/win32csr/exitros.c --- trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-06-20 08:31:48 UTC (rev 16143) +++ trunk/reactos/subsys/csrss/win32csr/exitros.c 2005-06-20 11:56:10 UTC (rev 16144) @@ -9,7 +9,10 @@ /* INCLUDES ******************************************************************/ #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #include <reactos/winlogon.h> + #include "api.h" #include "win32csr.h"

19 years, 6 months

[gvg] 16143: Exclusively lock surface bits before reading or writing them

by gvg＠svn.reactos.com

Exclusively lock surface bits before reading or writing them Modified: trunk/reactos/include/win32k/bitmaps.h Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/copybits.c Modified: trunk/reactos/subsys/win32k/eng/gradient.c Modified: trunk/reactos/subsys/win32k/eng/lineto.c Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/eng/paint.c Modified: trunk/reactos/subsys/win32k/eng/surface.c Modified: trunk/reactos/subsys/win32k/eng/transblt.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/include/tags.h Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/fillshap.c Modified: trunk/reactos/subsys/win32k/objects/line.c Modified: trunk/reactos/subsys/win32k/objects/polyfill.c Modified: trunk/reactos/subsys/win32k/objects/region.c Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/include/win32k/bitmaps.h --- trunk/reactos/include/win32k/bitmaps.h 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/include/win32k/bitmaps.h 2005-06-20 08:31:48 UTC (rev 16143) @@ -11,10 +11,12 @@ 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 */ + SIZE dimension; /* For SetBitmapDimension(), do NOT use + to get width/height of bitmap, use + bitmap.bmWidth/bitmap.bmHeight for + that */ + PFAST_MUTEX BitsLock; /* You need to hold this lock before you touch + the actual bits in the bitmap */ /* For device-independent bitmaps: */ DIBSECTION *dib; @@ -34,6 +36,11 @@ #define BITMAPOBJ_UnlockBitmap(pBMObj) EngUnlockSurface(&pBMObj->SurfObj) BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody); +BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj); +#define BITMAPOBJ_LockBitmapBits(pBMObj) ExAcquireFastMutex((pBMObj)->BitsLock) +#define BITMAPOBJ_UnlockBitmapBits(pBMObj) ExReleaseFastMutex((pBMObj)->BitsLock) +void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); + INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -526,30 +526,30 @@ } BOOL STDCALL -IntEngBitBlt(BITMAPOBJ *DestObj, - BITMAPOBJ *SourceObj, - BITMAPOBJ *MaskObj, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *Brush, - POINTL *BrushOrigin, - ROP4 Rop4) +IntEngBitBltEx(SURFOBJ *DestSurf, + SURFOBJ *SourceSurf, + SURFOBJ *MaskSurf, + CLIPOBJ *ClipRegion, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint, + POINTL *MaskOrigin, + BRUSHOBJ *Brush, + POINTL *BrushOrigin, + ROP4 Rop4, + BOOL RemoveMouse) { BOOLEAN ret; RECTL InputClippedRect; RECTL OutputRect; POINTL InputPoint; BOOLEAN UsesSource; - SURFOBJ *DestSurf; - SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL; - SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj = NULL; + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); ASSERT(DestObj); - DestSurf = &DestObj->SurfObj; - ASSERT(DestSurf); InputClippedRect = *DestRect; if (InputClippedRect.right < InputClippedRect.left) @@ -623,17 +623,27 @@ OutputRect = InputClippedRect; } - if (UsesSource) + if (RemoveMouse) { - MouseSafetyOnDrawStart(SourceSurf, InputPoint.x, InputPoint.y, - (InputPoint.x + abs(DestRect->right - DestRect->left)), - (InputPoint.y + abs(DestRect->bottom - DestRect->top))); + BITMAPOBJ_LockBitmapBits(DestObj); + + if (UsesSource) + { + if (SourceSurf != DestSurf) + { + SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); + BITMAPOBJ_LockBitmapBits(SourceObj); + } + MouseSafetyOnDrawStart(SourceSurf, InputPoint.x, InputPoint.y, + (InputPoint.x + abs(DestRect->right - DestRect->left)), + (InputPoint.y + abs(DestRect->bottom - DestRect->top))); + } + MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, + OutputRect.right, OutputRect.bottom); } /* No success yet */ ret = FALSE; - MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); /* Call the driver's DrvBitBlt if available */ if (DestObj->flHooks & HOOK_BITBLT) @@ -651,10 +661,19 @@ Rop4); } - MouseSafetyOnDrawEnd(DestSurf); - if (UsesSource) + if (RemoveMouse) { - MouseSafetyOnDrawEnd(SourceSurf); + MouseSafetyOnDrawEnd(DestSurf); + if (UsesSource) + { + MouseSafetyOnDrawEnd(SourceSurf); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_UnlockBitmapBits(SourceObj); + } + } + + BITMAPOBJ_UnlockBitmapBits(DestObj); } return ret; @@ -786,9 +805,9 @@ } BOOL STDCALL -IntEngStretchBlt(BITMAPOBJ *DestObj, - BITMAPOBJ *SourceObj, - BITMAPOBJ *MaskObj, +IntEngStretchBlt(SURFOBJ *DestSurf, + SURFOBJ *SourceSurf, + SURFOBJ *MaskSurf, CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, RECTL *DestRect, @@ -801,32 +820,37 @@ BOOLEAN ret; COLORADJUSTMENT ca; POINT MaskOrigin; - SURFOBJ *DestSurf; - SURFOBJ *SourceSurf = SourceObj ? &SourceObj->SurfObj : NULL; - SURFOBJ *MaskSurf = MaskObj ? &MaskObj->SurfObj : NULL; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj = NULL; + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); ASSERT(DestObj); - DestSurf = &DestObj->SurfObj; - ASSERT(DestSurf); if (pMaskOrigin != NULL) { MaskOrigin.x = pMaskOrigin->x; MaskOrigin.y = pMaskOrigin->y; } + /* No success yet */ + ret = FALSE; + ASSERT(DestRect); + BITMAPOBJ_LockBitmapBits(DestObj); + MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top, + DestRect->right, DestRect->bottom); + if (NULL != SourceSurf) { + SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); ASSERT(SourceRect); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_LockBitmapBits(SourceObj); + } MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); } - /* No success yet */ - ret = FALSE; - ASSERT(DestRect); - MouseSafetyOnDrawStart(DestSurf, DestRect->left, DestRect->top, - DestRect->right, DestRect->bottom); - /* Prepare color adjustment */ /* Call the driver's DrvStretchBlt if available */ @@ -847,11 +871,16 @@ &ca, BrushOrigin, DestRect, SourceRect, NULL, Mode); } - MouseSafetyOnDrawEnd(DestSurf); if (NULL != SourceSurf) { MouseSafetyOnDrawEnd(SourceSurf); + if (SourceSurf != DestSurf) + { + BITMAPOBJ_UnlockBitmapBits(SourceObj); + } } + MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); return ret; } @@ -1147,7 +1176,7 @@ } BOOL STDCALL -IntEngMaskBlt(SURFOBJ *DestObj, +IntEngMaskBlt(SURFOBJ *DestSurf, SURFOBJ *Mask, CLIPOBJ *ClipRegion, XLATEOBJ *DestColorTranslation, @@ -1161,6 +1190,7 @@ BOOLEAN ret; RECTL OutputRect; POINTL InputPoint; + BITMAPOBJ *DestObj; ASSERT(Mask); @@ -1187,26 +1217,30 @@ /* No success yet */ ret = FALSE; - ASSERT(DestObj); - MouseSafetyOnDrawStart(DestObj, OutputRect.left, OutputRect.top, + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + + BITMAPOBJ_LockBitmapBits(DestObj); + MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, OutputRect.right, OutputRect.bottom); /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, but the VMware driver doesn't hook that call. */ - /* FIXME: Remove the typecast! */ - IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation, - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, R4_NOOP); + IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, + R4_NOOP, FALSE); - ret = EngMaskBitBlt(DestObj, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation, + ret = EngMaskBitBlt(DestSurf, Mask, ClipRegion, DestColorTranslation, SourceColorTranslation, &OutputRect, &InputPoint, MaskOrigin, Brush, BrushOrigin); /* Dummy BitBlt to let driver know that something has changed. */ - /* FIXME: Remove the typecast! */ - IntEngBitBlt((BITMAPOBJ*)DestObj, NULL, (BITMAPOBJ*)Mask, ClipRegion, DestColorTranslation, - DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, R4_NOOP); + IntEngBitBltEx(DestSurf, NULL, Mask, ClipRegion, DestColorTranslation, + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, + R4_NOOP, FALSE); - MouseSafetyOnDrawEnd(DestObj); + MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); return ret; } _____ Modified: trunk/reactos/subsys/win32k/eng/copybits.c --- trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI EngCopyBits Function @@ -44,12 +43,21 @@ RECT_ENUM RectEnum; BOOL EnumMore; BLTINFO BltInfo; + BITMAPOBJ *DestObj = NULL; + BITMAPOBJ *SourceObj; ASSERT(Dest != NULL && Source != NULL && DestRect != NULL && SourcePoint != NULL); + SourceObj = CONTAINING_RECORD(Source, BITMAPOBJ, SurfObj); + BITMAPOBJ_LockBitmapBits(SourceObj); MouseSafetyOnDrawStart(Source, SourcePoint->x, SourcePoint->y, (SourcePoint->x + abs(DestRect->right - DestRect->left)), (SourcePoint->y + abs(DestRect->bottom - DestRect->top))); + if (Dest != Source) + { + DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); + BITMAPOBJ_LockBitmapBits(DestObj); + } MouseSafetyOnDrawStart(Dest, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); // FIXME: Don't punt to the driver's DrvCopyBits immediately. Instead, @@ -71,7 +79,12 @@ Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return ret; } @@ -88,20 +101,29 @@ Dest, Source, Clip, ColorTranslation, DestRect, SourcePoint); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return ret; } } // If CopyBits wasn't hooked, BitBlt must be - /* FIXME: Remove the typecast! */ - ret = IntEngBitBlt((BITMAPOBJ*)Dest, (BITMAPOBJ*)Source, + ret = IntEngBitBlt(Dest, Source, NULL, Clip, ColorTranslation, DestRect, SourcePoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return ret; } @@ -130,7 +152,12 @@ DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBltSrcCopy(&BltI nfo); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return(TRUE); @@ -144,7 +171,12 @@ DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_BitBltSrcCopy(&BltI nfo); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return(TRUE); @@ -177,13 +209,23 @@ } while(EnumMore); MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return(TRUE); } MouseSafetyOnDrawEnd(Dest); + if (Dest != Source) + { + BITMAPOBJ_UnlockBitmapBits(DestObj); + } MouseSafetyOnDrawEnd(Source); + BITMAPOBJ_UnlockBitmapBits(SourceObj); return FALSE; } _____ Modified: trunk/reactos/subsys/win32k/eng/gradient.c --- trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -516,7 +516,7 @@ BOOL STDCALL IntEngGradientFill( - IN BITMAPOBJ *pboDest, + IN SURFOBJ *psoDest, IN CLIPOBJ *pco, IN XLATEOBJ *pxlo, IN TRIVERTEX *pVertex, @@ -528,13 +528,14 @@ IN ULONG ulMode) { BOOL Ret; - SURFOBJ *psoDest; - ASSERT(pboDest); + BITMAPOBJ *pboDest; + ASSERT(psoDest); ASSERT(pco); - psoDest = &pboDest->SurfObj; - ASSERT(psoDest); + pboDest = CONTAINING_RECORD(psoDest, BITMAPOBJ, SurfObj); + ASSERT(pboDest); + BITMAPOBJ_LockBitmapBits(pboDest); MouseSafetyOnDrawStart( psoDest, pco->rclBounds.left, @@ -552,5 +553,7 @@ Ret = EngGradientFill(psoDest, pco, pxlo, pVertex, nVertex, pMesh, nMesh, prclExtents, pptlDitherOrg, ulMode); MouseSafetyOnDrawEnd(psoDest); + BITMAPOBJ_UnlockBitmapBits(pboDest); + return Ret; } _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -485,7 +485,7 @@ } BOOL STDCALL -IntEngLineTo(BITMAPOBJ *DestObj, +IntEngLineTo(SURFOBJ *DestSurf, CLIPOBJ *ClipObj, BRUSHOBJ *Brush, LONG x1, @@ -496,13 +496,13 @@ MIX Mix) { BOOLEAN ret; - SURFOBJ *DestSurf; + BITMAPOBJ *DestObj; PGDIBRUSHINST GdiBrush; RECTL b; + ASSERT(DestSurf); + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); ASSERT(DestObj); - DestSurf = &DestObj->SurfObj; - ASSERT(DestSurf); GdiBrush = CONTAINING_RECORD( Brush, @@ -543,6 +543,8 @@ b.bottom = max(y1, y2); if (b.left == b.right) b.right++; if (b.top == b.bottom) b.bottom++; + + BITMAPOBJ_LockBitmapBits(DestObj); MouseSafetyOnDrawStart(DestSurf, x1, y1, x2, y2); if (DestObj->flHooks & HOOK_LINETO) @@ -565,12 +567,13 @@ } MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); return ret; } BOOL STDCALL -IntEngPolyline(BITMAPOBJ *DestObj, +IntEngPolyline(SURFOBJ *DestSurf, CLIPOBJ *Clip, BRUSHOBJ *Brush, CONST LPPOINT pt, @@ -588,7 +591,7 @@ rect.top = min(pt[i-1].y, pt[i].y); rect.right = max(pt[i-1].x, pt[i].x); rect.bottom = max(pt[i-1].y, pt[i].y); - ret = IntEngLineTo(DestObj, + ret = IntEngLineTo(DestSurf, Clip, Brush, pt[i-1].x, _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -177,8 +177,9 @@ { if((MaskSurface = EngLockSurface(pgp->MaskSurface))) { - EngBitBlt(DestSurface, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); + IntEngBitBltEx(DestSurface, SaveSurface, MaskSurface, NULL, NULL, + &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); EngUnlockSurface(MaskSurface); } EngUnlockSurface(SaveSurface); @@ -230,8 +231,9 @@ pgp->Size.cy, DestSurface->sizlBitmap.cy - pt.y); - EngBitBlt(SaveSurface, DestSurface, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY)); + IntEngBitBltEx(SaveSurface, DestSurface, NULL, NULL, NULL, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); EngUnlockSurface(SaveSurface); } @@ -266,18 +268,21 @@ { if((ColorSurf = EngLockSurface(pgp->ColorSurface))) { - EngBitBlt(DestSurface, ColorSurf, MaskSurf, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, R4_MASK); + IntEngBitBltEx(DestSurface, ColorSurf, MaskSurf, NULL, + pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, + NULL, NULL, R4_MASK, FALSE); EngUnlockSurface(ColorSurf); } } else { - EngBitBlt(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCAND)); + IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCAND), FALSE); SrcPoint.y += pgp->Size.cy; - EngBitBlt(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, ROP3_TO_ROP4(SRCINVERT)); + IntEngBitBltEx(DestSurface, MaskSurf, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCINVERT), FALSE); } EngUnlockSurface(MaskSurf); } @@ -523,4 +528,25 @@ } +VOID STDCALL +IntEngMovePointer( + IN SURFOBJ *SurfObj, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + BITMAPOBJ *BitmapObj = CONTAINING_RECORD(SurfObj, BITMAPOBJ, SurfObj); + + BITMAPOBJ_LockBitmapBits(BitmapObj); + if (GDIDEV(SurfObj)->Pointer.MovePointer) + { + GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, x, y, prcl); + } + else + { + EngMovePointer(SurfObj, x, y, prcl); + } + BITMAPOBJ_UnlockBitmapBits(BitmapObj); +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/eng/paint.c --- trunk/reactos/subsys/win32k/eng/paint.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/paint.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -33,9 +33,12 @@ { LONG y; ULONG LineWidth; + BITMAPOBJ *BitmapObj; ASSERT ( Surface ); ASSERT ( pRect ); + BitmapObj = CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); + BITMAPOBJ_LockBitmapBits(BitmapObj); MouseSafetyOnDrawStart(Surface, pRect->left, pRect->top, pRect->right, pRect->bottom); LineWidth = pRect->right - pRect->left; DPRINT(" LineWidth: %d, top: %d, bottom: %d\n", LineWidth, pRect->top, pRect->bottom); @@ -45,6 +48,7 @@ Surface, pRect->left, pRect->right, y, iColor); } MouseSafetyOnDrawEnd(Surface); + BITMAPOBJ_UnlockBitmapBits(BitmapObj); return TRUE; } @@ -111,13 +115,13 @@ } BOOL STDCALL -IntEngPaint(IN BITMAPOBJ *BitmapObj, +IntEngPaint(IN SURFOBJ *Surface, IN CLIPOBJ *ClipRegion, IN BRUSHOBJ *Brush, IN POINTL *BrushOrigin, IN MIX Mix) { - SURFOBJ *Surface = &BitmapObj->SurfObj; + BITMAPOBJ *BitmapObj = CONTAINING_RECORD(Surface, BITMAPOBJ, SurfObj); BOOL ret; DPRINT("SurfGDI type: %d\n", Surface->iType); @@ -125,6 +129,7 @@ if((Surface->iType!=STYPE_BITMAP) && (BitmapObj->flHooks & HOOK_PAINT)) { // Call the driver's DrvPaint + BITMAPOBJ_LockBitmapBits(BitmapObj); MouseSafetyOnDrawStart(Surface, ClipRegion->rclBounds.left, ClipRegion->rclBounds.top, ClipRegion->rclBounds.right, ClipRegion->rclBounds.bottom); @@ -132,6 +137,7 @@ ret = GDIDEVFUNCS(Surface).Paint( Surface, ClipRegion, Brush, BrushOrigin, Mix); MouseSafetyOnDrawEnd(Surface); + BITMAPOBJ_UnlockBitmapBits(BitmapObj); return ret; } return EngPaint( Surface, ClipRegion, Brush, BrushOrigin, Mix ); _____ Modified: trunk/reactos/subsys/win32k/eng/surface.c --- trunk/reactos/subsys/win32k/eng/surface.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/surface.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -79,6 +79,33 @@ } } +BOOL INTERNAL_CALL +BITMAPOBJ_InitBitsLock(BITMAPOBJ *BitmapObj) +{ + BitmapObj->BitsLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(FAST_MUTEX), + TAG_BITMAPOBJ); + if (NULL == BitmapObj->BitsLock) + { + return FALSE; + } + + ExInitializeFastMutex(BitmapObj->BitsLock); + + return TRUE; +} + +void INTERNAL_CALL +BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *BitmapObj) +{ + if (NULL != BitmapObj->BitsLock) + { + ExFreePoolWithTag(BitmapObj->BitsLock, TAG_BITMAPOBJ); + BitmapObj->BitsLock = NULL; + } +} + + /* * @implemented */ @@ -232,6 +259,12 @@ return 0; BitmapObj = BITMAPOBJ_LockBitmap(NewBitmap); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmap(NewBitmap); + return 0; + } SurfObj = &BitmapObj->SurfObj; if (Format == BMF_4RLE) @@ -357,11 +390,17 @@ if (NewSurface == NULL) return 0; - GDIOBJ_SetOwnership(NewSurface, NULL); - BitmapObj = BITMAPOBJ_LockBitmap(NewSurface); + if (! BITMAPOBJ_InitBitsLock(BitmapObj)) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + BITMAPOBJ_FreeBitmap(NewSurface); + return 0; + } SurfObj = &BitmapObj->SurfObj; + GDIOBJ_SetOwnership(NewSurface, NULL); + SurfObj->dhsurf = dhsurf; SurfObj->hsurf = NewSurface; SurfObj->sizlBitmap = Size; _____ Modified: trunk/reactos/subsys/win32k/eng/transblt.c --- trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -193,8 +193,8 @@ } BOOL FASTCALL -IntEngTransparentBlt(BITMAPOBJ *DestObj, - BITMAPOBJ *SourceObj, +IntEngTransparentBlt(SURFOBJ *DestSurf, + SURFOBJ *SourceSurf, CLIPOBJ *Clip, XLATEOBJ *ColorTranslation, PRECTL DestRect, @@ -204,18 +204,18 @@ { BOOL Ret; RECTL OutputRect, InputClippedRect; - SURFOBJ *DestSurf; - SURFOBJ *SourceSurf; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj; - ASSERT(DestObj); - ASSERT(SourceObj); + ASSERT(DestSurf); + ASSERT(SourceSurf); ASSERT(DestRect); - DestSurf = &DestObj->SurfObj; - SourceSurf = &SourceObj->SurfObj; + DestObj = CONTAINING_RECORD(DestSurf, BITMAPOBJ, SurfObj); + SourceObj = CONTAINING_RECORD(SourceSurf, BITMAPOBJ, SurfObj); - ASSERT(DestSurf); - ASSERT(SourceSurf); + ASSERT(DestObj); + ASSERT(SourceObj); InputClippedRect = *DestRect; if(InputClippedRect.right < InputClippedRect.left) @@ -249,9 +249,11 @@ if(SourceSurf != DestSurf) { + BITMAPOBJ_LockBitmapBits(SourceObj); MouseSafetyOnDrawStart(SourceSurf, SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); } + BITMAPOBJ_LockBitmapBits(DestObj); MouseSafetyOnDrawStart(DestSurf, OutputRect.left, OutputRect.top, OutputRect.right, OutputRect.bottom); @@ -271,9 +273,11 @@ } MouseSafetyOnDrawEnd(DestSurf); + BITMAPOBJ_UnlockBitmapBits(DestObj); if(SourceSurf != DestSurf) { MouseSafetyOnDrawEnd(SourceSurf); + BITMAPOBJ_UnlockBitmapBits(SourceObj); } return Ret; _____ Modified: trunk/reactos/subsys/win32k/include/inteng.h --- trunk/reactos/subsys/win32k/include/inteng.h 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/include/inteng.h 2005-06-20 08:31:48 UTC (rev 16143) @@ -43,7 +43,7 @@ PW32PROCESS Win32Process); BOOL STDCALL -IntEngLineTo(BITMAPOBJ *Surface, +IntEngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush, LONG x1, @@ -54,22 +54,29 @@ MIX mix); BOOL STDCALL -IntEngBitBlt(BITMAPOBJ *DestObj, - BITMAPOBJ *SourceObj, - BITMAPOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskOrigin, - BRUSHOBJ *Brush, - POINTL *BrushOrigin, - ROP4 rop4); +IntEngBitBltEx(SURFOBJ *DestObj, + SURFOBJ *SourceObj, + SURFOBJ *Mask, + CLIPOBJ *ClipRegion, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint, + POINTL *MaskOrigin, + BRUSHOBJ *Brush, + POINTL *BrushOrigin, + ROP4 Rop4, + BOOL RemoveMouse); +#define IntEngBitBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation, \ + DestRect, SourcePoint, MaskOrigin, Brush, BrushOrigin, \ + Rop4) \ + IntEngBitBltEx((DestObj), (SourceObj), (Mask), (ClipRegion), \ + (ColorTranslation), (DestRect), (SourcePoint), \ + (MaskOrigin), (Brush), (BrushOrigin), (Rop4), TRUE) BOOL STDCALL -IntEngStretchBlt(BITMAPOBJ *DestObj, - BITMAPOBJ *SourceObj, - BITMAPOBJ *Mask, +IntEngStretchBlt(SURFOBJ *DestObj, + SURFOBJ *SourceObj, + SURFOBJ *Mask, CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, RECTL *DestRect, @@ -80,7 +87,7 @@ ULONG Mode); BOOL STDCALL -IntEngGradientFill(BITMAPOBJ *psoDest, +IntEngGradientFill(SURFOBJ *psoDest, CLIPOBJ *pco, XLATEOBJ *pxlo, TRIVERTEX *pVertex, @@ -109,7 +116,7 @@ ULONG BackgroundColor); BOOL STDCALL -IntEngPolyline(BITMAPOBJ *DestSurf, +IntEngPolyline(SURFOBJ *DestSurf, CLIPOBJ *Clip, BRUSHOBJ *Brush, CONST LPPOINT pt, @@ -131,8 +138,8 @@ PRECTL Boundary); BOOL FASTCALL -IntEngTransparentBlt(BITMAPOBJ *Dest, - BITMAPOBJ *Source, +IntEngTransparentBlt(SURFOBJ *Dest, + SURFOBJ *Source, CLIPOBJ *Clip, XLATEOBJ *ColorTranslation, PRECTL DestRect, @@ -141,10 +148,17 @@ ULONG Reserved); BOOL STDCALL -IntEngPaint(IN BITMAPOBJ *Surface, +IntEngPaint(IN SURFOBJ *Surface, IN CLIPOBJ *ClipRegion, IN BRUSHOBJ *Brush, IN POINTL *BrushOrigin, IN MIX Mix); +VOID STDCALL +IntEngMovePointer(IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl); + + #endif /* _WIN32K_INTENG_H */ _____ Modified: trunk/reactos/subsys/win32k/include/tags.h --- trunk/reactos/subsys/win32k/include/tags.h 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/include/tags.h 2005-06-20 08:31:48 UTC (rev 16143) @@ -51,6 +51,7 @@ #define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ #define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ #define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ +#define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ /* misc */ #define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -142,10 +142,7 @@ if (NULL != CurInfo->CurrentCursorObject && CurInfo->ShowingCursor) { /* Remove the cursor if it was displayed */ - if (GDIDEV(SurfObj)->Pointer.MovePointer) - GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.Exclude); - else - EngMovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.Exclude); + IntEngMovePointer(SurfObj, -1, -1, &GDIDEV(SurfObj)->Pointer.Exclude); } GDIDEV(SurfObj)->Pointer.Status = SPS_ACCEPT_NOEXCLUDE; @@ -266,7 +263,7 @@ GDIDEV(SurfObj)->Pointer.Pos.y, &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); - GDIDEV(SurfObj)->Pointer.MovePointer = EngMovePointer; + GDIDEV(SurfObj)->Pointer.MovePointer = NULL; } else { _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -959,12 +959,7 @@ { SurfObj = &BitmapObj->SurfObj; - if (GDIDEV(SurfObj)->Pointer.MovePointer) - { - GDIDEV(SurfObj)->Pointer.MovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); - } else { - EngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); - } + IntEngMovePointer(SurfObj, MousePos.x, MousePos.y, &(GDIDEV(SurfObj)->Pointer.Exclude)); /* Only now, update the info in the GDIDEVICE, so EngMovePointer can * use the old values to move the pointer image */ GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-20 07:18:20 UTC (rev 16142) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-20 08:31:48 UTC (rev 16143) @@ -213,8 +213,10 @@ } /* Perform the bitblt operation */ - Status = IntEngBitBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, + Status = IntEngBitBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, + DCDest->CombinedClip, XlateObj, &DestRect, + &SourcePoint, NULL, + BrushObj ? &BrushInst.BrushObject : NULL, &BrushOrigin, ROP3_TO_ROP4(ROP)); if (UsesSource && XlateObj != NULL) @@ -371,7 +373,8 @@ goto done; } - Ret = IntEngTransparentBlt(BitmapDest, BitmapSrc, DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, + Ret = IntEngTransparentBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + DCDest->CombinedClip, XlateObj, &rcDest, &rcSrc, TransparentColor, 0); done: @@ -469,6 +472,12 @@ } } + if (NULL != pBmp->BitsLock) + { + ExFreePoolWithTag(pBmp->BitsLock, TAG_BITMAPOBJ); + pBmp->BitsLock = NULL; + } + return TRUE; } @@ -1246,8 +1255,10 @@ } /* Perform the bitblt operation */ - Status = IntEngStretchBlt(BitmapDest, BitmapSrc, NULL, DCDest->CombinedClip, - XlateObj, &DestRect, &SourceRect, NULL, NULL, NULL, COLORONCOLOR); + Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, + NULL, DCDest->CombinedClip, XlateObj, + &DestRect, &SourceRect, NULL, NULL, NULL, + COLORONCOLOR); [truncated at 1000 lines; 273 more skipped]

19 years, 6 months

[navaraf] 16142: Fix definition of LPC_MESSAGE_BASE_SIZE.

by navaraf＠svn.reactos.com

Fix definition of LPC_MESSAGE_BASE_SIZE. Modified: trunk/reactos/include/ndk/lpctypes.h _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-06-20 07:16:51 UTC (rev 16141) +++ trunk/reactos/include/ndk/lpctypes.h 2005-06-20 07:18:20 UTC (rev 16142) @@ -14,7 +14,7 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ -#define LPC_MESSAGE_BASE_SIZE 4 +#define LPC_MESSAGE_BASE_SIZE 24 #define MAX_MESSAGE_DATA (0x130) /* ENUMERATIONS **************************************************************/

19 years, 6 months

[navaraf] 16141: Remove InitializeMessageHeader definition.

by navaraf＠svn.reactos.com

Remove InitializeMessageHeader definition. Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-20 07:06:41 UTC (rev 16140) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-06-20 07:16:51 UTC (rev 16141) @@ -2889,13 +2889,6 @@ IN PTIME_FIELDS TimeFields ); -#define InitializeMessageHeader(m, l, t) { \ - (m)->Length = (USHORT)(l); \ - (m)->DataLength = (USHORT)(l - sizeof( LPC_MESSAGE )); \ - (m)->MessageType = (USHORT)(t); \ - (m)->DataInfoOffset = 0; \ -} - NTKERNELAPI NTSTATUS NTAPI

19 years, 6 months

[navaraf] 16140: Fix the definion of SharedUserData.

by navaraf＠svn.reactos.com

Fix the definion of SharedUserData. Modified: trunk/reactos/include/ndk/umtypes.h _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-06-20 05:54:19 UTC (rev 16139) +++ trunk/reactos/include/ndk/umtypes.h 2005-06-20 07:06:41 UTC (rev 16140) @@ -112,8 +112,7 @@ /* Kernel Shared Data Constants */ #define PROCESSOR_FEATURE_MAX 64 -#define KI_USER_SHARED_DATA 0xffdf0000 -#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) +#define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) /* Paging Values on x86 */ #define PAGE_SIZE 0x1000

19 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005