Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ea] 17399: Add new CSR and new Win32 server as optional (subsys/csr, subsys/win).

by ea＠svn.reactos.com

Add new CSR and new Win32 server as optional (subsys/csr, subsys/win). Add images from the optional modules (rosapps,os2,posix,rosky,vms). Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-08-15 16:49:20 UTC (rev 17398) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-08-15 17:04:34 UTC (rev 17399) @@ -72,6 +72,7 @@ lib\comdlg32\comdlg32.dll 1 lib\crtdll\crtdll.dll 1 lib\dbghelp\dbghelp.dll 1 +lib\ddraw\ddraw.dll 1 lib\devenum\devenum.dll 1 lib\dinput\dinput.dll 1 lib\dinput8\dinput8.dll 1 @@ -149,6 +150,10 @@ lib\wsock32\wsock32.dll 1 subsys\csrss\csrss.exe 1 subsys\csrss\win32csr\win32csr.dll 1 +subsys\csr\csr.exe 1 o +subsys\csr\csrsrv\csrsrv.dll 1 o +subsys\win\basesrv\basesrv.dll 1 o +subsys\win\winsrv\winsrv.dll 1 o subsys\ntvdm\ntvdm.exe 1 subsys\smss\smss.exe 1 subsys\win32k\win32k.sys 1 @@ -189,6 +194,8 @@ apps\utils\net\ping\ping.exe 1 apps\utils\net\telnet\telnet.exe 1 apps\utils\net\whois\whois.exe 1 +apps\utils\ps\ps.exe 1 +apps\utils\rosperf\rosperf.exe 1 media\fonts\c0419bt_.ttf 3 media\fonts\c0582bt_.ttf 3 media\fonts\c0583bt_.ttf 3 @@ -276,3 +283,34 @@ media\inf\scsi.inf 6 media\inf\syssetup.inf 6 media\inf\usbport.inf 6 +modules\os2\server\os2srv.dll 1 o +modules\os2\lib\doscalls\doscalls.dll 1 o +modules\posix\server\psxsrv.dll 1 o +modules\posix\lib\psxdll\psxdll.dll 1 o +modules\rosky\lib\libsky\libsky.dll 1 o +modules\rosky\lib\libskygi\libskygi.dll 1 o +modules\vms\server\vmssrv.dll 1 o +modules\vms\lib\vmsdll\vmsdll.dll 1 o +modules\rosapps\cmdutils\find.exe 1 o +modules\rosapps\cmdutils\more.exe 1 o +modules\rosapps\cmdutils\sort.exe 1 o +modules\rosapps\cmdutils\tee.exe 1 o +modules\rosapps\cmdutils\y.exe 1 o +modules\rosapps\cmdutils\mode\mode.exe 1 o +modules\rosapps\cmdutils\touch\touch.exe 1 o +modules\rosapps\games\solitaire\sol.exe 1 o +modules\rosapps\mc\mc.exe 1 o +modules\rosapps\net\ncftp\ncftp.exe 1 o +modules\rosapps\net\niclist\niclist.exe 1 o +modules\rosapps\notevil\notevil.exe 1 o +modules\rosapps\packmgr\cmd-line\rosget.exe 1 o +modules\rosapps\packmgr\gui\packmgr.exe 1 o +modules\rosapps\packmgr\lib\packlib.exe 1 o +modules\rosapps\sysutils\ctm\ctm.exe 1 o +modules\rosapps\sysutils\lsdd\lsdd.exe 1 o +modules\rosapps\sysutils\man\man.exe 1 o +modules\rosapps\sysutils\pedump\pedump.exe 1 o +modules\rosapps\sysutils\regexpl\regexpl.exe 1 o +modules\rosapps\sysutils\shutdown\shutdown.exe 1 o +modules\rosapps\sysutils\tcat\cat.exe 1 o +modules\rosapps\sysutils\tlist\tlist.exe 1 o

19 years, 1 month

[hbirr] 17398: Fixed a terminating NULL in IoRegisterDeviceInterface (same as r17397).

by hbirr＠svn.reactos.com

Fixed a terminating NULL in IoRegisterDeviceInterface (same as r17397). Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/deviface.c _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/deviface.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/io/deviface.c 2005-08-15 16:47:15 UTC (rev 17397) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/io/deviface.c 2005-08-15 16:49:20 UTC (rev 17398) @@ -815,7 +815,7 @@ RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); } - SymbolicLinkName->Buffer[SymbolicLinkName->Length] = '\0'; + SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; /* Create symbolic link */ DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name);

19 years, 1 month

[hbirr] 17397: Fixed a terminating NULL in IoRegisterDeviceInterface.

by hbirr＠svn.reactos.com

Fixed a terminating NULL in IoRegisterDeviceInterface. Modified: trunk/reactos/ntoskrnl/io/deviface.c _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-08-15 16:41:43 UTC (rev 17396) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-08-15 16:47:15 UTC (rev 17397) @@ -815,7 +815,7 @@ RtlAppendUnicodeToString(SymbolicLinkName, L"\\"); RtlAppendUnicodeStringToString(SymbolicLinkName, ReferenceString); } - SymbolicLinkName->Buffer[SymbolicLinkName->Length] = '\0'; + SymbolicLinkName->Buffer[SymbolicLinkName->Length/sizeof(WCHAR)] = L'\0'; /* Create symbolic link */ DPRINT("IoRegisterDeviceInterface(): creating symbolic link %wZ -> %wZ\n", SymbolicLinkName, &PdoNameInfo->Name);

19 years, 1 month

[ea] 17396: CABMAN: add support for optional files (they are listed in the reactos.dff, but may not exist in the output-??? directory).

by ea＠svn.reactos.com

CABMAN: add support for optional files (they are listed in the reactos.dff, but may not exist in the output-??? directory). Modified: trunk/reactos/tools/cabman/dff.txt Modified: trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/main.cxx _____ Modified: trunk/reactos/tools/cabman/dff.txt --- trunk/reactos/tools/cabman/dff.txt 2005-08-15 11:39:19 UTC (rev 17395) +++ trunk/reactos/tools/cabman/dff.txt 2005-08-15 16:41:43 UTC (rev 17396) @@ -8,7 +8,7 @@ Syntax Description ------------------------------------------------------------------------ ------- ; Anything on a line after this is a comment -<filename> [destination] File copy command +<filename> [destination] [options] File copy command (options: o=optional) .Define variable=[value] Define variable to be equal to value (*) .Delete variable Delete a variable definition (*) .New Disk|Cabinet|Folder Start a new disk, cabinet or folder (* -- new disk will work) _____ Modified: trunk/reactos/tools/cabman/dfp.cxx --- trunk/reactos/tools/cabman/dfp.cxx 2005-08-15 11:39:19 UTC (rev 17395) +++ trunk/reactos/tools/cabman/dfp.cxx 2005-08-15 16:41:43 UTC (rev 17396) @@ -1016,11 +1016,13 @@ char SrcName[MAX_PATH]; char DstName[MAX_PATH]; char InfLine[MAX_PATH]; + char Options[8]; char BaseFilename[MAX_PATH]; - strcpy(SrcName, ""); - strcpy(DstName, ""); + *SrcName = '\0'; + *DstName = '\0'; + // source file i = CurrentChar; while ((i < LineLength) && ((ch = Line[i]) != ' ') && @@ -1035,6 +1037,7 @@ strcpy(BaseFilename, CurrentString); strcat(SrcName, BaseFilename); + // destination SkipSpaces(); if (CurrentToken != TokenEnd) { @@ -1052,6 +1055,24 @@ strcpy(DstName, CurrentString); } + // options (it may be empty) + SkipSpaces (); + + if (CurrentToken != TokenEnd) { + j = strlen(CurrentString); i = 0; + while ((CurrentChar + i < LineLength) && + ((ch = Line[CurrentChar + i]) != ' ') && + (ch != 0x09) && + (ch != ';')) { + CurrentString[j + i] = ch; + i++; + } + CurrentString[j + i] = '\0'; + CurrentToken = TokenString; + CurrentChar += i + 1; + strcpy(Options, CurrentString); + } + if (!CabinetCreated) { DPRINT(MID_TRACE, ("Creating cabinet.\n")); @@ -1078,25 +1099,34 @@ DPRINT(MID_TRACE, ("Adding file: '%s' destination: '%s'.\n", SrcName, DstName)); - sprintf(InfLine, "%s=%s", GetFileName(SrcName), DstName); - WriteInfLine(InfLine); - Status = AddFile(SrcName); if (Status == CAB_STATUS_CANNOT_OPEN) { strcpy(SrcName, FileRelativePath); strcat(SrcName, BaseFilename); Status = AddFile(SrcName); } - if (Status != CAB_STATUS_SUCCESS) { - if (Status == CAB_STATUS_CANNOT_OPEN) - printf("File does not exist: %s.\n", SrcName); - else if (Status == CAB_STATUS_NOMEMORY) - printf("Insufficient memory to add file: %s.\n", SrcName); - else - printf("Cannot add file: %s (%lu).\n", SrcName, Status); - return Status; + switch (Status) + { + case CAB_STATUS_SUCCESS: + sprintf(InfLine, "%s=%s", GetFileName(SrcName), DstName); + WriteInfLine(InfLine); + break; + case CAB_STATUS_CANNOT_OPEN: + if (strchr(Options,'o')) + { + Status = CAB_STATUS_SUCCESS; + printf("Optional file does not exist: %s.\n", SrcName); + } else { + printf("File does not exist: %s.\n", SrcName); + } + break; + case CAB_STATUS_NOMEMORY: + printf("Insufficient memory to add file: %s.\n", SrcName); + break; + default: + printf("Cannot add file: %s (%lu).\n", SrcName, Status); + break; } - return CAB_STATUS_SUCCESS; } _____ Modified: trunk/reactos/tools/cabman/main.cxx --- trunk/reactos/tools/cabman/main.cxx 2005-08-15 11:39:19 UTC (rev 17395) +++ trunk/reactos/tools/cabman/main.cxx 2005-08-15 16:41:43 UTC (rev 17396) @@ -553,11 +553,7 @@ status = CABMgr.Run(); } - if (status) { - return 0; - } else { - return 1; - } + return (status ? 0 : 1); } /* EOF */

19 years, 1 month

[hbirr] 17395: Merged r16600:17394 from trunk.

by hbirr＠svn.reactos.com

