Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hpoussin] 17751: Fix build, by correcting include paths and updating xml files of USB components

by hpoussin＠svn.reactos.com

Fix build, by correcting include paths and updating xml files of USB components Modified: trunk/reactos/drivers/usb/miniport/linux/pci_hal.c Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml Modified: trunk/reactos/drivers/usb/usbport/buffer_simple.c Modified: trunk/reactos/drivers/usb/usbport/config.c Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c Modified: trunk/reactos/drivers/usb/usbport/hcd-pci.c Modified: trunk/reactos/drivers/usb/usbport/hcd.c Modified: trunk/reactos/drivers/usb/usbport/hub.c Modified: trunk/reactos/drivers/usb/usbport/message.c Modified: trunk/reactos/drivers/usb/usbport/urb.c Modified: trunk/reactos/drivers/usb/usbport/usb-debug.c Modified: trunk/reactos/drivers/usb/usbport/usb.c Modified: trunk/reactos/drivers/usb/usbport/usbcore.c Deleted: trunk/reactos/drivers/usb/usbport/usbcore.def Added: trunk/reactos/drivers/usb/usbport/usbport.def Modified: trunk/reactos/drivers/usb/usbport/usbport.xml _____ Modified: trunk/reactos/drivers/usb/miniport/linux/pci_hal.c --- trunk/reactos/drivers/usb/miniport/linux/pci_hal.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/linux/pci_hal.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -2,7 +2,7 @@ // this file is part of linux_wrapper.h //FIXME: Move this file, make its definitions more general -#include "../host/ohci_main.h" +#include "../usbohci/ohci_main.h" /* Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory. _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hcd.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -97,7 +97,7 @@ #include <linux/list.h> #include <linux/interrupt.h> /* for in_interrupt () */ #include <linux/usb.h> -#include "../core/hcd.h" +#include "hcd.h" #include <asm/io.h> #include <asm/irq.h> @@ -108,7 +108,7 @@ #include "ohci_config.h" #include "../usb_wrapper.h" -#include "../core/hcd.h" +#include "hcd.h" //#define OHCI_VERBOSE_DEBUG #endif _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci_main.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -10,7 +10,7 @@ #include <debug.h> #include "../usb_wrapper.h" -#include "../core/hcd.h" +#include "hcd.h" #include "ohci_main.h" // declare basic init funcs _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,13 +1,12 @@ -<module name="ohci" type="kernelmodedriver" installbase="system32/drivers" installname="ohci.sys" warnings="true"> - <importlibrary definition="ohci.def" /> +<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" warnings="true"> <define name="__USE_W32API" /> <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> <include>../linux</include> + <include base="usbport"></include> <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library> - <library>usbcore</library> + <library>usbport</library> <file>ohci-hcd.c</file> <file>ohci_main.c</file> <file>ohci.rc</file> _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -61,7 +61,7 @@ #include "uhci_config.h" #include "../usb_wrapper.h" -#include "../core/hcd.h" +#include "hcd.h" #include "uhci-hcd.h" #if 0 _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.h 2005-09-08 20:53:17 UTC (rev 17751) @@ -6,9 +6,9 @@ #include <ddk/usbiodef.h> #include <initguid.h> -#include "../core/hcd.h" +#include "hcd.h" -#include "../host/ohci_main.h" +#include "../usbohci/ohci_main.h" #define USB_UHCI_TAG TAG('u','s','b','u') _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,12 +1,12 @@ -<module name="uhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys" warnings="true"> +<module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" warnings="true"> <define name="__USE_W32API" /> <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> <include>../linux</include> + <include base="usbport"></include> <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library> - <library>usbcore</library> + <library>usbport</library> <file>cleanup.c</file> <file>close.c</file> <file>create.c</file> _____ Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h --- trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-09-08 20:53:17 UTC (rev 17751) @@ -3,8 +3,8 @@ #include <ddk/ntddk.h> #include <ddk/usbioctl.h> -#include "../usb_wrapper.h" -#include "../core/hub.h" +#include "../miniport/usb_wrapper.h" +#include "../usbport/hub.h" #define USB_HUB_TAG TAG('u','s','b','h') _____ Modified: trunk/reactos/drivers/usb/usbhub/usbhub.xml --- trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbhub/usbhub.xml 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,12 +1,11 @@ -<module name="hub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys" warnings="true"> +<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" warnings="true"> <define name="__USE_W32API" /> <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> - <include>../linux</include> + <include>../miniport/linux</include> <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library> - <library>usbcore</library> + <library>usbport</library> <file>createclose.c</file> <file>fdo.c</file> <file>misc.c</file> _____ Modified: trunk/reactos/drivers/usb/usbport/buffer_simple.c --- trunk/reactos/drivers/usb/usbport/buffer_simple.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/buffer_simple.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -5,7 +5,7 @@ * */ -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #define __KERNEL__ #define CONFIG_PCI #include "hcd.h" _____ Modified: trunk/reactos/drivers/usb/usbport/config.c --- trunk/reactos/drivers/usb/usbport/config.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/config.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -5,7 +5,7 @@ #include <linux/slab.h> #include <asm/byteorder.h> #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #endif #define USB_MAXALTSETTING 128 /* Hard limit */ _____ Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c --- trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/core_drivers/usbkey.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -4,7 +4,7 @@ */ #define NDEBUG -#include "../../usb_wrapper.h" +#include "../../miniport/usb_wrapper.h" #define keyboarddebug 0 _____ Modified: trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c --- trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/core_drivers/usbmouse.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -3,7 +3,7 @@ */ #define NDEBUG -#include "../../usb_wrapper.h" +#include "../../miniport/usb_wrapper.h" extern USBPORT_INTERFACE UsbPortInterface; _____ Modified: trunk/reactos/drivers/usb/usbport/hcd-pci.c --- trunk/reactos/drivers/usb/usbport/hcd-pci.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/hcd-pci.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -34,7 +34,7 @@ #include "hcd.h" #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #include "hcd.h" #endif _____ Modified: trunk/reactos/drivers/usb/usbport/hcd.c --- trunk/reactos/drivers/usb/usbport/hcd.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/hcd.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -41,7 +41,7 @@ #include <linux/usb.h> #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" //#define DEBUG #endif _____ Modified: trunk/reactos/drivers/usb/usbport/hub.c --- trunk/reactos/drivers/usb/usbport/hub.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/hub.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -36,7 +36,7 @@ #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #include "hcd.h" #include "hub.h" _____ Modified: trunk/reactos/drivers/usb/usbport/message.c --- trunk/reactos/drivers/usb/usbport/message.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/message.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -10,7 +10,7 @@ #include <linux/mm.h> #include <asm/byteorder.h> #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #endif #include "hcd.h" /* for usbcore internals */ _____ Modified: trunk/reactos/drivers/usb/usbport/urb.c --- trunk/reactos/drivers/usb/usbport/urb.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/urb.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,4 +1,4 @@ -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #include "hcd.h" /** _____ Modified: trunk/reactos/drivers/usb/usbport/usb-debug.c --- trunk/reactos/drivers/usb/usbport/usb-debug.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/usb-debug.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -17,7 +17,7 @@ #endif #include <linux/usb.h> #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #endif static void usb_show_endpoint(struct usb_host_endpoint *endpoint) _____ Modified: trunk/reactos/drivers/usb/usbport/usb.c --- trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/usb.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -50,7 +50,7 @@ #include "hcd.h" #include "usb.h" #else -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" #include "hcd.h" #endif _____ Modified: trunk/reactos/drivers/usb/usbport/usbcore.c --- trunk/reactos/drivers/usb/usbport/usbcore.c 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/usbcore.c 2005-09-08 20:53:17 UTC (rev 17751) @@ -5,7 +5,7 @@ #include <ddk/ntddk.h> #include <debug.h> -#include "../usb_wrapper.h" +#include "../miniport/usb_wrapper.h" USBPORT_INTERFACE UsbPortInterface; _____ Deleted: trunk/reactos/drivers/usb/usbport/usbcore.def --- trunk/reactos/drivers/usb/usbport/usbcore.def 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/usbcore.def 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,33 +0,0 @@ -; -; Exports definition file for usbcore.sys -; -EXPORTS -usb_init@0 -usb_exit@0 -usb_init_urb@4 -usb_alloc_urb@8 -usb_free_urb@4 -usb_get_urb@4 -usb_get_dev@4 -usb_submit_urb@8 -usb_unlink_urb@4 -usb_bus_init@4 -usb_alloc_bus@4 -usb_free_bus@4 -usb_register_bus@4 -usb_deregister_bus@4 -usb_register_root_hub@8 -usb_calc_bus_time@16 -usb_check_bandwidth@8 -usb_claim_bandwidth@16 -usb_release_bandwidth@12 -usb_hcd_giveback_urb@12 -;usb_hcd_irq@12 -usb_hc_died@4 -usb_alloc_dev@8 -usb_connect@4 -usb_put_dev@4 -usb_disabled@0 -usb_hcd_pci_probe@8 -usb_hcd_pci_remove@4 -RegisterPortDriver@8 \ No newline at end of file _____ Copied: trunk/reactos/drivers/usb/usbport/usbport.def (from rev 17750, trunk/reactos/drivers/usb/usbport/usbcore.def) _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.xml --- trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 20:18:46 UTC (rev 17750) +++ trunk/reactos/drivers/usb/usbport/usbport.xml 2005-09-08 20:53:17 UTC (rev 17751) @@ -1,9 +1,8 @@ -<module name="usbcore" type="kernelmodedriver" installbase="system32/drivers" installname="usbcore.sys" warnings="true"> - <importlibrary definition="usbcore.def" /> +<module name="usbport" type="kernelmodedriver" installbase="system32/drivers" warnings="true"> + <importlibrary definition="usbport.def" /> <define name="__USE_W32API" /> <define name="DEBUG_MODE" /> <define name="DEBUG" /> - <include base="ntoskrnl">include</include> <library>sys_base</library> <library>ntoskrnl</library> <library>hal</library>