Merged r16600:17394 from trunk. Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml Modified: branches/cache_manager_rewrite/reactos/apps/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/binpatch/patch.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.xm l Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/ping.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/src/tnclass .cpp Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/src/ttelhnd l.cpp Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/src/ttelhnd l.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/telnet.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/tracert/tracert.xm l Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/pesum/ Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/ps/ps.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/sdkparse/sdkparse.dsp Modified: branches/cache_manager_rewrite/reactos/apps/utils/sdkparse/sdkparse.dsw Modified: branches/cache_manager_rewrite/reactos/apps/utils/stats/stats.c Deleted: branches/cache_manager_rewrite/reactos/apps/utils/winetest/ Modified: branches/cache_manager_rewrite/reactos/baseaddress.xml Modified: branches/cache_manager_rewrite/reactos/boot/boot.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/bootsect.xm l Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base .xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base 64k.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_main .xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_star tup.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/rtl. h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/load er.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/setupldr.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/setupldr_mai n.xml Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr.xml Modified: branches/cache_manager_rewrite/reactos/bootdata/bootdata.xml Modified: branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Modified: branches/cache_manager_rewrite/reactos/bootdata/txtsetup.sif Modified: branches/cache_manager_rewrite/reactos/config.template.xml Modified: branches/cache_manager_rewrite/reactos/doc/INTERNALS Modified: branches/cache_manager_rewrite/reactos/doc/README.WINE Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/acpi.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/include/acpi.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/include/platform /types.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/busmgr/bmut ils.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/directory.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/directory.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/settings.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/irq.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sndblst/sndblst.xml Modified: branches/cache_manager_rewrite/reactos/drivers/dd/sound/sound.xml Modified: branches/cache_manager_rewrite/reactos/drivers/directory.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cleanup.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/close.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/common.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/dirctl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/finfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/fsctl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/misc.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/volinfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/directory.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/fs_rec/fs_rec.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ms/msfs.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/mup/mup.xml Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c [truncated at 100 lines; 1988 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/ReactOS.xml --- branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-15 02:24:48 UTC (rev 17394) +++ branches/cache_manager_rewrite/reactos/ReactOS.xml 2005-08-15 11:39:19 UTC (rev 17395) @@ -1,77 +1,80 @@ -<?xml version="1.0"?> -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.xml"> - <xi:fallback> - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <define name="_M_IX86" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Wpointer-arith</compilerflag> - - <include>include</include> - <include>include/reactos</include> - <include>w32api/include</include> - <include>w32api/include/ddk</include> - - <directory name="apps"> - <xi:include href="apps/directory.xml" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.xml" /> - </directory> - <directory name="bootdata"> - <xi:include href="bootdata/bootdata.xml" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/directory.xml" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.xml" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.xml" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.xml" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.xml" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.xml" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.xml" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.xml" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.xml" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.xml" /> - </directory> -</project> +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> + + <xi:include href="baseaddress.xml" /> + + <define name="_M_IX86" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Wpointer-arith</compilerflag> + + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>w32api/include</include> + <include>w32api/include/ddk</include> + + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.xml" /> + </directory> + <directory name="bootdata"> + <xi:include href="bootdata/bootdata.xml" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/directory.xml" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.xml" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.xml" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.xml" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.xml" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.xml" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.xml" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.xml" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.xml" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.xml" /> + </directory> +</project> Property changes on: branches/cache_manager_rewrite/reactos/ReactOS.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/cache_manager_rewrite/reactos/apps/directory.xml --- branches/cache_manager_rewrite/reactos/apps/directory.xml 2005-08-15 02:24:48 UTC (rev 17394) +++ branches/cache_manager_rewrite/reactos/apps/directory.xml 2005-08-15 11:39:19 UTC (rev 17395) @@ -1,3 +1,3 @@ -<directory name="utils"> - <xi:include href="utils/directory.xml" /> -</directory> +<directory name="utils"> + <xi:include href="utils/directory.xml" /> +</directory> Property changes on: branches/cache_manager_rewrite/reactos/apps/directory.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/binpatch/patch.c --- branches/cache_manager_rewrite/reactos/apps/utils/binpatch/patch.c 2005-08-15 02:24:48 UTC (rev 17394) +++ branches/cache_manager_rewrite/reactos/apps/utils/binpatch/patch.c 2005-08-15 11:39:19 UTC (rev 17395) @@ -1,615 +1,615 @@ -#include <conio.h> -#include <io.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -/** DEFINES *******************************************************************/ - -#define PATCH_BUFFER_SIZE 4096 /* Maximum size of a patch */ -#define PATCH_BUFFER_MAGIC "\xde\xad\xbe\xef MaGiC MaRk " -#define SIZEOF_PATCH_BUFFER_MAGIC (sizeof (PATCH_BUFFER_MAGIC) - 1) - -/** TYPES *********************************************************************/ - -typedef struct _PatchedByte -{ - int offset; /*!< File offset of the patched byte. */ - unsigned char expected; /*!< Expected (original) value of the byte. */ - unsigned char patched; /*!< Patched (new) value for the byte. */ -} PatchedByte; - -typedef struct _PatchedFile -{ - const char *name; /*!< Name of the file to be patched. */ - int fileSize; /*!< Size of the file in bytes. */ - int patchCount; /*!< Number of patches for the file. */ - PatchedByte *patches; /*!< Patches for the file. */ -} PatchedFile; - -typedef struct _Patch -{ - const char *name; /*!< Name of the patch. */ - int fileCount; /*!< Number of files in the patch. */ - PatchedFile *files; /*!< Files for the patch. */ -} Patch; - -/** FUNCTION PROTOTYPES *******************************************************/ - -static void printUsage(); - -/** GLOBALS *******************************************************************/ - -static Patch m_patch = { NULL, 0, NULL }; -static int m_argc = 0; -static char **m_argv = NULL; - -/* patch buffer where we put the patch info into */ -static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = - PATCH_BUFFER_MAGIC; - -/** HELPER FUNCTIONS **********************************************************/ - -static void * -loadFile(const char *fileName, int *fileSize_) -{ - FILE *f; - struct stat sb; - int fileSize; - void *p; - - /* Open the file */ - f = fopen(fileName, "rb"); - if (f == NULL) - { - printf("Couldn't open file %s for reading!\n", fileName); - return NULL; - } - - /* Get file size */ - if (fstat(fileno(f), &sb) < 0) - { - fclose(f); - printf("Couldn't get size of file %s!\n", fileName); - return NULL; - } - fileSize = sb.st_size; - - /* Load file */ - p = malloc(fileSize); - if (p == NULL) - { - fclose(f); - printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName); - return NULL; - } - - if (fread(p, fileSize, 1, f) != 1) - { - fclose(f); - free(p); - printf("Couldn't read file %s into memory!\n", fileName); - return NULL; - } - - /* Close file */ - fclose(f); - - *fileSize_ = fileSize; - return p; -} - - -static int -saveFile(const char *fileName, void *file, int fileSize) -{ - FILE *f; - - /* Open the file */ - f = fopen(fileName, "wb"); - if (f == NULL) - { - printf("Couldn't open file %s for writing!\n", fileName); - return -1; - } - - /* Write file */ - if (fwrite(file, fileSize, 1, f) != 1) - { - fclose(f); - printf("Couldn't write file %s!\n", fileName); - return -1; - } - - /* Close file */ - fclose(f); - return 0; -} - - -static int -compareFiles( - PatchedFile *patchedFile, - const char *originalFileName) -{ - const char *patchedFileName = patchedFile->name; - unsigned char *origChunk, *patchedChunk; - int origSize, patchedSize, i, patchCount; - PatchedByte *patches = NULL; - int patchesArrayCount = 0; - - /* Load both files */ - origChunk = loadFile(originalFileName, &origSize); - if (origChunk == NULL) - return -1; - patchedChunk = loadFile(patchedFileName, &patchedSize); - if (patchedChunk == NULL) - { - free(origChunk); - return -1; - } - if (origSize != patchedSize) - { - free(origChunk); - free(patchedChunk); - printf("File size of %s and %s differs (%d != %d)\n", - originalFileName, patchedFileName, - origSize, patchedSize); - return -1; - } - - /* Compare the files and record any differences */ - printf("Comparing %s to %s", originalFileName, patchedFileName); - for (i = 0, patchCount = 0; i < origSize; i++) - { - if (origChunk[i] != patchedChunk[i]) - { - patchCount++; - - /* Resize patches array if needed */ - if (patchesArrayCount < patchCount) - { - PatchedByte *newPatches; - newPatches = realloc(patches, patchCount * sizeof (PatchedByte)); - if (newPatches == NULL) - { - if (patches != NULL) - free(patches); - free(origChunk); - free(patchedChunk); - printf("\nOut of memory (tried to allocated %d bytes)\n", - patchCount * sizeof (PatchedByte)); - return -1; - } - patches = newPatches; - } - - /* Fill in patch info */ - patches[patchCount - 1].offset = i; - patches[patchCount - 1].expected = origChunk[i]; - patches[patchCount - 1].patched = patchedChunk[i]; - } - if ((i % (origSize / 40)) == 0) - printf("."); - } - printf(" %d changed bytes found.\n", patchCount); - - /* Unload the files */ - free(origChunk); - free(patchedChunk); - - /* Save patch info */ - patchedFile->fileSize = patchedSize; - patchedFile->patchCount = patchCount; - patchedFile->patches = patches; - - return 0; -} - - -static int -outputPatch(const char *outputFileName) -{ - unsigned char *patchExe, *patchBuffer; - int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset; - Patch *patch; - PatchedFile *files; - - printf("Putting patch into %s...\n", outputFileName); - - /* Calculate size of the patch */ - patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; - stringSize = strlen(m_patch.name) + 1; - for (i = 0; i < m_patch.fileCount; i++) - { - stringSize += strlen(m_patch.files[i].name) + 1; - patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount; - } - if ((stringSize + patchSize) > PATCH_BUFFER_SIZE) - { - printf("Patch is too big - %d bytes maximum, %d bytes needed\n", - PATCH_BUFFER_SIZE, stringSize + patchSize); - return -1; - } - - /* Load patch.exe file into memory... */ - patchExe = loadFile(m_argv[0], &patchExeSize); - if (patchExe == NULL) - { - return -1; - } - - /* Try to find the magic mark for the patch buffer */ - for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++) - { - if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0) - { - patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC; - - break; - } - } - if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC))) - { - free(patchExe); - printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]); - return -1; - } - - /* Pack patch together and replace string pointers by offsets */ - patch = (Patch *)patchBuffer; - files = (PatchedFile *)(patchBuffer + sizeof (Patch)); - patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount; - stringOffset = patchSize; - - patch->fileCount = m_patch.fileCount; - patch->files = (PatchedFile *)sizeof (Patch); - - patch->name = (const char *)stringOffset; - strcpy(patchBuffer + stringOffset, m_patch.name); - stringOffset += strlen(m_patch.name) + 1; - - for (i = 0; i < m_patch.fileCount; i++) - { - files[i].fileSize = m_patch.files[i].fileSize; - files[i].patchCount = m_patch.files[i].patchCount; - - files[i].name = (const char *)stringOffset; - strcpy(patchBuffer + stringOffset, m_patch.files[i].name); - stringOffset += strlen(m_patch.files[i].name) + 1; - - size = files[i].patchCount * sizeof (PatchedByte); - files[i].patches = (PatchedByte *)patchOffset; - memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size); - patchOffset += size; - } - size = patchSize + stringSize; - memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size); - - /* Save file */ - if (saveFile(outputFileName, patchExe, patchExeSize) < 0) - { - free(patchExe); - return -1; - } - free(patchExe); - - printf("Patch saved!\n"); - return 0; -} - - -static int -loadPatch() -{ - char *p; - Patch *patch; - int i; - - p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC; - patch = (Patch *)p; - - if (patch->name == NULL) - { - return -1; - } - - m_patch.name = p + (int)patch->name; - m_patch.fileCount = patch->fileCount; - m_patch.files = (PatchedFile *)(p + (int)patch->files); - - for (i = 0; i < m_patch.fileCount; i++) - { - m_patch.files[i].name = p + (int)m_patch.files[i].name; - m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches); - } - - printf("Patch %s loaded...\n", m_patch.name); - return 0; -} - - -/** MAIN FUNCTIONS ************************************************************/ - -static int -createPatch() -{ - int i, status; - const char *outputFileName; - - /* Check argument count */ - if (m_argc < 6 || (m_argc % 2) != 0) - { - printUsage(); - return -1; - } - - outputFileName = m_argv[3]; - m_patch.name = m_argv[2]; - - /* Allocate PatchedFiles array */ - m_patch.fileCount = (m_argc - 4) / 2; - m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile)); - if (m_patch.files == NULL) - { - printf("Out of memory!\n"); - return -1; - } - memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile)); - - /* Compare original to patched files and fill m_patch.files array */ - for (i = 0; i < m_patch.fileCount; i++) - { - m_patch.files[i].name = m_argv[4 + (i * 2) + 1]; - status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]); - if (status < 0) - { - for (i = 0; i < m_patch.fileCount; i++) - { - if (m_patch.files[i].patches != NULL) - free(m_patch.files[i].patches); - } - free(m_patch.files); - m_patch.files = NULL; - m_patch.fileCount = 0; - return status; - } - } - - /* Output patch */ - return outputPatch(outputFileName); -} - - -static int -applyPatch() -{ - int c, i, j, fileSize, makeBackup; - unsigned char *file; - char *p; - const char *fileName; - char buffer[MAX_PATH]; - - - if (m_argc > 1 && strcmp(m_argv[1], "-d") != 0) - { - printUsage(); - return -1; - } - - /* Load patch */ - if (loadPatch() < 0) - { - printf("This executable doesn't contain a patch, use -c to create one.\n"); - return -1; - } - - if (m_argc > 1) - { - /* Dump patch */ - printf("Patch name: %s\n", m_patch.name); - printf("File count: %d\n", m_patch.fileCount); - for (i = 0; i < m_patch.fileCount; i++) - { - printf("----------------------\n" - "File name: %s\n" - "File size: %d bytes\n", - m_patch.files[i].name, m_patch.files[i].fileSize); - printf("Patch count: %d\n", m_patch.files[i].patchCount); - for (j = 0; j < m_patch.files[i].patchCount; j++) - { - printf(" Offset 0x%x 0x%02x -> 0x%02x\n", - m_patch.files[i].patches[j].offset, - m_patch.files[i].patches[j].expected, - m_patch.files[i].patches[j].patched); - } - } - } - else - { - /* Apply patch */ - printf("Applying patch...\n"); - for (i = 0; i < m_patch.fileCount; i++) - { - /* Load original file */ - fileName = m_patch.files[i].name; -applyPatch_retry_file: - file = loadFile(fileName, &fileSize); - if (file == NULL) - { - printf("File %s not found! ", fileName); -applyPatch_file_open_error: - printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename"); - do - { - c = getch(); - } - while (c != 's' && c != 'r' && c != 'a' && c != 'm'); - printf("\n"); - if (c == 's') - { - continue; - } - else if (c == 'r') - { - goto applyPatch_retry_file; - } - else if (c == 'a') - { - return 0; - } - else if (c == 'm') - { - if (fgets(buffer, sizeof (buffer), stdin) == NULL) - { - printf("fgets() failed!\n"); - return -1; - } - p = strchr(buffer, '\r'); - if (p != NULL) - *p = '\0'; - p = strchr(buffer, '\n'); - if (p != NULL) - *p = '\0'; - - fileName = buffer; - goto applyPatch_retry_file; - } - } - - /* Check file size */ - if (fileSize != m_patch.files[i].fileSize) - { - free(file); - printf("File %s has unexpected filesize of %d bytes (%d bytes expected)\n", - fileName, fileSize, m_patch.files[i].fileSize); - if (fileName != m_patch.files[i].name) /* manually entered filename */ - { - goto applyPatch_file_open_error; - } - return -1; - } - - /* Ask for backup */ - printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName); - do - { - c = getch(); - } - while (c != 'y' && c != 'n' && c != 'a'); - printf("\n"); - if (c == 'y') - { - char buffer[MAX_PATH]; - snprintf(buffer, MAX_PATH, "%s.bak", fileName); - buffer[MAX_PATH-1] = '\0'; - makeBackup = 1; - if (access(buffer, 0) >= 0) /* file exists */ - { - printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer); - do - { - c = getch(); - } - while (c != 'y' && c != 'n' && c != 'a'); - printf("\n"); - if (c == 'n') - makeBackup = 0; - else if (c == 'a') - { - free(file); - return 0; - } - } - if (makeBackup && saveFile(buffer, file, fileSize) < 0) - { - free(file); - return -1; - } - } - else if (c == 'a') - { - free(file); - return 0; - } - - /* Patch file */ - for (j = 0; j < m_patch.files[i].patchCount; j++) - { - int offset = m_patch.files[i].patches[j].offset; - if (file[offset] != m_patch.files[i].patches[j].expected) - { - printf("Unexpected value in file %s at offset 0x%x: expected = 0x%02x, found = 0x%02x\n", - fileName, offset, m_patch.files[i].patches[j].expected, file[offset]); - free(file); - return -1; - } - file[offset] = m_patch.files[i].patches[j].patched; - } - - /* Save file */ - if (saveFile(fileName, file, fileSize) < 0) - { - free(file); - return -1; - } - free(file); - } - - printf("Patch applied sucessfully!\n"); - } - - return 0; -} - - -static void -printUsage() -{ - printf("Usage:\n" - "%s -c - Create patch\n" - "%s -d - Dump patch\n" - "%s - Apply patch\n" - "\n" - "A patch can be created like this:\n" - "%s -c \"patch name\" output.exe file1.orig file1.patched[ file2.orig file2.patched[ ...]]\n", - m_argv[0], m_argv[0], m_argv[0], m_argv[0]); -} - - -int -main( - int argc, - char *argv[]) -{ - m_argc = argc; - m_argv = argv; - - if (argc >= 2 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) - { - printUsage(); - return 0; - } - else if (argc >= 2 && argv[1][0] == '-') - { - if (strcmp(argv[1], "-c") == 0) - { - return createPatch(); - } - else if (strcmp(argv[1], "-d") == 0) - { - return applyPatch(); - } - else - { - printf("Unknown option: %s\n" - "Use -h for help.\n", - argv[1]); - return -1; - } - } - - return applyPatch(); -} - +#include <conio.h> +#include <io.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> + +/** DEFINES *******************************************************************/ + +#define PATCH_BUFFER_SIZE 4096 /* Maximum size of a patch */ +#define PATCH_BUFFER_MAGIC "\xde\xad\xbe\xef MaGiC MaRk " +#define SIZEOF_PATCH_BUFFER_MAGIC (sizeof (PATCH_BUFFER_MAGIC) - 1) + +/** TYPES *********************************************************************/ + +typedef struct _PatchedByte +{ + int offset; /*!< File offset of the patched byte. */ + unsigned char expected; /*!< Expected (original) value of the byte. */ + unsigned char patched; /*!< Patched (new) value for the byte. */ +} PatchedByte; + +typedef struct _PatchedFile +{ + const char *name; /*!< Name of the file to be patched. */ + int fileSize; /*!< Size of the file in bytes. */ + int patchCount; /*!< Number of patches for the file. */ + PatchedByte *patches; /*!< Patches for the file. */ +} PatchedFile; + +typedef struct _Patch +{ + const char *name; /*!< Name of the patch. */ + int fileCount; /*!< Number of files in the patch. */ + PatchedFile *files; /*!< Files for the patch. */ +} Patch; + +/** FUNCTION PROTOTYPES *******************************************************/ + +static void printUsage(); + +/** GLOBALS *******************************************************************/ + +static Patch m_patch = { NULL, 0, NULL }; +static int m_argc = 0; +static char **m_argv = NULL; + +/* patch buffer where we put the patch info into */ +static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] = + PATCH_BUFFER_MAGIC; + +/** HELPER FUNCTIONS **********************************************************/ + +static void * +loadFile(const char *fileName, int *fileSize_) +{ + FILE *f; + struct stat sb; + int fileSize; + void *p; + + /* Open the file */ + f = fopen(fileName, "rb"); + if (f == NULL) + { + printf("Couldn't open file %s for reading!\n", fileName); + return NULL; + } + + /* Get file size */ + if (fstat(fileno(f), &sb) < 0) + { + fclose(f); + printf("Couldn't get size of file %s!\n", fileName); + return NULL; + } + fileSize = sb.st_size; + + /* Load file */ + p = malloc(fileSize); + if (p == NULL) + { + fclose(f); + printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName); + return NULL; + } + + if (fread(p, fileSize, 1, f) != 1) + { + fclose(f); + free(p); + printf("Couldn't read file %s into memory!\n", fileName); + return NULL; + } + + /* Close file */ + fclose(f); + + *fileSize_ = fileSize; + return p; +} + + +static int +saveFile(const char *fileName, void *file, int fileSize) +{ + FILE *f; + + /* Open the file */ + f = fopen(fileName, "wb"); + if (f == NULL) + { + printf("Couldn't open file %s for writing!\n", fileName); + return -1; + } + + /* Write file */ + if (fwrite(file, fileSize, 1, f) != 1) + { + fclose(f); + printf("Couldn't write file %s!\n", fileName); + return -1; + } + + /* Close file */ + fclose(f); + return 0; +} + + +static int +compareFiles( + PatchedFile *patchedFile, + const char *originalFileName) +{ + const char *patchedFileName = patchedFile->name; + unsigned char *origChunk, *patchedChunk; + int origSize, patchedSize, i, patchCount; + PatchedByte *patches = NULL; + int patchesArrayCount = 0; + + /* Load both files */ + origChunk = loadFile(originalFileName, &origSize); + if (origChunk == NULL) + return -1; + patchedChunk = loadFile(patchedFileName, &patchedSize); + if (patchedChunk == NULL) + { + free(origChunk); + return -1; + } + if (origSize != patchedSize) + { + free(origChunk); + free(patchedChunk); + printf("File size of %s and %s differs (%d != %d)\n", + originalFileName, patchedFileName, + origSize, patchedSize); + return -1; + } + + /* Compare the files and record any differences */ + printf("Comparing %s to %s", originalFileName, patchedFileName); + for (i = 0, patchCount = 0; i < origSize; i++) + { + if (origChunk[i] != patchedChunk[i]) + { + patchCount++; + + /* Resize patches array if needed */ + if (patchesArrayCount < patchCount) + { + PatchedByte *newPatches; + newPatches = realloc(patches, patchCount * sizeof (PatchedByte)); + if (newPatches == NULL) + { + if (patches != NULL) + free(patches); + free(origChunk); + free(patchedChunk); + printf("\nOut of memory (tried to allocated %d bytes)\n", + patchCount * sizeof (PatchedByte)); + return -1; + } + patches = newPatches; + } + + /* Fill in patch info */ + patches[patchCount - 1].offset = i; + patches[patchCount - 1].expected = origChunk[i]; + patches[patchCount - 1].patched = patchedChunk[i]; + } + if ((i % (origSize / 40)) == 0) + printf("."); + } + printf(" %d changed bytes found.\n", patchCount); + + /* Unload the files */ + free(origChunk); [truncated at 1000 lines; 810660 more skipped]