19 years, 3 months

[hbirr] 17750: Allocate a larger storage for the request buffer. It is necessary since the latest changeing in ntdll for csrss connections.

by hbirr＠svn.reactos.com

Allocate a larger storage for the request buffer. It is necessary since the latest changeing in ntdll for csrss connections. Modified: trunk/reactos/subsys/csrss/api/wapi.c _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-09-08 20:16:36 UTC (rev 17749) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-09-08 20:18:46 UTC (rev 17750) @@ -177,7 +177,8 @@ ServerApiPortThread (PVOID PortHandle) { NTSTATUS Status = STATUS_SUCCESS; - PORT_MESSAGE Request; + BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; + PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; HANDLE hApiListenPort = * (PHANDLE) PortHandle; HANDLE ServerPort = (HANDLE) 0; HANDLE ServerThread = (HANDLE) 0; @@ -192,10 +193,10 @@ REMOTE_PORT_VIEW LpcRead; ServerPort = NULL; - Status = NtListenPort (hApiListenPort, &Request); + Status = NtListenPort (hApiListenPort, Request); if (!NT_SUCCESS(Status)) { - DPRINT1("CSR: NtListenPort() failed\n"); + DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); break; } Status = NtAcceptConnectPort(& ServerPort, @@ -210,11 +211,11 @@ break; } - ProcessData = CsrCreateProcessData(Request.ClientId.UniqueProcess); + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); if (ProcessData == NULL) { DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request.ClientId.UniqueProcess); + Request->ClientId.UniqueProcess); Status = STATUS_UNSUCCESSFUL; break; }

19 years, 3 months

[hpoussin] 17749: Add xml files at the right places

by hpoussin＠svn.reactos.com

Add xml files at the right places Remove now useless cromwell directory Deleted: trunk/reactos/drivers/usb/cromwell/ Modified: trunk/reactos/drivers/usb/directory.xml Added: trunk/reactos/drivers/usb/miniport/directory.xml Deleted: trunk/reactos/drivers/usb/miniport/usbohci/host.xml Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml Deleted: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.xml Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml Deleted: trunk/reactos/drivers/usb/usbhub/hub.xml Added: trunk/reactos/drivers/usb/usbhub/usbhub.xml Deleted: trunk/reactos/drivers/usb/usbport/usbcore.xml Added: trunk/reactos/drivers/usb/usbport/usbport.xml _____ Modified: trunk/reactos/drivers/usb/directory.xml --- trunk/reactos/drivers/usb/directory.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/directory.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -1,15 +1,15 @@ -<directory name="cromwell"> - <xi:include href="cromwell/directory.xml" /> -</directory> - <directory name="usbhub"> <xi:include href="usbhub/usbhub.xml" /> </directory> <directory name="usbport"> <xi:include href="usbport/usbport.xml" /> +</directory> + _____ Added: trunk/reactos/drivers/usb/miniport/directory.xml --- trunk/reactos/drivers/usb/miniport/directory.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/miniport/directory.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -0,0 +1,12 @@ +<directory name="sys"> + <xi:include href="sys/sys.xml" /> +</directory> + +<directory name="usbohci"> + <xi:include href="usbohci/usbohci.xml" /> +</directory> +<directory name="usbuhci"> + <xi:include href="usbuhci/usbuhci.xml" /> +</directory> _____ Deleted: trunk/reactos/drivers/usb/miniport/usbohci/host.xml --- trunk/reactos/drivers/usb/miniport/usbohci/host.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/miniport/usbohci/host.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -1,14 +0,0 @@ -<module name="ohci" type="kernelmodedriver" installbase="system32/drivers" installname="ohci.sys" warnings="true"> - <importlibrary definition="ohci.def" /> - <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> - <include>../linux</include> - <library>sys_base</library> - <library>ntoskrnl</library> - <library>hal</library> - <library>usbcore</library> - <file>ohci-hcd.c</file> - <file>ohci_main.c</file> - <file>ohci.rc</file> -</module> _____ Copied: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.xml (from rev 17747, trunk/reactos/drivers/usb/miniport/usbohci/host.xml) _____ Deleted: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.xml --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -1,19 +0,0 @@ -<module name="uhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys" warnings="true"> - <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> - <include>../linux</include> - <library>sys_base</library> - <library>ntoskrnl</library> - <library>hal</library> - <library>usbcore</library> - <file>cleanup.c</file> - <file>close.c</file> - <file>create.c</file> - <file>fdo.c</file> - <file>misc.c</file> - <file>pdo.c</file> - <file>uhci.c</file> - <file>uhci-hcd.c</file> - <file>uhci.rc</file> -</module> _____ Copied: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml (from rev 17747, trunk/reactos/drivers/usb/miniport/usbuhci/uhci.xml) _____ Deleted: trunk/reactos/drivers/usb/usbhub/hub.xml --- trunk/reactos/drivers/usb/usbhub/hub.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/usbhub/hub.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -1,16 +0,0 @@ -<module name="hub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys" warnings="true"> - <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> - <include base="ntoskrnl">include</include> - <include>../linux</include> - <library>sys_base</library> - <library>ntoskrnl</library> - <library>hal</library> - <library>usbcore</library> - <file>createclose.c</file> - <file>fdo.c</file> - <file>misc.c</file> - <file>pdo.c</file> - <file>usbhub.c</file> - <file>usbhub.rc</file> -</module> _____ Copied: trunk/reactos/drivers/usb/usbhub/usbhub.xml (from rev 17747, trunk/reactos/drivers/usb/usbhub/hub.xml) _____ Deleted: trunk/reactos/drivers/usb/usbport/usbcore.xml --- trunk/reactos/drivers/usb/usbport/usbcore.xml 2005-09-08 20:12:33 UTC (rev 17748) +++ trunk/reactos/drivers/usb/usbport/usbcore.xml 2005-09-08 20:16:36 UTC (rev 17749) @@ -1,24 +0,0 @@ -<module name="usbcore" type="kernelmodedriver" installbase="system32/drivers" installname="usbcore.sys" warnings="true"> - <importlibrary definition="usbcore.def" /> - <define name="__USE_W32API" /> - <define name="DEBUG_MODE" /> - <define name="DEBUG" /> - <include base="ntoskrnl">include</include> - <library>sys_base</library> - <library>ntoskrnl</library> - <library>hal</library> - <file>message.c</file> - <file>hcd.c</file> - <file>hcd-pci.c</file> - <file>hub.c</file> - <file>usb.c</file> - <file>config.c</file> - <file>urb.c</file> - <file>buffer_simple.c</file> - <file>usb-debug.c</file> - <file>usbcore.c</file> - <file>core_drivers/usbkey.c</file> - <file>core_drivers/usbmouse.c</file> - - <file>usbcore.rc</file> -</module> _____ Copied: trunk/reactos/drivers/usb/usbport/usbport.xml (from rev 17747, trunk/reactos/drivers/usb/usbport/usbcore.xml)

19 years, 3 months

[hbirr] 17748: Initialize the length in the header in LpcSendTerminationPort.

by hbirr＠svn.reactos.com

Initialize the length in the header in LpcSendTerminationPort. Modified: trunk/reactos/ntoskrnl/lpc/send.c _____ Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-09-08 20:07:16 UTC (rev 17747) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-09-08 20:12:33 UTC (rev 17748) @@ -38,6 +38,8 @@ #ifdef __USE_NT_LPC__ Msg.h.u2.s2.Type = LPC_CLIENT_DIED; #endif + Msg.h.u1.s1.TotalLength = sizeof(Msg); + Msg.h.u1.s1.DataLength = sizeof(Msg) - sizeof(PORT_MESSAGE); Msg.CreateTime = CreateTime; Status = LpcRequestPort (Port, &Msg.h); return(Status);

19 years, 3 months

[hpoussin] 17747: Move drivers to the right location

by hpoussin＠svn.reactos.com

Move drivers to the right location Deleted: trunk/reactos/drivers/usb/cromwell/linux/ Deleted: trunk/reactos/drivers/usb/cromwell/sys/ Deleted: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h Deleted: trunk/reactos/drivers/usb/cromwell/usbhub/ Deleted: trunk/reactos/drivers/usb/cromwell/usbohci/ Deleted: trunk/reactos/drivers/usb/cromwell/usbport/ Deleted: trunk/reactos/drivers/usb/cromwell/usbuhci/ Added: trunk/reactos/drivers/usb/miniport/ Added: trunk/reactos/drivers/usb/miniport/linux/ Added: trunk/reactos/drivers/usb/miniport/sys/ Added: trunk/reactos/drivers/usb/miniport/usb_wrapper.h Added: trunk/reactos/drivers/usb/miniport/usbohci/ Added: trunk/reactos/drivers/usb/miniport/usbuhci/ Added: trunk/reactos/drivers/usb/usbhub/ Added: trunk/reactos/drivers/usb/usbport/ _____ Deleted: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h --- trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-09-08 20:02:40 UTC (rev 17746) +++ trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-09-08 20:07:16 UTC (rev 17747) @@ -1,50 +0,0 @@ -//#include <stdlib.h> -//#include <ntos/types.h> -//#include <ddk/extypes.h> - -/* - TODO: Do a major cleanup of this file! - Lots of definitions should go to corresponding files -*/ - -#include <ddk/ntddk.h> -#include <ddk/kbdmou.h> -#include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - -void wait_ms(int mils); -void my_udelay(int us); - -// For now this is needed only for correct operation of embedded keyboard and mouse drvs -typedef struct _USBPORT_INTERFACE -{ - PCONNECT_DATA KbdConnectData; - PCONNECT_DATA MouseConnectData; -} USBPORT_INTERFACE, *PUSBPORT_INTERFACE; - -// Register in usbcore.sys -void STDCALL RegisterPortDriver(PDRIVER_OBJECT, PUSBPORT_INTERFACE); - -#ifndef _snprintf -int _snprintf(char * buf, size_t cnt, const char *fmt, ...); -#endif -#ifndef sprintf -int sprintf(char * buf, const char *fmt, ...); -#endif -#ifndef swprintf -int swprintf(wchar_t *buf, const wchar_t *fmt, ...); -#endif - -#undef interface - -#include "linux/linux_wrapper.h" -#define __KERNEL__ -#undef CONFIG_PCI -#define CONFIG_PCI - -#include "linux/usb.h" -#include "linux/pci_ids.h" - -#define IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE \ - CTL_CODE(FILE_DEVICE_USB, 4000, METHOD_BUFFERED, FILE_ANY_ACCESS) _____ Copied: trunk/reactos/drivers/usb/miniport/linux (from rev 17746, trunk/reactos/drivers/usb/cromwell/linux) _____ Copied: trunk/reactos/drivers/usb/miniport/sys (from rev 17746, trunk/reactos/drivers/usb/cromwell/sys) _____ Copied: trunk/reactos/drivers/usb/miniport/usb_wrapper.h (from rev 17746, trunk/reactos/drivers/usb/cromwell/usb_wrapper.h) _____ Copied: trunk/reactos/drivers/usb/miniport/usbohci (from rev 17746, trunk/reactos/drivers/usb/cromwell/usbohci) _____ Copied: trunk/reactos/drivers/usb/miniport/usbuhci (from rev 17746, trunk/reactos/drivers/usb/cromwell/usbuhci) _____ Copied: trunk/reactos/drivers/usb/usbhub (from rev 17746, trunk/reactos/drivers/usb/cromwell/usbhub) _____ Copied: trunk/reactos/drivers/usb/usbport (from rev 17746, trunk/reactos/drivers/usb/cromwell/usbport)