19 years, 1 month

[sedwards] 17394: Changelog:

by sedwards＠svn.reactos.com

Changelog: MSAFD: Add PCH support, PSDK fixes MISC: Fix everything to build with PSDK changes PSDK Fixes: w32api/include/ssdl.h - reimplement based on Wine header which was more correct w32api/include/ntsecapi.h - Remove duplicate structures and add typedef w32api/include/winnt.h - add constant and missing structure w32api/include/winioctl.h - add missing IOCTL code w32api/include/winbase.h - add missing function declariation w32api/include/aclui.h - remove duplicate structure Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/advapi32/advapi32.h Modified: trunk/reactos/lib/msafd/include/helpers.h Deleted: trunk/reactos/lib/msafd/include/msafd.h Modified: trunk/reactos/lib/msafd/misc/dllmain.c Modified: trunk/reactos/lib/msafd/misc/event.c Modified: trunk/reactos/lib/msafd/misc/helpers.c Modified: trunk/reactos/lib/msafd/misc/sndrcv.c Modified: trunk/reactos/lib/msafd/misc/stubs.c Added: trunk/reactos/lib/msafd/msafd.h Modified: trunk/reactos/lib/msafd/msafd.xml Modified: trunk/reactos/lib/netapi32/wksta.c Modified: trunk/reactos/lib/secur32/lsa.c Modified: trunk/reactos/lib/snmpapi/snmpapi.c Modified: trunk/reactos/lib/ws2_32/include/ws2_32.h Modified: trunk/reactos/lib/ws2help/ws2help.c Modified: trunk/reactos/lib/ws2help/ws2help.h Modified: trunk/reactos/lib/wshirda/wshirda.c Modified: trunk/reactos/lib/wshirda/wshirda.h Modified: trunk/reactos/subsys/system/lsass/lsass.c Modified: trunk/reactos/subsys/system/winlogon/setup.c Modified: trunk/reactos/subsys/system/winlogon/winlogon.h Modified: trunk/reactos/w32api/include/aclui.h Modified: trunk/reactos/w32api/include/ntsecapi.h Modified: trunk/reactos/w32api/include/sddl.h Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/winioctl.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/aclui/precomp.h --- trunk/reactos/lib/aclui/precomp.h 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/aclui/precomp.h 2005-08-15 02:24:48 UTC (rev 17394) @@ -4,6 +4,7 @@ #include <prsht.h> #include <aclui.h> #include <sddl.h> +#include <winternl.h> #include <ntsecapi.h> #if SUPPORT_UXTHEME #include <uxtheme.h> _____ Modified: trunk/reactos/lib/advapi32/advapi32.h --- trunk/reactos/lib/advapi32/advapi32.h 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/advapi32/advapi32.h 2005-08-15 02:24:48 UTC (rev 17394) @@ -13,11 +13,13 @@ /* PSDK/NDK Headers */ #include <windows.h> -#include <ntsecapi.h> #include <accctrl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> +/* this has to go after the NDK when being used with the NDK */ +#include <ntsecapi.h> + #ifndef HAS_FN_PROGRESSW #define FN_PROGRESSW FN_PROGRESS #endif _____ Modified: trunk/reactos/lib/msafd/include/helpers.h --- trunk/reactos/lib/msafd/include/helpers.h 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/include/helpers.h 2005-08-15 02:24:48 UTC (rev 17394) @@ -7,7 +7,7 @@ #ifndef __HELPERS_H #define __HELPERS_H -#include <msafd.h> +//#include <msafd.h> typedef struct _HELPER_DATA { LIST_ENTRY Helpers; _____ Deleted: trunk/reactos/lib/msafd/include/msafd.h --- trunk/reactos/lib/msafd/include/msafd.h 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/include/msafd.h 2005-08-15 02:24:48 UTC (rev 17394) @@ -1,472 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h - * PURPOSE: Ancillary Function Driver DLL header - */ -#ifndef __MSAFD_H -#define __MSAFD_H - -#include <roscfg.h> -#include <stdlib.h> -#include <windows.h> -#include <wsahelp.h> -#include <winsock2.h> -#include <ws2spi.h> -#include <ddk/tdi.h> -#include <afd/shared.h> -#include <helpers.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <debug.h> - -extern HANDLE GlobalHeap; -extern WSPUPCALLTABLE Upcalls; -extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; -extern LIST_ENTRY SockHelpersListHead; -extern HANDLE SockEvent; -extern HANDLE SockAsyncCompletionPort; -extern BOOLEAN SockAsyncSelectCalled; - -typedef enum _SOCKET_STATE { - SocketOpen, - SocketBound, - SocketBoundUdp, - SocketConnected, - SocketClosed -} SOCKET_STATE, *PSOCKET_STATE; - -typedef struct _SOCK_SHARED_INFO { - SOCKET_STATE State; - INT AddressFamily; - INT SocketType; - INT Protocol; - INT SizeOfLocalAddress; - INT SizeOfRemoteAddress; - struct linger LingerData; - ULONG SendTimeout; - ULONG RecvTimeout; - ULONG SizeOfRecvBuffer; - ULONG SizeOfSendBuffer; - struct { - BOOLEAN Listening:1; - BOOLEAN Broadcast:1; - BOOLEAN Debug:1; - BOOLEAN OobInline:1; - BOOLEAN ReuseAddresses:1; - BOOLEAN ExclusiveAddressUse:1; - BOOLEAN NonBlocking:1; - BOOLEAN DontUseWildcard:1; - BOOLEAN ReceiveShutdown:1; - BOOLEAN SendShutdown:1; - BOOLEAN UseDelayedAcceptance:1; - BOOLEAN UseSAN:1; - }; // Flags - DWORD CreateFlags; - DWORD CatalogEntryId; - DWORD ServiceFlags1; - DWORD ProviderFlags; - GROUP GroupID; - DWORD GroupType; - INT GroupPriority; - INT SocketLastError; - HWND hWnd; - LONG Unknown; - DWORD SequenceNumber; - UINT wMsg; - LONG AsyncEvents; - LONG AsyncDisabledEvents; -} SOCK_SHARED_INFO, *PSOCK_SHARED_INFO; - -typedef struct _SOCKET_INFORMATION { - ULONG RefCount; - SOCKET Handle; - SOCK_SHARED_INFO SharedData; - DWORD HelperEvents; - PHELPER_DATA HelperData; - PVOID HelperContext; - PSOCKADDR LocalAddress; - PSOCKADDR RemoteAddress; - HANDLE TdiAddressHandle; - HANDLE TdiConnectionHandle; - PVOID AsyncData; - HANDLE EventObject; - LONG NetworkEvents; - CRITICAL_SECTION Lock; - PVOID SanData; - BOOL TrySAN; - SOCKADDR WSLocalAddress; - SOCKADDR WSRemoteAddress; -} SOCKET_INFORMATION, *PSOCKET_INFORMATION; - - -typedef struct _SOCKET_CONTEXT { - SOCK_SHARED_INFO SharedData; - ULONG SizeOfHelperData; - ULONG Padding; - SOCKADDR LocalAddress; - SOCKADDR RemoteAddress; - /* Plus Helper Data */ -} SOCKET_CONTEXT, *PSOCKET_CONTEXT; - -typedef struct _ASYNC_DATA { - PSOCKET_INFORMATION ParentSocket; - DWORD SequenceNumber; - IO_STATUS_BLOCK IoStatusBlock; - AFD_POLL_INFO AsyncSelectInfo; -} ASYNC_DATA, *PASYNC_DATA; - -SOCKET -WSPAPI -WSPAccept( - IN SOCKET s, - OUT LPSOCKADDR addr, - IN OUT LPINT addrlen, - IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPAddressToString( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN UINT wMsg, - IN LONG lEvent, - OUT LPINT lpErrno); - -INT -WSPAPI WSPBind( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCancelBlockingCall( - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCleanup( - OUT LPINT lpErrno); - -INT -WSPAPI -WSPCloseSocket( - IN SOCKET s, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPConnect( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPDuplicateSocket( - IN SOCKET s, - IN DWORD dwProcessId, - OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPEnumNetworkEvents( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPEventSelect( - IN SOCKET s, - IN WSAEVENT hEventObject, - IN LONG lNetworkEvents, - OUT LPINT lpErrno); - -BOOL -WSPAPI -WSPGetOverlappedResult( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped, - OUT LPDWORD lpcbTransfer, - IN BOOL fWait, - OUT LPDWORD lpdwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetPeerName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); - -BOOL -WSPAPI -WSPGetQOSByName( - IN SOCKET s, - IN OUT LPWSABUF lpQOSName, - OUT LPQOS lpQOS, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetSockName( - IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPGetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - OUT CHAR FAR* optval, - IN OUT LPINT optlen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPIoctl( - IN SOCKET s, - IN DWORD dwIoControlCode, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -SOCKET -WSPAPI -WSPJoinLeaf( - IN SOCKET s, - IN CONST SOCKADDR *name, - IN INT namelen, - IN LPWSABUF lpCallerData, - OUT LPWSABUF lpCalleeData, - IN LPQOS lpSQOS, - IN LPQOS lpGQOS, - IN DWORD dwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPListen( - IN SOCKET s, - IN INT backlog, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecv( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecvDisconnect( - IN SOCKET s, - OUT LPWSABUF lpInboundDisconnectData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPRecvFrom( - IN SOCKET s, - IN OUT LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd, - IN OUT LPDWORD lpFlags, - OUT LPSOCKADDR lpFrom, - IN OUT LPINT lpFromlen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSelect( - IN INT nfds, - IN OUT LPFD_SET readfds, - IN OUT LPFD_SET writefds, - IN OUT LPFD_SET exceptfds, - IN CONST LPTIMEVAL timeout, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSend( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSendDisconnect( - IN SOCKET s, - IN LPWSABUF lpOutboundDisconnectData, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSendTo( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent, - IN DWORD dwFlags, - IN CONST SOCKADDR *lpTo, - IN INT iTolen, - IN LPWSAOVERLAPPED lpOverlapped, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPSetSockOpt( - IN SOCKET s, - IN INT level, - IN INT optname, - IN CONST CHAR FAR* optval, - IN INT optlen, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPShutdown( - IN SOCKET s, - IN INT how, - OUT LPINT lpErrno); - -SOCKET -WSPAPI -WSPSocket( - IN INT af, - IN INT type, - IN INT protocol, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN GROUP g, - IN DWORD dwFlags, - OUT LPINT lpErrno); - -INT -WSPAPI -WSPStringToAddress( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength, - OUT LPINT lpErrno); - - -PSOCKET_INFORMATION GetSocketStructure( - SOCKET Handle -); - -VOID DeleteSocketStructure( SOCKET Handle ); - -int GetSocketInformation( - PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL -); - -int SetSocketInformation( - PSOCKET_INFORMATION Socket, - ULONG AfdInformationClass, - PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL -); - -int CreateContext( - PSOCKET_INFORMATION Socket -); - -int SockAsyncThread( - PVOID ThreadParam -); - -VOID -SockProcessAsyncSelect( - PSOCKET_INFORMATION Socket, - PASYNC_DATA AsyncData -); - -VOID -SockAsyncSelectCompletionRoutine( - PVOID Context, - PIO_STATUS_BLOCK IoStatusBlock -); - -BOOLEAN -SockCreateOrReferenceAsyncThread( - VOID -); - -BOOLEAN SockGetAsyncSelectHelperAfdHandle( - VOID -); - -VOID SockProcessQueuedAsyncSelect( - PVOID Context, - PIO_STATUS_BLOCK IoStatusBlock -); - -VOID -SockReenableAsyncSelectEvent ( - IN PSOCKET_INFORMATION Socket, - IN ULONG Event - ); - -DWORD MsafdReturnWithErrno( NTSTATUS Status, LPINT Errno, DWORD Received, - LPDWORD ReturnedBytes ); - -typedef VOID (*PASYNC_COMPLETION_ROUTINE)(PVOID Context, PIO_STATUS_BLOCK IoStatusBlock); - -#endif /* __MSAFD_H */ - -/* EOF */ _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-08-15 02:24:48 UTC (rev 17394) @@ -10,11 +10,10 @@ * CSH 01/09-2000 Created * Alex 16/07/2004 - Complete Rewrite */ -#include <roscfg.h> -#include <string.h> #include <msafd.h> -#include <helpers.h> +#include <debug.h> + #ifdef DBG //DWORD DebugTraceLevel = DEBUG_ULTRA; DWORD DebugTraceLevel = 0; _____ Modified: trunk/reactos/lib/msafd/misc/event.c --- trunk/reactos/lib/msafd/misc/event.c 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/misc/event.c 2005-08-15 02:24:48 UTC (rev 17394) @@ -10,9 +10,10 @@ * Alex 16/07/2004 - Complete Rewrite */ -#include <roscfg.h> #include <msafd.h> +#include <debug.h> + int WSPAPI WSPEventSelect( _____ Modified: trunk/reactos/lib/msafd/misc/helpers.c --- trunk/reactos/lib/msafd/misc/helpers.c 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/misc/helpers.c 2005-08-15 02:24:48 UTC (rev 17394) @@ -10,8 +10,9 @@ * Alex 16/07/2004 - Complete Rewrite */ #include <msafd.h> -#include <helpers.h> +#include <debug.h> + CRITICAL_SECTION HelperDLLDatabaseLock; LIST_ENTRY HelperDLLDatabaseListHead; _____ Modified: trunk/reactos/lib/msafd/misc/sndrcv.c --- trunk/reactos/lib/msafd/misc/sndrcv.c 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/misc/sndrcv.c 2005-08-15 02:24:48 UTC (rev 17394) @@ -10,9 +10,8 @@ * Alex 16/07/2004 - Complete Rewrite */ -#include <roscfg.h> -#include <string.h> #include <msafd.h> + #include <debug.h> INT _____ Modified: trunk/reactos/lib/msafd/misc/stubs.c --- trunk/reactos/lib/msafd/misc/stubs.c 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/misc/stubs.c 2005-08-15 02:24:48 UTC (rev 17394) @@ -9,6 +9,7 @@ */ #include <msafd.h> +#include <debug.h> INT WSPAPI _____ Added: trunk/reactos/lib/msafd/msafd.h --- trunk/reactos/lib/msafd/msafd.h 2005-08-15 01:41:24 UTC (rev 17393) +++ trunk/reactos/lib/msafd/msafd.h 2005-08-15 02:24:48 UTC (rev 17394) @@ -0,0 +1,474 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Ancillary Function Driver DLL + * FILE: include/msafd.h + * PURPOSE: Ancillary Function Driver DLL header + */ +#ifndef __MSAFD_H +#define __MSAFD_H + +#include <stdio.h> + +#include <stdlib.h> +#include <windows.h> +#include <winsock2.h> +#include <ws2spi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* This includes ntsecapi.h so it needs to come after the NDK */ +#include <wsahelp.h> +#include <ddk/tdi.h> +#include <afd/shared.h> +#include <helpers.h> + +extern HANDLE GlobalHeap; +extern WSPUPCALLTABLE Upcalls; +extern LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; +extern LIST_ENTRY SockHelpersListHead; +extern HANDLE SockEvent; +extern HANDLE SockAsyncCompletionPort; +extern BOOLEAN SockAsyncSelectCalled; + +typedef enum _SOCKET_STATE { + SocketOpen, + SocketBound, + SocketBoundUdp, + SocketConnected, + SocketClosed +} SOCKET_STATE, *PSOCKET_STATE; + +typedef struct _SOCK_SHARED_INFO { + SOCKET_STATE State; + INT AddressFamily; + INT SocketType; + INT Protocol; + INT SizeOfLocalAddress; + INT SizeOfRemoteAddress; + struct linger LingerData; + ULONG SendTimeout; + ULONG RecvTimeout; + ULONG SizeOfRecvBuffer; + ULONG SizeOfSendBuffer; + struct { + BOOLEAN Listening:1; + BOOLEAN Broadcast:1; + BOOLEAN Debug:1; + BOOLEAN OobInline:1; + BOOLEAN ReuseAddresses:1; + BOOLEAN ExclusiveAddressUse:1; + BOOLEAN NonBlocking:1; + BOOLEAN DontUseWildcard:1; + BOOLEAN ReceiveShutdown:1; + BOOLEAN SendShutdown:1; + BOOLEAN UseDelayedAcceptance:1; + BOOLEAN UseSAN:1; + }; // Flags + DWORD CreateFlags; + DWORD CatalogEntryId; + DWORD ServiceFlags1; + DWORD ProviderFlags; + GROUP GroupID; + DWORD GroupType; + INT GroupPriority; + INT SocketLastError; + HWND hWnd; + LONG Unknown; + DWORD SequenceNumber; + UINT wMsg; + LONG AsyncEvents; + LONG AsyncDisabledEvents; +} SOCK_SHARED_INFO, *PSOCK_SHARED_INFO; + +typedef struct _SOCKET_INFORMATION { + ULONG RefCount; + SOCKET Handle; + SOCK_SHARED_INFO SharedData; + DWORD HelperEvents; + PHELPER_DATA HelperData; + PVOID HelperContext; + PSOCKADDR LocalAddress; + PSOCKADDR RemoteAddress; + HANDLE TdiAddressHandle; + HANDLE TdiConnectionHandle; + PVOID AsyncData; + HANDLE EventObject; + LONG NetworkEvents; + CRITICAL_SECTION Lock; + PVOID SanData; + BOOL TrySAN; + SOCKADDR WSLocalAddress; + SOCKADDR WSRemoteAddress; +} SOCKET_INFORMATION, *PSOCKET_INFORMATION; + + +typedef struct _SOCKET_CONTEXT { + SOCK_SHARED_INFO SharedData; + ULONG SizeOfHelperData; + ULONG Padding; + SOCKADDR LocalAddress; + SOCKADDR RemoteAddress; + /* Plus Helper Data */ +} SOCKET_CONTEXT, *PSOCKET_CONTEXT; + +typedef struct _ASYNC_DATA { + PSOCKET_INFORMATION ParentSocket; + DWORD SequenceNumber; + IO_STATUS_BLOCK IoStatusBlock; + AFD_POLL_INFO AsyncSelectInfo; +} ASYNC_DATA, *PASYNC_DATA; + +SOCKET +WSPAPI +WSPAccept( + IN SOCKET s, + OUT LPSOCKADDR addr, + IN OUT LPINT addrlen, + IN LPCONDITIONPROC lpfnCondition, + IN DWORD dwCallbackData, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPAddressToString( + IN LPSOCKADDR lpsaAddress, + IN DWORD dwAddressLength, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo, + OUT LPWSTR lpszAddressString, + IN OUT LPDWORD lpdwAddressStringLength, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPAsyncSelect( + IN SOCKET s, + IN HWND hWnd, + IN UINT wMsg, + IN LONG lEvent, + OUT LPINT lpErrno); + +INT +WSPAPI WSPBind( + IN SOCKET s, + IN CONST SOCKADDR *name, + IN INT namelen, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPCancelBlockingCall( + OUT LPINT lpErrno); + +INT +WSPAPI +WSPCleanup( + OUT LPINT lpErrno); + +INT +WSPAPI +WSPCloseSocket( + IN SOCKET s, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPConnect( + IN SOCKET s, + IN CONST SOCKADDR *name, + IN INT namelen, + IN LPWSABUF lpCallerData, + OUT LPWSABUF lpCalleeData, + IN LPQOS lpSQOS, + IN LPQOS lpGQOS, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPDuplicateSocket( + IN SOCKET s, + IN DWORD dwProcessId, + OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPEnumNetworkEvents( + IN SOCKET s, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPEventSelect( + IN SOCKET s, + IN WSAEVENT hEventObject, + IN LONG lNetworkEvents, + OUT LPINT lpErrno); + +BOOL +WSPAPI +WSPGetOverlappedResult( + IN SOCKET s, + IN LPWSAOVERLAPPED lpOverlapped, + OUT LPDWORD lpcbTransfer, + IN BOOL fWait, + OUT LPDWORD lpdwFlags, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPGetPeerName( + IN SOCKET s, + OUT LPSOCKADDR name, + IN OUT LPINT namelen, + OUT LPINT lpErrno); + +BOOL +WSPAPI +WSPGetQOSByName( + IN SOCKET s, + IN OUT LPWSABUF lpQOSName, + OUT LPQOS lpQOS, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPGetSockName( + IN SOCKET s, + OUT LPSOCKADDR name, + IN OUT LPINT namelen, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPGetSockOpt( + IN SOCKET s, + IN INT level, + IN INT optname, + OUT CHAR FAR* optval, + IN OUT LPINT optlen, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPIoctl( + IN SOCKET s, + IN DWORD dwIoControlCode, + IN LPVOID lpvInBuffer, + IN DWORD cbInBuffer, + OUT LPVOID lpvOutBuffer, + IN DWORD cbOutBuffer, + OUT LPDWORD lpcbBytesReturned, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +SOCKET +WSPAPI +WSPJoinLeaf( + IN SOCKET s, + IN CONST SOCKADDR *name, + IN INT namelen, + IN LPWSABUF lpCallerData, + OUT LPWSABUF lpCalleeData, + IN LPQOS lpSQOS, + IN LPQOS lpGQOS, + IN DWORD dwFlags, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPListen( + IN SOCKET s, + IN INT backlog, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPRecv( + IN SOCKET s, + IN OUT LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesRecvd, + IN OUT LPDWORD lpFlags, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPRecvDisconnect( + IN SOCKET s, + OUT LPWSABUF lpInboundDisconnectData, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPRecvFrom( + IN SOCKET s, + IN OUT LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesRecvd, + IN OUT LPDWORD lpFlags, + OUT LPSOCKADDR lpFrom, + IN OUT LPINT lpFromlen, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPSelect( + IN INT nfds, + IN OUT LPFD_SET readfds, + IN OUT LPFD_SET writefds, + IN OUT LPFD_SET exceptfds, + IN CONST LPTIMEVAL timeout, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPSend( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesSent, + IN DWORD dwFlags, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPSendDisconnect( + IN SOCKET s, + IN LPWSABUF lpOutboundDisconnectData, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPSendTo( + IN SOCKET s, + IN LPWSABUF lpBuffers, + IN DWORD dwBufferCount, + OUT LPDWORD lpNumberOfBytesSent, + IN DWORD dwFlags, + IN CONST SOCKADDR *lpTo, + IN INT iTolen, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + IN LPWSATHREADID lpThreadId, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPSetSockOpt( + IN SOCKET s, + IN INT level, + IN INT optname, + IN CONST CHAR FAR* optval, + IN INT optlen, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPShutdown( + IN SOCKET s, + IN INT how, + OUT LPINT lpErrno); + +SOCKET +WSPAPI +WSPSocket( + IN INT af, + IN INT type, + IN INT protocol, + IN LPWSAPROTOCOL_INFOW lpProtocolInfo, + IN GROUP g, + IN DWORD dwFlags, + OUT LPINT lpErrno); + +INT +WSPAPI +WSPStringToAddress( [truncated at 1000 lines; 457 more skipped]