19 years, 3 months

[hpoussin] 17746: Rename drivers to their right name

by hpoussin＠svn.reactos.com

Rename drivers to their right name Deleted: trunk/reactos/drivers/usb/cromwell/core/ Deleted: trunk/reactos/drivers/usb/cromwell/host/ Deleted: trunk/reactos/drivers/usb/cromwell/hub/ Deleted: trunk/reactos/drivers/usb/cromwell/uhci/ Added: trunk/reactos/drivers/usb/cromwell/usbhub/ Added: trunk/reactos/drivers/usb/cromwell/usbohci/ Added: trunk/reactos/drivers/usb/cromwell/usbport/ Added: trunk/reactos/drivers/usb/cromwell/usbuhci/ _____ Copied: trunk/reactos/drivers/usb/cromwell/usbhub (from rev 17651, trunk/reactos/drivers/usb/cromwell/hub) _____ Copied: trunk/reactos/drivers/usb/cromwell/usbohci (from rev 17651, trunk/reactos/drivers/usb/cromwell/host) _____ Copied: trunk/reactos/drivers/usb/cromwell/usbport (from rev 17651, trunk/reactos/drivers/usb/cromwell/core) _____ Copied: trunk/reactos/drivers/usb/cromwell/usbuhci (from rev 17651, trunk/reactos/drivers/usb/cromwell/uhci)

19 years, 3 months

[hpoussin] 17745: Start of big changes in layout of USB code. Fireball and I are agreeing on these changes.

by hpoussin＠svn.reactos.com

Start of big changes in layout of USB code. Fireball and I are agreeing on these changes. Step 1: delete all useless stuff Deleted: trunk/reactos/drivers/usb/miniport/ Deleted: trunk/reactos/drivers/usb/usbhub/ Deleted: trunk/reactos/drivers/usb/usbport/

19 years, 3 months

[chorns] 17744: Christoph_vW <Christoph@ApiViewer.de>:

by chorns＠svn.reactos.com

Christoph_vW <Christoph(a)ApiViewer.de>: Binutils detection Modified to support cross-compilation Resolves #707 Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/exception.cpp Modified: trunk/reactos/tools/rbuild/exception.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-08 16:18:51 UTC (rev 17743) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-08 16:41:07 UTC (rev 17744) @@ -361,6 +361,7 @@ MingwBackend::ProcessNormal () { DetectCompiler (); + DetectBinutils (); DetectNetwideAssembler (); DetectPipeSupport (); DetectPCHSupport (); @@ -813,7 +814,112 @@ return (exitcode == 0); } +bool +MingwBackend::TryToDetectThisBinutils ( const string& binutils ) +{ + string command = ssprintf ( + "%s -v 1>%s", + binutils.c_str (), + NUL, + NUL ); + int exitcode = system ( command.c_str () ); + return (exitcode == 0); +} + +string +MingwBackend::GetBinutilsVersion ( const string& binutilsCommand ) +{ + FILE *fp; + int ch, i; + char buffer[81]; + + string versionCommand = ssprintf ( "%s -v", + binutilsCommand.c_str (), + NUL, + NUL ); + fp = popen ( versionCommand.c_str () , "r" ); + for( i = 0; ( i < 80 ) && ( feof ( fp ) == 0 ); i++ ) + { + buffer[i] = (char) ch; + ch = fgetc( fp ); + } + buffer[i] = '\0'; + pclose ( fp ); + + char separators[] = " "; + char *token; + char *prevtoken; + + token = strtok ( buffer, separators ); + while ( token != NULL ) + { + prevtoken = token; + token = strtok ( NULL, separators ); + } + string version = string ( prevtoken ); + int firstSpace = version.find_last_not_of ( " \t" ); + if ( firstSpace != -1 ) + return string ( version, 0, firstSpace - 1); + else + return version; +} + +bool +MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion ) +{ + if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && + ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || + ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) + return false; + else + return true; +} + void +MingwBackend::DetectBinutils () +{ + printf ( "Detecting binutils..." ); + + bool detectedBinutils = false; + const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); + if ( ROS_PREFIXValue.length () > 0 ) + { + binutilsPrefix = ROS_PREFIXValue; + binutilsCommand = binutilsPrefix + "-ld"; + detectedBinutils = TryToDetectThisBinutils ( binutilsCommand ); + } +#if defined(WIN32) + if ( !detectedBinutils ) + { + binutilsPrefix = ""; + binutilsCommand = "ld"; + detectedBinutils = TryToDetectThisBinutils ( binutilsCommand ); + } +#endif + if ( !detectedBinutils ) + { + binutilsPrefix = "mingw32"; + binutilsCommand = binutilsPrefix + "-ld"; + detectedBinutils = TryToDetectThisBinutils ( binutilsCommand ); + } + if ( detectedBinutils ) + { + const string& binutilsVersion = GetBinutilsVersion ( binutilsCommand ); + if ( IsSupportedBinutilsVersion ( binutilsVersion ) ) + printf ( "detected (%s)\n", binutilsCommand.c_str () ); + else + { + printf ( "detected (%s), but with unsupported version (%s)\n", + binutilsCommand.c_str (), + binutilsVersion.c_str () ); + throw UnsupportedBuildToolException ( binutilsCommand, binutilsVersion ); + } + } + else + printf ( "not detected\n" ); +} + +void MingwBackend::DetectNetwideAssembler () { printf ( "Detecting netwide assembler..." ); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-09-08 16:18:51 UTC (rev 17743) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-09-08 16:41:07 UTC (rev 17744) @@ -72,6 +72,8 @@ std::string compilerPrefix; std::string compilerCommand; std::string nasmCommand; + std::string binutilsPrefix; + std::string binutilsCommand; bool usePipe; Directory* intermediateDirectory; Directory* outputDirectory; @@ -108,6 +110,10 @@ bool TryToDetectThisCompiler ( const std::string& compiler ); void DetectCompiler (); bool TryToDetectThisNetwideAssembler ( const std::string& assembler ); + bool TryToDetectThisBinutils ( const std::string& binutils ); + std::string GetBinutilsVersion ( const std::string& binutilsCommand ); + bool IsSupportedBinutilsVersion ( const std::string& binutilsVersion ); + void DetectBinutils (); void DetectNetwideAssembler (); void DetectPipeSupport (); void DetectPCHSupport (); _____ Modified: trunk/reactos/tools/rbuild/exception.cpp --- trunk/reactos/tools/rbuild/exception.cpp 2005-09-08 16:18:51 UTC (rev 17743) +++ trunk/reactos/tools/rbuild/exception.cpp 2005-09-08 16:41:07 UTC (rev 17744) @@ -187,3 +187,14 @@ Command = command; ExitCode = exitcode; } + + +UnsupportedBuildToolException::UnsupportedBuildToolException ( const std::string& buildTool, + const std::string& version ) + : Exception ( "Build tool '%s' with version '%s' is unsupported. Please upgrade your build tool.", + buildTool.c_str (), + version.c_str () ) +{ + BuildTool = buildTool; + Version = version; +} _____ Modified: trunk/reactos/tools/rbuild/exception.h --- trunk/reactos/tools/rbuild/exception.h 2005-09-08 16:18:51 UTC (rev 17743) +++ trunk/reactos/tools/rbuild/exception.h 2005-09-08 16:41:07 UTC (rev 17744) @@ -139,4 +139,14 @@ int ExitCode; }; + +class UnsupportedBuildToolException : public Exception +{ +public: + UnsupportedBuildToolException ( const std::string& buildtool, + const std::string& version ); + std::string BuildTool; + std::string Version; +}; + #endif /* __EXCEPTION_H */