19 years, 1 month

[jimtabor] 17393: Merge change 17380 to 0.2.7 branch.

by jimtabor＠svn.reactos.com

Merge change 17380 to 0.2.7 branch. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.h _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.h --- branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.h 2005-08-15 01:19:24 UTC (rev 17392) +++ branches/ros-branch-0_2_7/reactos/subsys/system/cmd/cmd.h 2005-08-15 01:41:24 UTC (rev 17393) @@ -44,7 +44,7 @@ /* command line buffer length */ #ifdef __REACTOS__ -#define CMDLINE_LENGTH 512 +#define CMDLINE_LENGTH 8192 #else #define CMDLINE_LENGTH 8192 //#define CMDLINE_LENGTH 1024

19 years, 1 month

[gdalsnes] 17392: -revert some prev. changes (using wthread instead of queue) bcause filip didnt like it

by gdalsnes＠svn.reactos.com

-revert some prev. changes (using wthread instead of queue) bcause filip didnt like it -misc queue/thread-input changes Modified: branches/win32k rewrite attempt/win32k/include/caret.h Modified: branches/win32k rewrite attempt/win32k/include/desktop.h Modified: branches/win32k rewrite attempt/win32k/include/focus.h Modified: branches/win32k rewrite attempt/win32k/include/input.h Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h Modified: branches/win32k rewrite attempt/win32k/include/ntuser.h Modified: branches/win32k rewrite attempt/win32k/include/timer.h Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h Modified: branches/win32k rewrite attempt/win32k/include/win32.h Modified: branches/win32k rewrite attempt/win32k/include/win32k.h Modified: branches/win32k rewrite attempt/win32k/include/window.h Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c Modified: branches/win32k rewrite attempt/win32k/ntuser/guicheck.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hook.c Modified: branches/win32k rewrite attempt/win32k/ntuser/hotkey.c Modified: branches/win32k rewrite attempt/win32k/ntuser/input.c Modified: branches/win32k rewrite attempt/win32k/ntuser/keyboard.c Modified: branches/win32k rewrite attempt/win32k/ntuser/menu.c Modified: branches/win32k rewrite attempt/win32k/ntuser/message.c Modified: branches/win32k rewrite attempt/win32k/ntuser/misc.c Modified: branches/win32k rewrite attempt/win32k/ntuser/msgqueue.c Modified: branches/win32k rewrite attempt/win32k/ntuser/ntuser.c Modified: branches/win32k rewrite attempt/win32k/ntuser/painting.c Modified: branches/win32k rewrite attempt/win32k/ntuser/scrollbar.c Modified: branches/win32k rewrite attempt/win32k/ntuser/stubs.c Modified: branches/win32k rewrite attempt/win32k/ntuser/timer.c Modified: branches/win32k rewrite attempt/win32k/ntuser/vis.c Modified: branches/win32k rewrite attempt/win32k/ntuser/windc.c Modified: branches/win32k rewrite attempt/win32k/ntuser/window.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winpos.c Modified: branches/win32k rewrite attempt/win32k/ntuser/winsta.c _____ Modified: branches/win32k rewrite attempt/win32k/include/caret.h --- branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/caret.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -3,16 +3,8 @@ #define IDCARETTIMER (0xffff) -BOOL FASTCALL -UserDestroyCaret(PW32THREAD Win32Thread); -BOOL FASTCALL -UserSetCaretBlinkTime(UINT uMSeconds); - -VOID FASTCALL -UserDrawCaret(HWND hWnd); - #endif /* _WIN32K_CARET_H */ /* EOF */ _____ Modified: branches/win32k rewrite attempt/win32k/include/desktop.h --- branches/win32k rewrite attempt/win32k/include/desktop.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/desktop.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -16,7 +16,7 @@ /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; /* Pointer to the active queue. */ - PW32THREAD ActiveWThread; + PUSER_MESSAGE_QUEUE ActiveQueue; /* Rectangle of the work area */ RECT WorkArea; /* Handle of the desktop window. */ @@ -40,78 +40,7 @@ HWND hWnd; } SHELL_HOOK_WINDOW, *PSHELL_HOOK_WINDOW; -NTSTATUS FASTCALL -InitDesktopImpl(VOID); -NTSTATUS FASTCALL -CleanupDesktopImpl(VOID); - -NTSTATUS STDCALL -IntDesktopObjectCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes); - -VOID STDCALL -IntDesktopObjectDelete(PVOID DeletedObject); - -VOID FASTCALL -IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect); - -LRESULT CALLBACK -IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); - -HDC FASTCALL -IntGetScreenDC(VOID); - -PWINDOW_OBJECT FASTCALL -UserGetDesktopWindow (VOID); - -HWND FASTCALL -IntGetCurrentThreadDesktopWindow(VOID); - -PW32THREAD FASTCALL -UserGetFocusThread(VOID); - -VOID FASTCALL -IntSetFocusThread(PW32THREAD Thread); - -PDESKTOP_OBJECT FASTCALL -UserGetActiveDesktop(VOID); - -NTSTATUS FASTCALL -UserShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height); - -NTSTATUS FASTCALL -IntHideDesktop(PDESKTOP_OBJECT Desktop); - -HDESK FASTCALL -IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject); - -NTSTATUS FASTCALL -IntValidateDesktopHandle( - HDESK Desktop, - KPROCESSOR_MODE AccessMode, - ACCESS_MASK DesiredAccess, - PDESKTOP_OBJECT *Object); - -NTSTATUS FASTCALL -IntParseDesktopPath(PEPROCESS Process, - PUNICODE_STRING DesktopPath, - HWINSTA *hWinSta, - HDESK *hDesktop); - -BOOL FASTCALL -IntDesktopUpdatePerUserSettings(BOOL bEnable); - -BOOL IntRegisterShellHookWindow(HWND hWnd); -BOOL IntDeRegisterShellHookWindow(HWND hWnd); - -VOID IntShellHookNotify(WPARAM Message, LPARAM lParam); - -#define IntIsActiveDesktop(Desktop) \ - ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) - #endif /* _WIN32K_DESKTOP_H */ /* EOF */ _____ Modified: branches/win32k rewrite attempt/win32k/include/focus.h --- branches/win32k rewrite attempt/win32k/include/focus.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/focus.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -1,27 +1,5 @@ #ifndef _WIN32K_FOCUS_H #define _WIN32K_FOCUS_H -/* - * These functions take the window handles from current message queue. - */ -PWINDOW_OBJECT FASTCALL -UserGetCaptureWindow(); -PWINDOW_OBJECT FASTCALL -UserGetFocusWindow(); - - -/* - * These functions take the window handles from current thread queue. - */ -PWINDOW_OBJECT FASTCALL -UserGetThreadFocusWindow(); - -BOOL FASTCALL -IntMouseActivateWindow(PWINDOW_OBJECT Window); -BOOL FASTCALL -IntSetForegroundWindow(PWINDOW_OBJECT Window); -PWINDOW_OBJECT FASTCALL -IntSetActiveWindow(PWINDOW_OBJECT Window); - #endif /* _WIN32K_FOCUS_H */ _____ Modified: branches/win32k rewrite attempt/win32k/include/input.h --- branches/win32k rewrite attempt/win32k/include/input.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/input.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -1,21 +1,5 @@ #ifndef _WIN32K_INPUT_H #define _WIN32K_INPUT_H -#include <internal/kbd.h> -NTSTATUS FASTCALL -InitInputImpl(VOID); -NTSTATUS FASTCALL -InitKeyboardImpl(VOID); -PW32THREAD W32kGetPrimitiveWThread(VOID); -VOID W32kUnregisterPrimitiveWThread(VOID); -PKBDTABLES W32kGetDefaultKeyLayout(VOID); -VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); -BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); -BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); -BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); - -#define ThreadHasInputAccess(W32Thread) \ - (TRUE) - #endif /* _WIN32K_INPUT_H */ _____ Modified: branches/win32k rewrite attempt/win32k/include/msgqueue.h --- branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/msgqueue.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -1,7 +1,6 @@ #ifndef _WIN32K_MSGQUEUE_H #define _WIN32K_MSGQUEUE_H -#include "caret.h" #include "hook.h" #define MSQ_HUNG 5000 @@ -54,26 +53,40 @@ int caret_state; /* caret on/off state */ struct list msg_list; /* list of hardware messages */ unsigned char keystate[256]; /* state of each key */ + + typedef struct _THRDCARETINFO + { + HWND hWnd; + HBITMAP Bitmap; + POINT Pos; + SIZE Size; + BYTE Visible; + BYTE Showing; +} THRDCARETINFO, *PTHRDCARETINFO; #endif + LONG RefCount; /* Current window with focus (ie. receives keyboard input) for this queue. */ - HWND FocusWindow; + HWND hFocusWindow; /* Current capture window for this queue. */ - HWND CaptureWindow; + HWND hCaptureWindow; /* Current active window for this queue. */ - HWND ActiveWindow; + HWND hActiveWindow; /* Current menu owner window for this queue */ - HWND MenuOwner; + HWND hMenuOwner; /* Current move/size window for this queue */ - HWND MoveSize; + HWND hMoveSize; /* Caret information for this queue */ THRDCARETINFO CaretInfo; + /* Desktop that the message queue is attached to */ + struct _DESKTOP_OBJECT* Desktop; } USER_THREAD_INPUT, *PUSER_THREAD_INPUT; typedef struct _USER_MESSAGE_QUEUE { + PUSER_THREAD_INPUT Input; /* Queue of messages sent to the queue. */ LIST_ENTRY SentMessagesListHead; /* Queue of messages posted to the queue. */ @@ -109,11 +122,12 @@ PHOOKTABLE Hooks; /* queue state tracking */ - WORD WakeMask; - WORD WakeBits; -// WORD QueueBits; - WORD ChangedBits; - WORD ChangedMask; + /* wake mask for current queue content */ + WORD QueueMask; + WORD QueueBits; + /* wake mask for queue content changes */ + WORD ChangesMask; + WORD ChangesBits; /* extra message information */ LPARAM ExtraInfo; @@ -121,8 +135,6 @@ LIST_ENTRY DispatchingMessagesHead; /* messages that are currently dispatched by this message queue, required for cleanup */ LIST_ENTRY LocalDispatchingMessagesHead; - /* Desktop that the message queue is attached to */ - struct _DESKTOP_OBJECT *Desktop; } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; _____ Modified: branches/win32k rewrite attempt/win32k/include/ntuser.h --- branches/win32k rewrite attempt/win32k/include/ntuser.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/ntuser.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -41,9 +41,13 @@ #define UserEnterExclusive() \ { \ /* DPRINT1("try lock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ - ASSERT(UserLock.Owner != KeGetCurrentThread()); \ + if (UserLock.Owner == KeGetCurrentThread()){ \ + DPRINT1("file %s, line %i\n",_file, _line); \ + ASSERT(FALSE); \ + } \ UUserEnterExclusive(); \ ASSERT(InterlockedIncrement(&_locked) == 1 /*> 0*/); \ + _file = __FILE__; _line = __LINE__; \ /* DPRINT("got lock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ } @@ -51,7 +55,11 @@ { \ ASSERT(InterlockedDecrement(&_locked) == 0/*>= 0*/); \ /*DPRINT("unlock, %s, %i (%i)\n",__FILE__,__LINE__, _locked);*/ \ - ASSERT(UserLock.Owner == KeGetCurrentThread()); \ + if (UserLock.Owner != KeGetCurrentThread()) { \ + DPRINT1("file %s, line %i\n",_file, _line); \ + ASSERT(FALSE); \ + } \ + _file = __FILE__; _line = __LINE__; \ UUserLeave(); \ } _____ Modified: branches/win32k rewrite attempt/win32k/include/timer.h --- branches/win32k rewrite attempt/win32k/include/timer.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/timer.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -7,7 +7,7 @@ LIST_ENTRY ListEntry; LARGE_INTEGER ExpiryTime; PWINDOW_OBJECT Wnd; - PW32THREAD WThread; + PUSER_MESSAGE_QUEUE Queue; UINT_PTR IDEvent; UINT Period; TIMERPROC TimerFunc; _____ Modified: branches/win32k rewrite attempt/win32k/include/userfuncs.h --- branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/userfuncs.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -1,6 +1,9 @@ #ifndef _WIN32K_USERFUNCS_H #define _WIN32K_USERFUNCS_H + +#define QUEUE_2_WTHREAD(queue) CONTAINING_RECORD(queue, W32THREAD, Queue) + /*************** KEYBOARD.C ******************/ DWORD FASTCALL @@ -31,9 +34,80 @@ inline PDESKTOP_OBJECT FASTCALL UserGetCurrentDesktop(); +NTSTATUS FASTCALL +InitDesktopImpl(VOID); +NTSTATUS FASTCALL +CleanupDesktopImpl(VOID); + +NTSTATUS STDCALL +IntDesktopObjectCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); +VOID STDCALL +IntDesktopObjectDelete(PVOID DeletedObject); +VOID FASTCALL +IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect); + +LRESULT CALLBACK +IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + +HDC FASTCALL +IntGetScreenDC(VOID); + +PWINDOW_OBJECT FASTCALL +UserGetDesktopWindow (VOID); + +HWND FASTCALL +IntGetCurrentThreadDesktopWindow(VOID); + +PUSER_MESSAGE_QUEUE FASTCALL +UserGetFocusQueue(VOID); + +VOID FASTCALL +IntSetFocusQueue(PUSER_MESSAGE_QUEUE Thread); + +PDESKTOP_OBJECT FASTCALL +UserGetActiveDesktop(VOID); + +NTSTATUS FASTCALL +UserShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height); + +NTSTATUS FASTCALL +IntHideDesktop(PDESKTOP_OBJECT Desktop); + +HDESK FASTCALL +IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject); + +NTSTATUS FASTCALL +IntValidateDesktopHandle( + HDESK Desktop, + KPROCESSOR_MODE AccessMode, + ACCESS_MASK DesiredAccess, + PDESKTOP_OBJECT *Object); + +NTSTATUS FASTCALL +IntParseDesktopPath(PEPROCESS Process, + PUNICODE_STRING DesktopPath, + HWINSTA *hWinSta, + HDESK *hDesktop); + +BOOL FASTCALL +IntDesktopUpdatePerUserSettings(BOOL bEnable); + +BOOL IntRegisterShellHookWindow(HWND hWnd); +BOOL IntDeRegisterShellHookWindow(HWND hWnd); + +VOID IntShellHookNotify(WPARAM Message, LPARAM lParam); + +#define IntIsActiveDesktop(Desktop) \ + ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) + + + /************************* ACCELERATOR.C ***********************/ inline PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hCursor); @@ -46,13 +120,56 @@ ULONG FASTCALL UserGetSystemMetrics(ULONG Index); -/* input.h */ +/******************** INPUT.C ********************************/ + +#include <internal/kbd.h> + +BOOLEAN attach_thread_input( PW32THREAD thread_from, PW32THREAD thread_to ); +PUSER_THREAD_INPUT create_thread_input( PW32THREAD thread ); +inline VOID FASTCALL UserDereferenceInput(PUSER_THREAD_INPUT Input); + +NTSTATUS FASTCALL +InitInputImpl(VOID); +NTSTATUS FASTCALL +InitKeyboardImpl(VOID); +PUSER_MESSAGE_QUEUE W32kGetPrimitiveQueue(VOID); +VOID W32kUnregisterPrimitiveQueue(VOID); +PKBDTABLES W32kGetDefaultKeyLayout(VOID); +VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); +BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); +BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); +BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); + +#define ThreadHasInputAccess(W32Thread) \ + (TRUE) + NTSTATUS FASTCALL UserAcquireOrReleaseInputOwnership(BOOLEAN Release); /******************** FOCUS.C ********************************/ +/* + * These functions take the window handles from current message queue. + */ PWINDOW_OBJECT FASTCALL +UserGetCaptureWindow(); +PWINDOW_OBJECT FASTCALL +UserGetFocusWindow(); + +/* + * These functions take the window handles from current thread queue. + */ +PWINDOW_OBJECT FASTCALL +UserGetThreadFocusWindow(); + +BOOL FASTCALL +IntMouseActivateWindow(PWINDOW_OBJECT Window); +BOOL FASTCALL +IntSetForegroundWindow(PWINDOW_OBJECT Window); +PWINDOW_OBJECT FASTCALL +IntSetActiveWindow(PWINDOW_OBJECT Window); + +PWINDOW_OBJECT FASTCALL UserGetForegroundWindow(VOID); PWINDOW_OBJECT FASTCALL @@ -171,7 +288,15 @@ BOOL FASTCALL UserSwitchCaretShowing(PTHRDCARETINFO Info); +BOOL FASTCALL +UserDestroyCaret(PW32THREAD Win32Thread); +BOOL FASTCALL +UserSetCaretBlinkTime(UINT uMSeconds); + +VOID FASTCALL +UserDrawCaret(HWND hWnd); + /************************* WINPOS.C ****************************/ @@ -265,7 +390,6 @@ HWND FASTCALL MsqSetStateWindow(PUSER_THREAD_INPUT Input, ULONG Type, HWND hWnd); -inline PUSER_THREAD_INPUT FASTCALL UserGetCurrentInput(); VOID FASTCALL MsqCleanupWindow(PWINDOW_OBJECT pWindow); @@ -281,7 +405,7 @@ PTIMER_ENTRY FASTCALL UserFindExpiredTimer( - PW32THREAD W32Thread, + PUSER_MESSAGE_QUEUE MessageQueue, PWINDOW_OBJECT Wnd OPTIONAL, UINT MsgFilterMin, UINT MsgFilterMax, @@ -407,7 +531,7 @@ MsqKillTimer(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT_PTR IDEvent, UINT Msg); BOOLEAN FASTCALL -MsqGetTimerMessage(PW32THREAD W32Thread, +MsqGetTimerMessage(PUSER_MESSAGE_QUEUE Queue, HWND WndFilter, UINT MsgFilterMin, UINT MsgFilterMax, MSG *Msg, BOOLEAN Restart); BOOLEAN FASTCALL @@ -451,8 +575,7 @@ UserGetWindowDC(PWINDOW_OBJECT Wnd); /* div */ -#define UserGetCurrentQueue() \ -((PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->Queue) +#define UserGetCurrentQueue() (&PsGetWin32Thread()->Queue) _____ Modified: branches/win32k rewrite attempt/win32k/include/win32.h --- branches/win32k rewrite attempt/win32k/include/win32.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/win32.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -5,8 +5,7 @@ typedef struct _W32THREAD { - struct _USER_MESSAGE_QUEUE* Queue; - struct _USER_THREAD_INPUT* Input; + USER_MESSAGE_QUEUE Queue; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; struct _KBDTABLES* KeyboardLayout; _____ Modified: branches/win32k rewrite attempt/win32k/include/win32k.h --- branches/win32k rewrite attempt/win32k/include/win32k.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/win32k.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ /* Internal Win32k Headers */ +#include <include/msgqueue.h> #include <include/win32.h> #include <include/ssec.h> #include <include/accelerator.h> @@ -36,7 +37,6 @@ #include <include/menu.h> #include <include/monitor.h> #include <include/mouse.h> -#include <include/msgqueue.h> #include <include/object.h> #include <include/paint.h> #include <include/palette.h> _____ Modified: branches/win32k rewrite attempt/win32k/include/window.h --- branches/win32k rewrite attempt/win32k/include/window.h 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/include/window.h 2005-08-15 01:19:24 UTC (rev 17392) @@ -53,7 +53,7 @@ /* Position of the window's client area. */ RECT ClientRect; /* Handle for the window. */ - HANDLE Self; + HWND hSelf; /* Window flags. */ ULONG Flags; /* Window menu handle or window id */ @@ -74,7 +74,7 @@ /* Handle to the parent window. */ struct _WINDOW_OBJECT* ParentWnd; /* Handle to the owner window. */ - HANDLE Owner; + HWND hOwner; /* DC Entries (DCE) */ PDCE Dce; /* Property list head.*/ @@ -86,8 +86,11 @@ BOOL Unicode; WNDPROC WndProcA; WNDPROC WndProcW; - /* owner thread */ + /* owner queue/thread */ + union { + PUSER_MESSAGE_QUEUE Queue; PW32THREAD WThread; + }; HWND hWndLastPopup; /* handle to last active popup window (wine doesn't use pointer, for unk. reason)*/ PINTERNALPOS InternalPos; ULONG Status; @@ -130,7 +133,7 @@ (WndObj->W32Thread->Thread->Tcb.Win32Thread == W32Thread)) #endif -#define IntWndBelongsToThread(WndObj, _W32Thread) ((WndObj)->WThread == (_W32Thread)) +#define IntWndBelongsToThread(WndObj, _W32Thread) (QUEUE_2_WTHREAD((WndObj)->Queue) == (_W32Thread)) #define IntGetWndThreadId(WndObj) \ _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/accelerator.c --- branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/ntuser/accelerator.c 2005-08-15 01:19:24 UTC (rev 17392) @@ -273,11 +273,11 @@ DPRINT("found accel for virt_key %04x (scan %04x)\n", wParam, 0xff & HIWORD(lParam)); - DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n", + DPRINT("UserGetKeyState(VK_SHIFT) = 0x%x\n", UserGetKeyState(VK_SHIFT)); - DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n", + DPRINT("UserGetKeyState(VK_CONTROL) = 0x%x\n", UserGetKeyState(VK_CONTROL)); - DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n", + DPRINT("UserGetKeyState(VK_MENU) = 0x%x\n", UserGetKeyState(VK_MENU)); if (UserGetKeyState(VK_SHIFT) & 0x8000) _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/caret.c --- branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/ntuser/caret.c 2005-08-15 01:19:24 UTC (rev 17392) @@ -43,12 +43,13 @@ if(!W32Thread) return FALSE; - IntHideCaret(&W32Thread->Input->CaretInfo); - W32Thread->Input->CaretInfo.Bitmap = (HBITMAP)0; - W32Thread->Input->CaretInfo.hWnd = (HWND)0; - W32Thread->Input->CaretInfo.Size.cx = W32Thread->Input->CaretInfo.Size.cy = 0; - W32Thread->Input->CaretInfo.Showing = 0; - W32Thread->Input->CaretInfo.Visible = 0; + IntHideCaret(&W32Thread->Queue.Input->CaretInfo); + RtlZeroMemory(&W32Thread->Queue.Input->CaretInfo, sizeof(THRDCARETINFO)); +// W32Thread->Queue.Input->CaretInfo.Bitmap = (HBITMAP)0; +// W32Thread->Queue.Input->CaretInfo.hWnd = (HWND)0; +// W32Thread->Queue.Input->CaretInfo.Size.cx = W32Thread->Queue.Input->CaretInfo.Size.cy = 0; +// W32Thread->Queue.Input->CaretInfo.Showing = 0; +// W32Thread->Queue.Input->CaretInfo.Visible = 0; return TRUE; } @@ -165,7 +166,7 @@ { PUSER_THREAD_INPUT Input; - Input = UserGetCurrentInput(); + Input = UserGetCurrentQueue()->Input; if(Input->CaretInfo.hWnd) { @@ -189,7 +190,7 @@ { PUSER_THREAD_INPUT Input; - Input = UserGetCurrentInput(); + Input = UserGetCurrentQueue()->Input; if(Input->CaretInfo.hWnd) { @@ -208,7 +209,7 @@ { PUSER_THREAD_INPUT Input; - Input = UserGetCurrentInput(); + Input = UserGetCurrentQueue()->Input; if(Input->CaretInfo.hWnd && Input->CaretInfo.Visible && Input->CaretInfo.Showing) @@ -242,13 +243,13 @@ RETURN(FALSE); } - if(WindowObject->WThread != PsGetWin32Thread()) + if(WindowObject->Queue != UserGetCurrentQueue()) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } - Input = UserGetCurrentInput(); + Input = UserGetCurrentQueue()->Input; if (Input->CaretInfo.Visible) { @@ -309,7 +310,7 @@ DPRINT("Enter NtUserGetCaretPos\n"); UserEnterExclusive(); - Input = UserGetCurrentInput(); + Input = UserGetCurrentQueue()->Input; Status = MmCopyToCaller(lpPoint, &(Input->CaretInfo.Pos), sizeof(POINT)); if(!NT_SUCCESS(Status)) @@ -333,10 +334,10 @@ HWND hWnd) { PWINDOW_OBJECT WindowObject; - PUSER_THREAD_INPUT Input; + PUSER_MESSAGE_QUEUE Queue; DECLARE_RETURN(BOOL); - DPRINT1("Enter NtUserHideCaret\n"); + DPRINT("Enter NtUserHideCaret\n"); UserEnterExclusive(); WindowObject = IntGetWindowObject(hWnd); @@ -346,33 +347,33 @@ RETURN(FALSE); } - if(WindowObject->WThread != PsGetWin32Thread()) + Queue = UserGetCurrentQueue(); + + if(WindowObject->Queue != Queue) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } - Input = UserGetCurrentInput(); - - if(Input->CaretInfo.hWnd != hWnd) + if(Queue->Input->CaretInfo.hWnd != hWnd) { SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN(FALSE); } - if(Input->CaretInfo.Visible) + if(Queue->Input->CaretInfo.Visible) { UserKillTimer(WindowObject, IDCARETTIMER, TRUE); - IntHideCaret(&Input->CaretInfo); - Input->CaretInfo.Visible = 0; - Input->CaretInfo.Showing = 0; + IntHideCaret(&Queue->Input->CaretInfo); + Queue->Input->CaretInfo.Visible = 0; + Queue->Input->CaretInfo.Showing = 0; } RETURN(TRUE); CLEANUP: - DPRINT1("Leave NtUserHideCaret, ret=%i\n",_ret_); + DPRINT("Leave NtUserHideCaret, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -382,32 +383,32 @@ BOOL FASTCALL UserHideCaret(PWINDOW_OBJECT Wnd) { - PUSER_THREAD_INPUT Input; - + PUSER_MESSAGE_QUEUE Queue; + ASSERT(Wnd); - if(Wnd->WThread != PsGetWin32Thread()) + Queue = UserGetCurrentQueue(); + + if(Wnd->Queue != Queue) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - Input = UserGetCurrentInput(); - - if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) + if(Queue->Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(Input->CaretInfo.Visible) + if(Queue->Input->CaretInfo.Visible) { UserKillTimer(Wnd, IDCARETTIMER, TRUE); //FIXME: fix IntHideCaret vs. NtHideCaret vs. UserHideCaret mess - IntHideCaret(&Input->CaretInfo); - Input->CaretInfo.Visible = 0; - Input->CaretInfo.Showing = 0; + IntHideCaret(&Queue->Input->CaretInfo); + Queue->Input->CaretInfo.Visible = 0; + Queue->Input->CaretInfo.Showing = 0; } return(TRUE); @@ -445,30 +446,30 @@ BOOL FASTCALL UserShowCaret(PWINDOW_OBJECT Wnd) { - PUSER_THREAD_INPUT Input; + PUSER_MESSAGE_QUEUE Queue; ASSERT(Wnd); - if(Wnd->WThread != PsGetWin32Thread()) + Queue = UserGetCurrentQueue(); + + if(Wnd->Queue != Queue) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - Input = UserGetCurrentInput(); - - if(Input->CaretInfo.hWnd != GetHwnd(Wnd)) + if(Queue->Input->CaretInfo.hWnd != GetHwnd(Wnd)) { SetLastWin32Error(ERROR_ACCESS_DENIED); return(FALSE); } - if(!Input->CaretInfo.Visible) + if(!Queue->Input->CaretInfo.Visible) { - Input->CaretInfo.Visible = 1; - if(!Input->CaretInfo.Showing) + Queue->Input->CaretInfo.Visible = 1; + if(!Queue->Input->CaretInfo.Showing) { - IntSendMessage(Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + IntSendMessage(Queue->Input->CaretInfo.hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } UserSetTimer(Wnd, IDCARETTIMER, UserGetCaretBlinkTime(), NULL, TRUE); } _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/class.c --- branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/ntuser/class.c 2005-08-15 01:19:24 UTC (rev 17392) @@ -430,7 +430,7 @@ DPRINT("Enter NtUserRegisterClassExWOW\n"); UserEnterExclusive(); - CHECKPOINT; + if (!lpwcx) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -507,7 +507,7 @@ if ((int)Offset >= 0) { - DPRINT("GetClassLong(%x, %d)\n", WindowObject->Self, Offset); + DPRINT("GetClassLong(%x, %d)\n", WindowObject->hSelf, Offset); if ((Offset + sizeof(LONG)) > WindowObject->Class->cbClsExtra) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -594,7 +594,7 @@ if ((int)Offset >= 0) { - DPRINT("SetClassLong(%x, %d, %x)\n", WindowObject->Self, Offset, dwNewLong); + DPRINT("SetClassLong(%x, %d, %x)\n", WindowObject->hSelf, Offset, dwNewLong); if ((Offset + sizeof(LONG)) > WindowObject->Class->cbClsExtra) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -625,7 +625,7 @@ if ((!Owner) && (!Parent)) { - IntShellHookNotify(HSHELL_REDRAW, (LPARAM) WindowObject->Self); + IntShellHookNotify(HSHELL_REDRAW, (LPARAM) WindowObject->hSelf); } break; _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/desktop.c --- branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/ntuser/desktop.c 2005-08-15 01:19:24 UTC (rev 17392) @@ -427,8 +427,8 @@ return Ret; } -PW32THREAD FASTCALL -UserGetFocusThread(VOID) +PUSER_MESSAGE_QUEUE FASTCALL +UserGetFocusQueue(VOID) { PDESKTOP_OBJECT pdo = UserGetActiveDesktop(); if (!pdo) @@ -436,43 +436,41 @@ DPRINT("No active desktop\n"); return(NULL); } - return pdo->ActiveWThread; + return pdo->ActiveQueue; } VOID FASTCALL -IntSetFocusThread(PW32THREAD NewThread) +IntSetFocusQueue(PUSER_MESSAGE_QUEUE NewQueue) { - PW32THREAD Old; + PUSER_MESSAGE_QUEUE OldQueue; PDESKTOP_OBJECT pdo = UserGetActiveDesktop(); if (!pdo) { DPRINT("No active desktop\n"); return; } - if(NewThread) + if(NewQueue) { //FIXME: move to thread? - if(NewThread->Queue->Desktop != NULL) + if(NewQueue->Input->Desktop != NULL) { DPRINT("Message Queue already attached to another desktop!\n"); return; } //IntReferenceMessageQueue(NewQueue); - //InterlockedExchange((LONG*)&NewQueue->Desktop, (LONG)pdo); //FIXME: move to thread? - NewThread->Queue->Desktop = pdo; + NewQueue->Input->Desktop = pdo; } -// Old = (PUSER_MESSAGE_QUEUE)InterlockedExchange((LONG*)&pdo->ActiveMessageQueue , (LONG)NewQueue); - Old = pdo->ActiveWThread; + OldQueue = pdo->ActiveQueue; - if (Old) - Old->Queue->Desktop = NULL; + if (OldQueue) + OldQueue->Input->Desktop = NULL; - pdo->ActiveWThread = NewThread; + pdo->ActiveQueue = NewQueue; // if(Old != NULL) // { @@ -870,7 +868,7 @@ IntGetDesktopWorkArea(DesktopObject, NULL); /* Initialize some local (to win32k) desktop state. */ - DesktopObject->ActiveWThread = NULL; + DesktopObject->ActiveQueue = NULL; Status = ObInsertObject( (PVOID)DesktopObject, _____ Modified: branches/win32k rewrite attempt/win32k/ntuser/focus.c --- branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-15 01:16:58 UTC (rev 17391) +++ branches/win32k rewrite attempt/win32k/ntuser/focus.c 2005-08-15 01:19:24 UTC (rev 17392) @@ -27,23 +27,22 @@ PWINDOW_OBJECT FASTCALL UserGetCaptureWindow() { - PW32THREAD ForegroundW32Thread = UserGetFocusThread(); - return ForegroundW32Thread ? GetWnd(ForegroundW32Thread->Input->CaptureWindow) : 0; + PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusQueue(); + return ForegroundQueue ? GetWnd(ForegroundQueue->Input->hCaptureWindow) : 0; } PWINDOW_OBJECT FASTCALL UserGetFocusWindow() { - PW32THREAD ForegroundW32Thread = UserGetFocusThread(); - return ForegroundW32Thread ? GetWnd(ForegroundW32Thread->Input->FocusWindow) : 0; + PUSER_MESSAGE_QUEUE ForegroundQueue = UserGetFocusQueue(); + return ForegroundQueue ? GetWnd(ForegroundQueue->Input->hFocusWindow) : 0; } PWINDOW_OBJECT FASTCALL UserGetThreadFocusWindow() { - PW32THREAD W32Thread; - W32Thread = PsGetWin32Thread(); - return W32Thread ? GetWnd(W32Thread->Input->FocusWindow) : 0; + PUSER_MESSAGE_QUEUE Queue = UserGetCurrentQueue(); + return Queue ? GetWnd(Queue->Input->hFocusWindow) : 0; } VOID FASTCALL @@ -126,14 +125,14 @@ for(Child = Root->FirstChild; Child; Child = Child->NextSibling) { - OwnerWnd = IntGetWindowObject(Child->Owner); + OwnerWnd = IntGetWindowObject(Child->hOwner); if(!OwnerWnd) continue; if(OwnerWnd == Owner) { - Ret = Child->Self; + Ret = Child->hSelf; return Ret; } } @@ -144,11 +143,11 @@ STATIC BOOL FASTCALL IntSetForegroundAndFocusWindow(PWINDOW_OBJECT Window, PWINDOW_OBJECT FocusWindow, BOOL MouseActivate) { - HWND hWnd = Window->Self; + HWND hWnd = Window->hSelf; HWND hWndPrev = NULL; - HWND hWndFocus = FocusWindow->Self; + HWND hWndFocus = FocusWindow->hSelf; HWND hWndFocusPrev = NULL; - PW32THREAD PrevForegroundW32Thread; + PUSER_MESSAGE_QUEUE PrevForegroundQueue; [truncated at 1000 lines; 3274 more skipped]

19 years, 1 month

[gdalsnes] 17391: change proto

by gdalsnes＠svn.reactos.com

change proto Modified: branches/win32k rewrite attempt/inc_w32k/ntuser.h _____ Modified: branches/win32k rewrite attempt/inc_w32k/ntuser.h --- branches/win32k rewrite attempt/inc_w32k/ntuser.h 2005-08-14 22:27:15 UTC (rev 17390) +++ branches/win32k rewrite attempt/inc_w32k/ntuser.h 2005-08-15 01:16:58 UTC (rev 17391) @@ -46,12 +46,12 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOLEAN STDCALL NtUserAttachThreadInput( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + DWORD tidFrom, + DWORD tidTo, + BOOLEAN attach); HDC STDCALL NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* lPs);

19 years, 1 month

[jimtabor] 17390: Create Usb bulk storage template.

by jimtabor＠svn.reactos.com

Create Usb bulk storage template. Added: trunk/reactos/drivers/usb/usbstor/ Added: trunk/reactos/drivers/usb/usbstor/usbstor.c Added: trunk/reactos/drivers/usb/usbstor/usbstor.def Added: trunk/reactos/drivers/usb/usbstor/usbstor.h Added: trunk/reactos/drivers/usb/usbstor/usbstor.rc Added: trunk/reactos/drivers/usb/usbstor/usbstor.xml _____ Added: trunk/reactos/drivers/usb/usbstor/usbstor.c --- trunk/reactos/drivers/usb/usbstor/usbstor.c 2005-08-14 21:44:58 UTC (rev 17389) +++ trunk/reactos/drivers/usb/usbstor/usbstor.c 2005-08-14 22:27:15 UTC (rev 17390) @@ -0,0 +1,154 @@ +/* + * ReactOS kernel + * Copyright (C) 2001, 2002, 2003, 2004, 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ +/* + * Universal Serial Bus Bulk Storage Driver + * + * Written by James Tabor + * + */ + +/* INCLUDES ******************************************************************/ + +#define NDEBUG +#define INITGUID +#include "usbstor.h" + +/* PUBLIC AND PRIVATE FUNCTIONS **********************************************/ + +NTSTATUS STDCALL +IrpStub(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS STDCALL +AddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT pdo) +{ +return STATUS_SUCCESS; +} + +VOID STDCALL +DriverUnload(PDRIVER_OBJECT DriverObject) +{ +} + +VOID STDCALL +StartIo(PUSBSTOR_DEVICE_EXTENSION DeviceExtension, + PIRP Irp) +{ +} + +static NTSTATUS STDCALL +DispatchClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + + +static NTSTATUS STDCALL +DispatchScsi(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchReadWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ +return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) +{ + DPRINT1("USBSTOR: IRP_MJ_POWER unimplemented\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + + +/* + * Standard DriverEntry method. + */ +NTSTATUS STDCALL +DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) +{ + ULONG i; + DPRINT("********* USB Storage *********\n"); + + DriverObject->DriverUnload = DriverUnload; + DriverObject->DriverExtension->AddDevice = AddDevice; + + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = IrpStub; + + DriverObject->DriverStartIo = (PVOID)StartIo; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_READ] = DispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = DispatchReadWrite; + +/* Scsi Miniport support */ + DriverObject->MajorFunction[IRP_MJ_SCSI] = DispatchScsi; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = DispatchSystemControl; + + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; + + return STATUS_SUCCESS; +} + _____ Added: trunk/reactos/drivers/usb/usbstor/usbstor.def --- trunk/reactos/drivers/usb/usbstor/usbstor.def 2005-08-14 21:44:58 UTC (rev 17389) +++ trunk/reactos/drivers/usb/usbstor/usbstor.def 2005-08-14 22:27:15 UTC (rev 17390) @@ -0,0 +1,2 @@ +LIBRARY usbstor.sys +EXPORTS _____ Added: trunk/reactos/drivers/usb/usbstor/usbstor.h --- trunk/reactos/drivers/usb/usbstor/usbstor.h 2005-08-14 21:44:58 UTC (rev 17389) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h 2005-08-14 22:27:15 UTC (rev 17390) @@ -0,0 +1,83 @@ +#include <ddk/ntddk.h> +#include <ddk/usbdi.h> +#include <ddk/usbiodef.h> +#include <initguid.h> +#include <debug.h> + +#define USB_STOR_TAG TAG('u','s','b','s') +#define USB_MAXCHILDREN (16) + +NTSTATUS STDCALL +IoAttachDeviceToDeviceStackSafe( + IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice, + OUT PDEVICE_OBJECT *AttachedToDeviceObject); + +typedef struct _USBSTOR_DEVICE_EXTENSION +{ + BOOLEAN IsFDO; + struct usb_device* dev; + PDEVICE_OBJECT LowerDevice; + + PDEVICE_OBJECT Children[USB_MAXCHILDREN]; + + /* Fields valid only when IsFDO == FALSE */ + UNICODE_STRING DeviceDescription; // REG_SZ + UNICODE_STRING DeviceId; // REG_SZ + UNICODE_STRING InstanceId; // REG_SZ + UNICODE_STRING HardwareIds; // REG_MULTI_SZ + UNICODE_STRING CompatibleIds; // REG_MULTI_SZ + UNICODE_STRING SymbolicLinkName; +} USBSTOR_DEVICE_EXTENSION, *PUSBSTOR_DEVICE_EXTENSION; + + +/* cleanup.c */ +NTSTATUS STDCALL +UsbStorCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* fdo.c */ +NTSTATUS STDCALL +UsbStorPnpFdo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +UsbStorDeviceControlFdo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* misc.c */ +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS STDCALL +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +UsbStorDuplicateUnicodeString( + OUT PUNICODE_STRING Destination, + IN PUNICODE_STRING Source, + IN POOL_TYPE PoolType); + +NTSTATUS +UsbStorInitMultiSzString( + OUT PUNICODE_STRING Destination, + ... /* list of PCSZ */); + +/* pdo.c */ +NTSTATUS STDCALL +UsbStorPnpPdo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +UsbStorDeviceControlPdo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + _____ Added: trunk/reactos/drivers/usb/usbstor/usbstor.rc --- trunk/reactos/drivers/usb/usbstor/usbstor.rc 2005-08-14 21:44:58 UTC (rev 17389) +++ trunk/reactos/drivers/usb/usbstor/usbstor.rc 2005-08-14 22:27:15 UTC (rev 17390) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB Storage Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbstor\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbstor.sys\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/drivers/usb/usbstor/usbstor.xml --- trunk/reactos/drivers/usb/usbstor/usbstor.xml 2005-08-14 21:44:58 UTC (rev 17389) +++ trunk/reactos/drivers/usb/usbstor/usbstor.xml 2005-08-14 22:27:15 UTC (rev 17390) @@ -0,0 +1,9 @@ +<module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys" warnings="true"> + <define name="__USE_W32API" /> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>usbstor.c</file> + <file>usbstor.rc</file> +</module>

19 years, 1 month

← Newer
1
...
18
19
20
21
22
23
24
...
67
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 August 2005