19 years, 3 months

[gdalsnes] 17743: -remove hotkey lock

by gdalsnes＠svn.reactos.com

-remove hotkey lock -remove dc list lock -simplify/rework refcounting -remove keyboard queue state lock -convert some functions into taking pointerargs, not handles Modified: trunk/reactos/subsys/win32k/include/cursoricon.h Modified: trunk/reactos/subsys/win32k/include/dce.h Modified: trunk/reactos/subsys/win32k/include/hotkey.h Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/include/winpos.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.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/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/object.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.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/include/cursoricon.h --- trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -50,7 +50,6 @@ HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange); BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject); -PCURICON_OBJECT FASTCALL IntGetCurIconObject(HANDLE Handle); PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(PWINSTATION_OBJECT WinStaObject); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PW32PROCESS Win32Process); _____ Modified: trunk/reactos/subsys/win32k/include/dce.h --- trunk/reactos/subsys/win32k/include/dce.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/dce.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -50,10 +50,9 @@ #define DCEOBJ_UnlockDCE(pDCE) GDIOBJ_UnlockObjByPtr(pDCE) BOOL INTERNAL_CALL DCE_Cleanup(PVOID ObjectBody); -PDCE FASTCALL DceAllocDCE(HWND hWnd, DCE_TYPE Type); +PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window, DCE_TYPE Type); PDCE FASTCALL DCE_FreeDCE(PDCE dce); VOID FASTCALL DCE_FreeWindowDCE(HWND); -HRGN STDCALL DceGetVisRgn(HWND hWnd, ULONG Flags, HWND hWndChild, ULONG CFlags); INT FASTCALL DCE_ExcludeRgn(HDC, HWND, HRGN); BOOL FASTCALL DCE_InvalidateDCE(HWND, const PRECTL); HWND FASTCALL IntWindowFromDC(HDC hDc); _____ Modified: trunk/reactos/subsys/win32k/include/hotkey.h --- trunk/reactos/subsys/win32k/include/hotkey.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/hotkey.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -34,12 +34,6 @@ VOID UnregisterThreadHotKeys(struct _ETHREAD *Thread); -#define IntLockHotKeys(WinStaObject) \ - ExAcquireFastMutex(&WinStaObject->HotKeyListLock) - -#define IntUnLockHotKeys(WinStaObject) \ - ExReleaseFastMutex(&WinStaObject->HotKeyListLock) - #endif /* _WIN32K_HOTKEY_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -67,7 +67,7 @@ HWND FASTCALL UserGetForegroundWindow(VOID); -HWND FASTCALL UserSetFocus(HWND hWnd); +HWND FASTCALL co_UserSetFocus(PWINDOW_OBJECT Window); /*************** WINDC.C ***************/ _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -154,7 +154,7 @@ IntGetActiveWindow (VOID); BOOL FASTCALL -IntIsWindowVisible (HWND hWnd); +IntIsWindowVisible (PWINDOW_OBJECT Window); BOOL FASTCALL IntIsChildWindow (HWND Parent, HWND Child); @@ -178,10 +178,10 @@ IntGetParentObject(PWINDOW_OBJECT Wnd); INT FASTCALL -IntGetWindowRgn(HWND hWnd, HRGN hRgn); +IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn); INT FASTCALL -IntGetWindowRgnBox(HWND hWnd, RECT *Rect); +IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect); BOOL FASTCALL IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi); @@ -200,7 +200,7 @@ DWORD IntAddWndProcHandle(WNDPROC WindowProc, BOOL IsUnicode); BOOL FASTCALL -IntShowOwnedPopups( HWND owner, BOOL fShow ); +IntShowOwnedPopups( PWINDOW_OBJECT owner, BOOL fShow ); #endif /* _WIN32K_WINDOW_H */ _____ Modified: trunk/reactos/subsys/win32k/include/winpos.h --- trunk/reactos/subsys/win32k/include/winpos.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/winpos.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -19,7 +19,7 @@ BOOL FASTCALL IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); LRESULT FASTCALL -co_WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect); +co_WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECT* WindowRect, RECT* ClientRect); UINT FASTCALL co_WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack); _____ Modified: trunk/reactos/subsys/win32k/include/winsta.h --- trunk/reactos/subsys/win32k/include/winsta.h 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/include/winsta.h 2005-09-08 16:18:51 UTC (rev 17743) @@ -42,7 +42,6 @@ struct _DESKTOP_OBJECT* ActiveDesktop; /* FIXME: Clipboard */ LIST_ENTRY HotKeyListHead; - FAST_MUTEX HotKeyListLock; } WINSTATION_OBJECT, *PWINSTATION_OBJECT; extern WINSTATION_OBJECT *InputWindowStation; _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -72,7 +72,11 @@ static PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { - PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel, otAccel); + PACCELERATOR_TABLE Accel; + + if (!hAccel) return NULL; + + Accel= UserGetObject(&gHandleTable, hAccel, otAccel); if (Accel) { @@ -355,7 +359,7 @@ mesg = 1; else if (IntGetCaptureWindow()) mesg = 2; - else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ + else if (!IntIsWindowVisible(Window)) /* FIXME: WINE IsWindowEnabled == IntIsWindowVisible? */ mesg = 3; else { _____ Modified: trunk/reactos/subsys/win32k/ntuser/caret.c --- trunk/reactos/subsys/win32k/ntuser/caret.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/caret.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -221,23 +221,20 @@ int nWidth, int nHeight) { - PWINDOW_OBJECT WindowObject; + PWINDOW_OBJECT Window; PUSER_MESSAGE_QUEUE ThreadQueue; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserCreateCaret\n"); UserEnterExclusive(); - WindowObject = IntGetWindowObject(hWnd); - if(!WindowObject) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_HANDLE); RETURN(FALSE); } - if(WindowObject->OwnerThread != PsGetCurrentThread()) + if(Window->OwnerThread != PsGetCurrentThread()) { - IntReleaseWindowObject(WindowObject); SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } @@ -265,8 +262,6 @@ ThreadQueue->CaretInfo->Visible = 0; ThreadQueue->CaretInfo->Showing = 0; - IntReleaseWindowObject(WindowObject); - RETURN(TRUE); CLEANUP: @@ -282,7 +277,7 @@ DECLARE_RETURN(UINT); DPRINT("Enter NtUserGetCaretBlinkTime\n"); - UserEnterExclusive(); + UserEnterShared(); RETURN(IntGetCaretBlinkTime()); @@ -322,11 +317,11 @@ } -BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT WindowObject) +BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT Window) { PUSER_MESSAGE_QUEUE ThreadQueue; - if(WindowObject->OwnerThread != PsGetCurrentThread()) + if(Window->OwnerThread != PsGetCurrentThread()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -334,7 +329,7 @@ ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; - if(ThreadQueue->CaretInfo->hWnd != WindowObject->hSelf) + if(ThreadQueue->CaretInfo->hWnd != Window->hSelf) { SetLastWin32Error(ERROR_ACCESS_DENIED); return FALSE; @@ -342,7 +337,7 @@ if(ThreadQueue->CaretInfo->Visible) { - IntKillTimer(WindowObject->hSelf, IDCARETTIMER, TRUE); + IntKillTimer(Window->hSelf, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); ThreadQueue->CaretInfo->Visible = 0; @@ -358,22 +353,21 @@ NtUserHideCaret( HWND hWnd) { - PWINDOW_OBJECT WindowObject; + PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); BOOL ret; DPRINT("Enter NtUserHideCaret\n"); UserEnterExclusive(); - WindowObject = IntGetWindowObject(hWnd); - if(!WindowObject) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(FALSE); } - ret = co_UserHideCaret(WindowObject); - IntReleaseWindowObject(WindowObject); + UserRefObjectCo(Window); + ret = co_UserHideCaret(Window); + UserDerefObjectCo(Window); RETURN(ret); @@ -421,22 +415,22 @@ NtUserShowCaret( HWND hWnd) { - PWINDOW_OBJECT WindowObject; + PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); BOOL ret; DPRINT("Enter NtUserShowCaret\n"); UserEnterExclusive(); - WindowObject = IntGetWindowObject(hWnd); - if(!WindowObject) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(FALSE); } - ret = co_UserShowCaret(WindowObject); - IntReleaseWindowObject(WindowObject); + UserRefObjectCo(Window); + ret = co_UserShowCaret(Window); + UserDerefObjectCo(Window); + RETURN(ret); CLEANUP: _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -235,22 +235,19 @@ LPWSTR lpClassName, ULONG nMaxCount) { - PWINDOW_OBJECT WindowObject; - LONG Length; + PWINDOW_OBJECT Window; DECLARE_RETURN(DWORD); UserEnterShared(); + DPRINT("Enter NtUserGetClassName\n"); - WindowObject = IntGetWindowObject(hWnd); - if (WindowObject == NULL) + if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN(0); } - Length = IntGetClassName(WindowObject, lpClassName, nMaxCount); - IntReleaseWindowObject(WindowObject); - RETURN(Length); + RETURN( IntGetClassName(Window, lpClassName, nMaxCount)); + CLEANUP: DPRINT("Leave NtUserGetClassName, ret=%i\n",_ret_); UserLeave(); _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -72,35 +72,48 @@ } - - -/* temp hack */ -PCURICON_OBJECT FASTCALL UserGetCurIconObject(HANDLE hWnd) +#if 0 +static +PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCursor) { - PCURICON_OBJECT Window = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hWnd, otCursor); - if (!Window) + PCURICON_OBJECT Cursor; + + if (!hCursor) return NULL; + + Cursor = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hCursor, otCursor); + if (!Cursor) { SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); return NULL; } - ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); - return Window; + ASSERT(USER_BODY_TO_HEADER(Cursor)->RefCount >= 0); + return Cursor; } - -PCURICON_OBJECT FASTCALL -IntGetCurIconObject(HANDLE Handle) +#endif +static +PCURICON_OBJECT FASTCALL IntGetCurIconObject(HCURSOR hCursor) { - PCURICON_OBJECT ci = UserGetCurIconObject(Handle); - if (ci) + PCURICON_OBJECT Cursor; + + if (!hCursor) return NULL; + + Cursor = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hCursor, otCursor); + if (!Cursor) { - ASSERT(USER_BODY_TO_HEADER(ci)->RefCount >= 0); + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); + return NULL; + } - USER_BODY_TO_HEADER(ci)->RefCount++; - } - return ci; + ASSERT(USER_BODY_TO_HEADER(Cursor)->RefCount >= 0); + + USER_BODY_TO_HEADER(Cursor)->RefCount++; + + return Cursor; } + + #define COLORCURSORS_ALLOWED FALSE HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -316,25 +316,28 @@ return hWndPrev; } +static HWND FASTCALL -co_IntSetFocusWindow(HWND hWnd) +co_IntSetFocusWindow(PWINDOW_OBJECT Window) { HWND hWndPrev = 0; PUSER_MESSAGE_QUEUE ThreadQueue; + ASSERT_REFS_CO(Window); + ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; ASSERT(ThreadQueue != 0); hWndPrev = ThreadQueue->FocusWindow; - if (hWndPrev == hWnd) + if (hWndPrev == Window->hSelf) { return hWndPrev; } - ThreadQueue->FocusWindow = hWnd; + ThreadQueue->FocusWindow = Window->hSelf; - co_IntSendKillFocusMessages(hWndPrev, hWnd); - co_IntSendSetFocusMessages(hWndPrev, hWnd); + co_IntSendKillFocusMessages(hWndPrev, Window->hSelf); + co_IntSendSetFocusMessages(hWndPrev, Window->hSelf); return hWndPrev; } @@ -513,18 +516,14 @@ -HWND FASTCALL UserSetFocus(HWND hWnd) +HWND FASTCALL co_UserSetFocus(PWINDOW_OBJECT Window OPTIONAL) { - if (hWnd) + if (Window) { - PWINDOW_OBJECT Window; PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev, hWndTop; - if (!(Window = UserGetWindowObject(hWnd))) - { - return( 0); - } + ASSERT_REFS_CO(Window); ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; @@ -539,15 +538,17 @@ return( 0); } - hWndTop = UserGetAncestor(hWnd, GA_ROOT); + hWndTop = UserGetAncestor(Window->hSelf, GA_ROOT); if (hWndTop != UserGetActiveWindow()) { - PWINDOW_OBJECT WndTops = IntGetWindowObject(hWndTop); + PWINDOW_OBJECT WndTops = UserGetWindowObject(hWndTop); + + UserRefObjectCo(WndTops); co_IntSetActiveWindow(WndTops); - IntReleaseWindowObject(WndTops);//temp hack + UserDerefObjectCo(WndTops); } - hWndPrev = co_IntSetFocusWindow(hWnd); + hWndPrev = co_IntSetFocusWindow(Window); return( hWndPrev); } @@ -565,13 +566,24 @@ HWND STDCALL NtUserSetFocus(HWND hWnd) { + PWINDOW_OBJECT Window; DECLARE_RETURN(HWND); + HWND ret; DPRINT("Enter NtUserSetFocus(%x)\n", hWnd); UserEnterExclusive(); - RETURN(UserSetFocus(hWnd)); + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(NULL); + } + UserRefObjectCo(Window); + ret = co_UserSetFocus(Window); + UserDerefObjectCo(Window); + + RETURN(ret); + CLEANUP: DPRINT("Leave NtUserSetFocus, ret=%i\n",_ret_); UserLeave(); _____ Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c --- trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -42,7 +42,6 @@ InitHotKeys(PWINSTATION_OBJECT WinStaObject) { InitializeListHead(&WinStaObject->HotKeyListHead); - ExInitializeFastMutex(&WinStaObject->HotKeyListLock); return STATUS_SUCCESS; } @@ -72,8 +71,6 @@ return FALSE; } - IntLockHotKeys(WinStaObject); - Entry = WinStaObject->HotKeyListHead.Flink; while (Entry != &WinStaObject->HotKeyListHead) { @@ -92,7 +89,6 @@ if (id != NULL) *id = HotKeyItem->id; - IntUnLockHotKeys(WinStaObject); return TRUE; } @@ -100,8 +96,6 @@ Entry = Entry->Flink; } - IntUnLockHotKeys(WinStaObject); - return FALSE; } @@ -119,8 +113,6 @@ if(!WinStaObject) return; - IntLockHotKeys(WinStaObject); - Entry = WinStaObject->HotKeyListHead.Flink; while (Entry != &WinStaObject->HotKeyListHead) { @@ -135,7 +127,6 @@ } } - IntUnLockHotKeys(WinStaObject); } @@ -152,8 +143,6 @@ if(!WinStaObject) return; - IntLockHotKeys(WinStaObject); - Entry = WinStaObject->HotKeyListHead.Flink; while (Entry != &WinStaObject->HotKeyListHead) { @@ -168,7 +157,6 @@ } } - IntUnLockHotKeys(WinStaObject); } @@ -220,14 +208,11 @@ } else { - Window = IntGetWindowObject(hWnd); - if(!Window) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( FALSE); } HotKeyThread = Window->OwnerThread; - IntReleaseWindowObject(Window); } @@ -239,19 +224,15 @@ RETURN( FALSE); } - IntLockHotKeys(WinStaObject); - /* Check for existing hotkey */ if (IsHotKey (WinStaObject, fsModifiers, vk)) { - IntUnLockHotKeys(WinStaObject); RETURN( FALSE); } HotKeyItem = ExAllocatePoolWithTag (PagedPool, sizeof(HOT_KEY_ITEM), TAG_HOTKEY); if (HotKeyItem == NULL) { - IntUnLockHotKeys(WinStaObject); RETURN( FALSE); } @@ -264,8 +245,6 @@ InsertHeadList (&WinStaObject->HotKeyListHead, &HotKeyItem->ListEntry); - IntUnLockHotKeys(WinStaObject); - RETURN( TRUE); CLEANUP: @@ -288,10 +267,8 @@ DPRINT("Enter NtUserUnregisterHotKey\n"); UserEnterExclusive(); - Window = IntGetWindowObject(hWnd); - if(!Window) + if(!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( FALSE); } @@ -300,12 +277,9 @@ if(!WinStaObject) { - IntReleaseWindowObject(Window); RETURN( FALSE); } - IntLockHotKeys(WinStaObject); - Entry = WinStaObject->HotKeyListHead.Flink; while (Entry != &WinStaObject->HotKeyListHead) { @@ -317,18 +291,13 @@ { RemoveEntryList (&HotKeyItem->ListEntry); ExFreePool (HotKeyItem); - IntUnLockHotKeys(WinStaObject); - IntReleaseWindowObject(Window); RETURN( TRUE); } Entry = Entry->Flink; } - IntUnLockHotKeys(WinStaObject); - - IntReleaseWindowObject(Window); RETURN( FALSE); CLEANUP: _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -35,7 +35,7 @@ #define NDEBUG #include <debug.h> -extern BYTE QueueKeyStateTable[]; +extern BYTE gQueueKeyStateTable[]; /* GLOBALS *******************************************************************/ @@ -377,7 +377,7 @@ PWINDOW_OBJECT Window; MSG Mesg; - if (!(Window = IntGetWindowObject(InputWindowStation->ShellWindow))) + if (!(Window = UserGetWindowObject(InputWindowStation->ShellWindow))) { DPRINT1("Couldn't find window to send Windows key message!\n"); return; @@ -390,8 +390,6 @@ /* The QS_HOTKEY is just a guess */ MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); - - ObmDereferenceObject(Window); } STATIC VOID STDCALL @@ -1026,42 +1024,42 @@ Msg.message = 0; if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { - QueueKeyStateTable[VK_LBUTTON] |= 0xc0; + gQueueKeyStateTable[VK_LBUTTON] |= 0xc0; Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { - QueueKeyStateTable[VK_LBUTTON] &= ~0x80; + gQueueKeyStateTable[VK_LBUTTON] &= ~0x80; Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; MsqInsertSystemMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { - QueueKeyStateTable[VK_MBUTTON] |= 0xc0; + gQueueKeyStateTable[VK_MBUTTON] |= 0xc0; Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { - QueueKeyStateTable[VK_MBUTTON] &= ~0x80; + gQueueKeyStateTable[VK_MBUTTON] &= ~0x80; Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; MsqInsertSystemMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { - QueueKeyStateTable[VK_RBUTTON] |= 0xc0; + gQueueKeyStateTable[VK_RBUTTON] |= 0xc0; Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { - QueueKeyStateTable[VK_RBUTTON] &= ~0x80; + gQueueKeyStateTable[VK_RBUTTON] &= ~0x80; Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; MsqInsertSystemMessage(&Msg); @@ -1079,14 +1077,14 @@ Msg.message = WM_XBUTTONDOWN; if(mi->mouseData & XBUTTON1) { - QueueKeyStateTable[VK_XBUTTON1] |= 0xc0; + gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown |= XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { - QueueKeyStateTable[VK_XBUTTON2] |= 0xc0; + gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown |= XBUTTON2; MsqInsertSystemMessage(&Msg); @@ -1097,14 +1095,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { - QueueKeyStateTable[VK_XBUTTON1] &= ~0x80; + gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown &= ~XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { - QueueKeyStateTable[VK_XBUTTON2] &= ~0x80; + gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown &= ~XBUTTON2; MsqInsertSystemMessage(&Msg); _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-08 15:51:44 UTC (rev 17742) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-09-08 16:18:51 UTC (rev 17743) @@ -49,24 +49,16 @@ /* From kbdxx.c -- Key changes with numlock */ #define KNUMP 0x400 -/* Lock the keyboard state to prevent unusual concurrent access */ -FAST_MUTEX QueueStateLock; -BYTE QueueKeyStateTable[256]; +BYTE gQueueKeyStateTable[256]; -#define IntLockQueueState \ - ExAcquireFastMutex(&QueueStateLock) -#define IntUnLockQueueState \ - ExReleaseFastMutex(&QueueStateLock) - /* FUNCTIONS *****************************************************************/ /* Initialization -- Right now, just zero the key state and init the lock */ NTSTATUS FASTCALL InitKeyboardImpl(VOID) { - ExInitializeFastMutex(&QueueStateLock); - RtlZeroMemory(&QueueKeyStateTable,0x100); + RtlZeroMemory(&gQueueKeyStateTable,0x100); return STATUS_SUCCESS; } @@ -93,7 +85,7 @@ if (vk == VK_CAPITAL || vk == VK_NUMLOCK) { if (down) - QueueKeyStateTable[vk] ^= KS_LOCK_BIT; + gQueueKeyStateTable[vk] ^= KS_LOCK_BIT; } if (ext && vk == VK_LSHIFT) @@ -104,46 +96,46 @@ vk = VK_RMENU; if (down) - QueueKeyStateTable[vk] |= KS_DOWN_BIT; + gQueueKeyStateTable[vk] |= KS_DOWN_BIT; else - QueueKeyStateTable[vk] &= ~KS_DOWN_MASK; + gQueueKeyStateTable[vk] &= ~KS_DOWN_MASK; if (vk == VK_LSHIFT || vk == VK_RSHIFT) { - if ((QueueKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) || - (QueueKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) + if ((gQueueKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) || + (gQueueKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) { - QueueKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT; + gQueueKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT; } else { - QueueKeyStateTable[VK_SHIFT] &= ~KS_DOWN_MASK; + gQueueKeyStateTable[VK_SHIFT] &= ~KS_DOWN_MASK; } } if (vk == VK_LCONTROL || vk == VK_RCONTROL) { - if ((QueueKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) || - (QueueKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) + if ((gQueueKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) || + (gQueueKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) { - QueueKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT; + gQueueKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT; } else { - QueueKeyStateTable[VK_CONTROL] &= ~KS_DOWN_MASK; + gQueueKeyStateTable[VK_CONTROL] &= ~KS_DOWN_MASK; } } if (vk == VK_LMENU || vk == VK_RMENU) { - if ((QueueKeyStateTable[VK_LMENU] & KS_DOWN_BIT) || - (QueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) + if ((gQueueKeyStateTable[VK_LMENU] & KS_DOWN_BIT) || + (gQueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) { - QueueKeyStateTable[VK_MENU] |= KS_DOWN_BIT; + gQueueKeyStateTable[VK_MENU] |= KS_DOWN_BIT; } else { - QueueKeyStateTable[VK_MENU] &= ~KS_DOWN_MASK; + gQueueKeyStateTable[VK_MENU] &= ~KS_DOWN_MASK; } } } @@ -351,13 +343,12 @@ { DWORD ret = 0; - IntLockQueueState; if( key < 0x100 ) { - ret = ((DWORD)(QueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | - (QueueKeyStateTable[key] & KS_LOCK_BIT); + ret = ((DWORD)(gQueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | + (gQueueKeyStateTable[key] & KS_LOCK_BIT); } - IntUnLockQueueState; + return ret; } @@ -386,13 +377,12 @@ { DWORD ret = 0; - IntLockQueueState; if( key < 0x100 ) { - ret = ((DWORD)(QueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | - (QueueKeyStateTable[key] & KS_LOCK_BIT); + ret = ((DWORD)(gQueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | + (gQueueKeyStateTable[key] & KS_LOCK_BIT); } - IntUnLockQueueState; + return ret; } @@ -434,7 +424,6 @@ } else { - IntLockQueueState; ToUnicodeResult = ToUnicodeInner( wVirtKey, wScanCode, lpKeyState, @@ -443,7 +432,6 @@ wFlags, PsGetWin32Thread() ? PsGetWin32Thread()->KeyboardLayout : 0 ); - IntUnLockQueueState; } return ToUnicodeResult; @@ -458,7 +446,7 @@ { return ToUnicodeEx( wVirtKey, wScanCode, - QueueKeyStateTable, + gQueueKeyStateTable, pwszBuff, cchBuff, wFlags, @@ -735,14 +723,12 @@ ScanCode = (lpMsg->lParam >> 16) & 0xff; - IntLockQueueState; - /* All messages have to contain the cursor point. */ IntGetCursorLocation(PsGetWin32Thread()->Desktop->WindowStation, &NewMsg.pt); UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, - QueueKeyStateTable, wp, 2, 0, + gQueueKeyStateTable, wp, 2, 0, keyLayout ); if (UState == 1) @@ -797,7 +783,6 @@ Result = TRUE; } - IntUnLockQueueState; return Result; } @@ -807,33 +792,47 @@ LPBYTE lpKeyState) { BOOL Result = TRUE; - - IntLockQueueState; + DECLARE_RETURN(DWORD); + + DPRINT("Enter NtUserGetKeyboardState\n"); + UserEnterShared(); + if (lpKeyState) { - if(!NT_SUCCESS(MmCopyToCaller(lpKeyState, QueueKeyStateTable, 256))) + if(!NT_SUCCESS(MmCopyToCaller(lpKeyState, gQueueKeyStateTable, 256))) Result = FALSE; } - IntUnLockQueueState; - return Result; + + RETURN(Result); + +CLEANUP: + DPRINT("Leave NtUserGetKeyboardState, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } DWORD STDCALL -NtUserSetKeyboardState( - LPBYTE lpKeyState) +NtUserSetKeyboardState(LPBYTE lpKeyState) { BOOL Result = TRUE; + DECLARE_RETURN(DWORD); + + DPRINT("Enter NtUserSetKeyboardState\n"); + UserEnterExclusive(); - IntLockQueueState; if (lpKeyState) { - if(! NT_SUCCESS(MmCopyFromCaller(QueueKeyStateTable, lpKeyState, 256))) + if(! NT_SUCCESS(MmCopyFromCaller(gQueueKeyStateTable, lpKeyState, 256))) Result = FALSE; } - IntUnLockQueueState; + [truncated at 1000 lines; 1785 more skipped]

19 years, 3 months

[gvg] 17742: Unlock console on alternate return paths. Fixes bug 734.

by gvg＠svn.reactos.com

Unlock console on alternate return paths. Fixes bug 734. Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-09-08 14:01:53 UTC (rev 17741) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-09-08 15:51:44 UTC (rev 17742) @@ -1500,6 +1500,10 @@ NewCursorY < 0 || NewCursorY >= Buff->MaxY) { ConioUnlockScreenBuffer(Buff); + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = STATUS_INVALID_PARAMETER; } ConioPhysicalToLogical(Buff, Buff->CurrentX, Buff->CurrentY, &OldCursorX, &OldCursorY); @@ -1510,6 +1514,10 @@ if (! ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY)) { ConioUnlockScreenBuffer(Buff); + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = STATUS_UNSUCCESSFUL; } }

19 years, 3 months

← Newer
1
...
41
42
43
44
45
46
47
...
59
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 September 2005