Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[fireball] 37613: - Fix most of the warnings in mkhive.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 24 07:01:56 2008 New Revision: 37613 URL: http://svn.reactos.org/svn/reactos?rev=37613&view=rev Log: - Fix most of the warnings in mkhive. Modified: trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=376… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -622,7 +622,7 @@ NameLength = CmiGetPackedNameLength(ValueName, &Packable); - DPRINT("ValueName->Length %lu NameLength %lu\n", ValueName->Length, NameLength); + DPRINT("ValueName->Length %u NameLength %u\n", ValueName->Length, NameLength); *VBOffset = HvAllocateCell(&RegistryHive->Hive, sizeof(CM_KEY_VALUE) + NameLength, Storage, HCELL_NIL); if (*VBOffset == HCELL_NIL) Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -158,7 +158,7 @@ ValueName, 0, REG_MULTI_SZ, - (PCHAR)Buffer, + (PUCHAR)Buffer, (ULONG)Total); } @@ -304,7 +304,7 @@ { ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; - DPRINT("setting dword %s to %lx\n", ValueName, dw); + DPRINT("setting dword %s to %x\n", ValueName, dw); RegSetValueExA ( KeyHandle, @@ -343,7 +343,7 @@ } else /* get the binary data */ { - PCHAR Data = NULL; + PUCHAR Data = NULL; if (InfHostGetBinaryField (Context, 5, NULL, 0, &Size) != 0) Size = 0; @@ -354,8 +354,8 @@ if (Data == NULL) return FALSE; - DPRINT("setting binary data %s len %lu\n", ValueName, Size); - InfHostGetBinaryField (Context, 5, Data, (ULONG)Size, NULL); + DPRINT("setting binary data %s len %d\n", ValueName, Size); + InfHostGetBinaryField (Context, 5, Data, Size, NULL); } RegSetValueExA ( @@ -416,11 +416,11 @@ else { /* get flags */ - if (InfHostGetIntField (Context, 4, (PLONG)&Flags) != 0) + if (InfHostGetIntField (Context, 4, &Flags) != 0) Flags = 0; } - DPRINT("Flags: %lx\n", Flags); + DPRINT("Flags: 0x%x\n", Flags); if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) { Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Mon Nov 24 07:01:56 2008 @@ -384,7 +384,7 @@ if (cbData <= sizeof(HCELL_INDEX)) { /* If data size <= sizeof(HCELL_INDEX) then store data in the data offset */ - DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); + DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength); if (DataCell) HvFreeCell(&Key->RegistryHive->Hive, ValueCell->Data); @@ -401,12 +401,12 @@ * data block and allocate a new one. */ HCELL_INDEX NewOffset; - DPRINT("ValueCell->DataLength %lu\n", ValueCell->DataLength); + DPRINT("ValueCell->DataLength %u\n", ValueCell->DataLength); NewOffset = HvAllocateCell(&Key->RegistryHive->Hive, cbData, Stable, HCELL_NIL); if (NewOffset == HCELL_NIL) { - DPRINT("HvAllocateCell() failed with status 0x%08lx\n", Status); + DPRINT("HvAllocateCell() failed with status 0x%08x\n", Status); return ERROR_UNSUCCESSFUL; } @@ -427,7 +427,7 @@ HvMarkCellDirty(&Key->RegistryHive->Hive, Key->KeyCellOffset, FALSE); - DPRINT("Return status 0x%08lx\n", Status); + DPRINT("Return status 0x%08x\n", Status); return Status; } @@ -581,7 +581,7 @@ Status = CmiInitializeTempHive(HiveToConnect); if (!NT_SUCCESS(Status)) { - DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); + DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); return FALSE; } @@ -599,29 +599,6 @@ return TRUE; } -static BOOL -MyExportBinaryHive (PCHAR FileName, - PCMHIVE RootHive) -{ - FILE *File; - BOOL ret; - - /* Create new hive file */ - File = fopen (FileName, "w+b"); - if (File == NULL) - { - printf(" Error creating/opening file\n"); - return FALSE; - } - - fseek (File, 0, SEEK_SET); - - RootHive->FileHandles[HFILE_TYPE_PRIMARY] = (HANDLE)File; - ret = HvWriteHive(&RootHive->Hive); - fclose (File); - return ret; -} - LIST_ENTRY CmiHiveListHead; VOID @@ -636,7 +613,7 @@ Status = CmiInitializeTempHive(&RootHive); if (!NT_SUCCESS(Status)) { - DPRINT1("CmiInitializeTempHive() failed with status 0x%08lx\n", Status); + DPRINT1("CmiInitializeTempHive() failed with status 0x%08x\n", Status); return; }

15 years, 10 months

[hyperion] 37612: modified dll/directx/ddraw/rosdraw.h modified dll/win32/advapi32/advapi32.h modified dll/win32/gdi32/include/precomp.h modified dll/win32/setupapi/setupapi_private.h Explicitly include pseh/pseh.h, don't rely on <windows.h> including it through <rpc.h>

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Nov 24 07:00:20 2008 New Revision: 37612 URL: http://svn.reactos.org/svn/reactos?rev=37612&view=rev Log: modified dll/directx/ddraw/rosdraw.h modified dll/win32/advapi32/advapi32.h modified dll/win32/gdi32/include/precomp.h modified dll/win32/setupapi/setupapi_private.h Explicitly include pseh/pseh.h, don't rely on <windows.h> including it through <rpc.h> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/gdi32/include/precomp.h trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -8,6 +8,8 @@ #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> + +#include <pseh/pseh.h> #include "Ddraw/ddraw.h" #include "Surface/surface.h" Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -24,6 +24,8 @@ #include <sddl.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <pseh/pseh.h> /* this has to go after the NDK when being used with the NDK */ #include <ntsecapi.h> Modified: trunk/reactos/dll/win32/gdi32/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/precomp.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -20,6 +20,8 @@ #include <d3dnthal.h> #include <prntfont.h> +#include <pseh/pseh.h> + /* Public Win32K Headers */ #include <win32k/ntgdityp.h> #include <ntgdi.h> Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Mon Nov 24 07:00:20 2008 @@ -41,6 +41,8 @@ #include <wine/unicode.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <pseh/pseh.h> #include <pnp_c.h> #include "rpc_private.h"

15 years, 10 months

[sginsberg] 37611: - Fix build

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Nov 24 06:30:53 2008 New Revision: 37611 URL: http://svn.reactos.org/svn/reactos?rev=37611&view=rev Log: - Fix build Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Nov 24 06:30:53 2008 @@ -3192,7 +3192,9 @@ case IOCTL_CDROM_READ_Q_CHANNEL: { PSUB_Q_CHANNEL_DATA userChannelData = realIrp->AssociatedIrp.SystemBuffer; +#if DBG PCDROM_SUB_Q_DATA_FORMAT inputBuffer = realIrp->AssociatedIrp.SystemBuffer; +#endif PSUB_Q_CHANNEL_DATA subQPtr = srb->DataBuffer; #if DBG

15 years, 10 months

[fireball] 37610: - Get rid of warnings.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 24 06:22:09 2008 New Revision: 37610 URL: http://svn.reactos.org/svn/reactos?rev=37610&view=rev Log: - Get rid of warnings. Modified: trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/base/applications/network/ftp/prototypes.h trunk/reactos/base/applications/network/ftp/ruserpass.c Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -48,7 +48,6 @@ extern char *globerr; extern char home[]; extern char *remglob(); -extern char *getenv(); extern int allbinary; extern off_t restart_point; extern char reply_string[]; @@ -2195,7 +2194,6 @@ int argc; char *argv[]; { - extern long atol(); if (argc != 2) printf("restart: offset not specified\n"); else { Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -461,7 +461,7 @@ { FILE *fin; int dout = 0; - int (*closefunc)(), _pclose(), fclose(); + int (*closefunc)(); sig_t (*oldintr)(), (*oldintp)(); char buf[BUFSIZ], *bufp; long bytes = 0, hashbytes = HASHBYTES; @@ -735,7 +735,7 @@ { FILE *fout = stdout; int din = 0; - int (*closefunc)(), _pclose(), fclose(); + int (*closefunc)(); void (*oldintr)(int), (*oldintp)(int); int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; char msg; @@ -748,7 +748,6 @@ register int c, d; struct timeval start, stop; // struct stat st; - extern void *malloc(); is_retr = strcmp(cmd, "RETR") == 0; if (is_retr && verbose && printnames) { Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true"> +<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="lint" /> <library>kernel32</library> Modified: trunk/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -44,8 +44,6 @@ int sleep(int time); char *tail(); -int errno; -char *mktemp(); void setbell(), setdebug(); void setglob(), sethash(), setport(); void setprompt(); Modified: trunk/reactos/base/applications/network/ftp/ruserpass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ruserpass.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ruserpass.c [iso-8859-1] Mon Nov 24 06:22:09 2008 @@ -29,9 +29,6 @@ #include "prototypes.h" #include <winsock.h> -char *renvlook(), *index(), *getenv(), *getpass(), *getlogin(); -void *malloc(); -char *strcpy(); struct utmp *getutmp(); static FILE *cfile; @@ -73,7 +70,6 @@ char myname[MAXHOSTNAMELEN]; int t, i, c, usedefault = 0; struct stat stb; - extern int errno; hdir = getenv("HOME"); if (hdir == NULL)

15 years, 10 months

[fireball] 37609: - Get rid of warnings.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 24 06:14:48 2008 New Revision: 37609 URL: http://svn.reactos.org/svn/reactos?rev=37609&view=rev Log: - Get rid of warnings. Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Nov 24 06:14:48 2008 @@ -2972,7 +2972,7 @@ } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -3497,7 +3497,7 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -3823,7 +3823,7 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (ULONG)realIrpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { @@ -4199,7 +4199,7 @@ retry = TRUE; } - if (retry && (irpNextStack->Parameters.Others.Argument1 = (ULONG)irpNextStack->Parameters.Others.Argument1-1)) { + if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)irpNextStack->Parameters.Others.Argument1-1))) { if (((ULONG)irpNextStack->Parameters.Others.Argument1)) { Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild [iso-8859-1] Mon Nov 24 06:14:48 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true"> +<module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <library>ntoskrnl</library> <library>hal</library>

15 years, 10 months

[fireball] 37608: - Make atapi compile warnings-free.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Nov 24 04:04:05 2008 New Revision: 37608 URL: http://svn.reactos.org/svn/reactos?rev=37608&view=rev Log: - Make atapi compile warnings-free. Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Mon Nov 24 04:04:05 2008 @@ -198,7 +198,7 @@ VOID STDCALL AtapiZeroMemory( - IN PCHAR Buffer, + IN PUCHAR Buffer, IN ULONG Count ); @@ -927,10 +927,10 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1]; - PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; + //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; ULONG i; UCHAR errorByte; - UCHAR srbStatus; + UCHAR srbStatus = SRB_STATUS_ERROR; UCHAR scsiStatus; // @@ -1400,7 +1400,7 @@ vendorId[j+1] = ((PUCHAR)deviceExtension->IdentifyData[i].ModelNumber)[j]; } - if (!AtapiStringCmp (vendorId, "CD-ROM CDR", 11)) { + if (!AtapiStringCmp ((PCHAR)vendorId, "CD-ROM CDR", 11)) { // // Inquiry string for older model had a '-', newer is '_' @@ -1435,7 +1435,7 @@ // is clear and then just wait for an arbitrary amount of time! // if (deviceExtension->DeviceFlags[i] & DFLAGS_ATAPI_DEVICE) { - PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1]; + //PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[i >> 1]; PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[i >> 1]; ULONG waitCount; @@ -2138,8 +2138,8 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PULONG adapterCount = (PULONG)Context; - PUCHAR ioSpace; - ULONG i,j; + PUCHAR ioSpace = NULL; + ULONG i; ULONG irq; ULONG portBase; ULONG retryCount; @@ -2600,12 +2600,9 @@ --*/ { - PHW_DEVICE_EXTENSION deviceExtension = DeviceExtension; - ULONG rangeNumber = 0; ULONG pciBuffer; ULONG slotNumber; ULONG functionNumber; - ULONG status; PCI_SLOT_NUMBER slotData; PPCI_COMMON_CONFIG pciData; UCHAR vendorString[5]; @@ -2668,8 +2665,8 @@ vendorStrPtr = vendorString; deviceStrPtr = deviceString; - AtapiHexToString(pciData->VendorID, &vendorStrPtr); - AtapiHexToString(pciData->DeviceID, &deviceStrPtr); + AtapiHexToString(pciData->VendorID, (PCHAR*)&vendorStrPtr); + AtapiHexToString(pciData->DeviceID, (PCHAR*)&deviceStrPtr); DebugPrint((2, "FindBrokenController: Bus %x Slot %x Function %x Vendor %s Product %s\n", @@ -2683,11 +2680,11 @@ // Compare strings. // - if (AtapiStringCmp(vendorString, - VendorID, + if (AtapiStringCmp((PCHAR)vendorString, + (PCHAR)VendorID, VendorIDLength) || - AtapiStringCmp(deviceString, - DeviceID, + AtapiStringCmp((PCHAR)deviceString, + (PCHAR)DeviceID, DeviceIDLength)) { // @@ -2803,17 +2800,17 @@ vendorStrPtr = vendorString; deviceStrPtr = deviceString; - AtapiHexToString(pciData.VendorID, &vendorStrPtr); - AtapiHexToString(pciData.DeviceID, &deviceStrPtr); + AtapiHexToString(pciData.VendorID, (PCHAR*)&vendorStrPtr); + AtapiHexToString(pciData.DeviceID, (PCHAR*)&deviceStrPtr); // // Compare strings. // - if (AtapiStringCmp(vendorString, + if (AtapiStringCmp((PCHAR)vendorString, NativeModeAdapters[nativeModeAdapterTableIndex].VendorId, NativeModeAdapters[nativeModeAdapterTableIndex].VendorIdLength) || - AtapiStringCmp(deviceString, + AtapiStringCmp((PCHAR)deviceString, NativeModeAdapters[nativeModeAdapterTableIndex].DeviceId, NativeModeAdapters[nativeModeAdapterTableIndex].DeviceIdLength)) { continue; @@ -3115,9 +3112,9 @@ lastSlot = FALSE; if (FindBrokenController(deviceExtension, - BrokenAdapters[i].VendorId, + (PUCHAR)BrokenAdapters[i].VendorId, BrokenAdapters[i].VendorIdLength, - BrokenAdapters[i].DeviceId, + (PUCHAR)BrokenAdapters[i].DeviceId, BrokenAdapters[i].DeviceIdLength, &functionNumber, &slotNumber, @@ -3515,7 +3512,6 @@ ULONG status; ULONG i; UCHAR statusByte,interruptReason; - BOOLEAN commandComplete = FALSE; BOOLEAN atapiDev = FALSE; if (srb) { @@ -4771,7 +4767,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; PIDE_REGISTERS_1 baseIoAddress1 = deviceExtension->BaseIoAddress1[Srb->TargetId >> 1]; - PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; + //PIDE_REGISTERS_2 baseIoAddress2 = deviceExtension->BaseIoAddress2[Srb->TargetId >> 1]; ULONG startingSector; ULONG sectors; ULONG endSector; @@ -5759,7 +5755,6 @@ { PHW_DEVICE_EXTENSION deviceExtension = HwDeviceExtension; - ULONG status; PSENSE_DATA senseBuffer = (PSENSE_DATA)Srb->DataBuffer; @@ -5968,7 +5963,7 @@ deviceExtension->CurrentSrb = Srb; - if (AtapiStringCmp( ((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) { + if (AtapiStringCmp( (PCHAR)((PSRB_IO_CONTROL)(Srb->DataBuffer))->Signature,"SCSIDISK",strlen("SCSIDISK"))) { DebugPrint((1, "AtapiStartIo: IoControl signature incorrect. Send %s, expected %s\n", @@ -6381,7 +6376,7 @@ VOID STDCALL AtapiZeroMemory( - IN PCHAR Buffer, + IN PUCHAR Buffer, IN ULONG Count ) { Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild [iso-8859-1] Mon Nov 24 04:04:05 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true"> +<module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="atapi">.</include> <library>ntoskrnl</library>

15 years, 10 months

[greatlrd] 37607: Implement WinWatchGetClipList. Update WinWatchClose thx to WinWatchGetClipList ToDO Now only two api left to implement DCIEndAccess and DCIBeginAccess

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Nov 24 01:21:33 2008 New Revision: 37607 URL: http://svn.reactos.org/svn/reactos?rev=37607&view=rev Log: Implement WinWatchGetClipList. Update WinWatchClose thx to WinWatchGetClipList ToDO Now only two api left to implement DCIEndAccess and DCIBeginAccess Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Mon Nov 24 01:21:33 2008 @@ -17,6 +17,6 @@ GetWindowRegionData@12 WinWatchClose@4 WinWatchDidStatusChange@4 -; WinWatchGetClipList + WinWatchGetClipList@16 WinWatchNotify@12 WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Mon Nov 24 01:21:33 2008 @@ -16,7 +16,9 @@ typedef struct _WINWATCH_INT { HWND hWnd; - BOOL WinWtachStatus; + BOOL WinWatchStatus; + LPRGNDATA lpRgnData; + UINT RgnDataSize; } WINWATCH_INT, *LPWINWATCH_INT; @@ -420,10 +422,17 @@ void WINAPI WinWatchClose(HWINWATCH hWW) { + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; + EnterCriticalSection(&ddcs); - if (hWW != NULL) - { + if (pWinwatch_int != NULL) + { + if (pWinwatch_int->lpRgnData != NULL) + { + HeapFree(GetProcessHeap(), 0, pWinwatch_int->lpRgnData); + } + HeapFree(GetProcessHeap(), 0, hWW); } @@ -434,8 +443,83 @@ WinWatchDidStatusChange(HWINWATCH hWW) { LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; - return pWinwatch_int->WinWtachStatus; -} + return pWinwatch_int->WinWatchStatus; +} + +UINT WINAPI +WinWatchGetClipList(HWINWATCH hWW, + LPRECT prc, + UINT size, + LPRGNDATA prd) +{ + + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT) hWW; + DWORD BufferRequestSize; + DWORD NewBufferRequestSize; + + /* Check see if the WinWatch status have changes, it can only be change from DciBeginAccess and DciEndAcess */ + if (pWinwatch_int->WinWatchStatus != FALSE) + { + /* The status have change, Rest some internal value */ + pWinwatch_int->WinWatchStatus = FALSE; + pWinwatch_int->RgnDataSize = 0; + + /* Get the buffer size */ + BufferRequestSize = GetWindowRegionData(pWinwatch_int->hWnd, 0, NULL); + + /* We got a buffer size */ + if (BufferRequestSize != 0) + { + /* We need endless loop to get the buffer size, for we need waiting on gdi when it is ready, to give us that */ + while (1) + { + /* Check see if we got a buffer already for GetWindowRegionData */ + if (pWinwatch_int->lpRgnData != NULL) + { + /* Free our buffer for GetWindowRegionData */ + HeapFree(GetProcessHeap(), 0, pWinwatch_int->lpRgnData); + } + + /* Free our buffer for GetWindowRegionData */ + if ( (pWinwatch_int->lpRgnData = (LPRGNDATA) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferRequestSize )) == NULL ) + { + /* Fail to alloc our buffer for GetWindowRegionData */ + break; + } + + /* Get our data from GetWindowRegionData */ + NewBufferRequestSize = GetWindowRegionData(pWinwatch_int->hWnd, BufferRequestSize, pWinwatch_int->lpRgnData); + + /* Check see if the buffer size match */ + if (NewBufferRequestSize == BufferRequestSize) + { + /* The buffer size match */ + pWinwatch_int->RgnDataSize = BufferRequestSize; + break; + } + else if (BufferRequestSize == 0) + { + /* No buffer size was given */ + break; + } + BufferRequestSize = NewBufferRequestSize; + } + } + } + + /* Setup return data */ + if (size == pWinwatch_int->RgnDataSize) + { + if (pWinwatch_int->RgnDataSize != 0) + { + memcpy(prd,pWinwatch_int->lpRgnData,pWinwatch_int->RgnDataSize); + } + } + + /* return our value */ + return pWinwatch_int->RgnDataSize; +} + /***********************************************************************************************************/

15 years, 10 months

[hyperion] 37606: Fixed _SEH2_EXCEPT

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 23 21:00:50 2008 New Revision: 37606 URL: http://svn.reactos.org/svn/reactos?rev=37606&view=rev Log: Fixed _SEH2_EXCEPT Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Nov 23 21:00:50 2008 @@ -94,6 +94,12 @@ /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") +/* GCC doesn't know that this equals zero */ +#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) +#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) + typedef struct __SEH2Registration { struct __SEH2Registration * SER_Prev; @@ -251,7 +257,7 @@ __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ \ _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ - _SEHTryLevel.ST_Filter = NULL; \ + _SEHTryLevel.ST_Filter = 0; \ _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ \ goto _SEHDoTry; \ @@ -318,8 +324,11 @@ { \ __SEH_LEAVE_TRYLEVEL(); \ } \ -\ - goto _SEHEndExcept; \ + \ + if(__SEH_FALSE) \ + goto _SEHBeginExcept; \ + else \ + goto _SEHEndExcept; \ \ _SEHBeginExcept: __SEH_SIDE_EFFECT; \ { \

15 years, 10 months

[cgutman] 37605: - Make sure we're not trying to close the file object

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 23 20:59:37 2008 New Revision: 37605 URL: http://svn.reactos.org/svn/reactos?rev=37605&view=rev Log: - Make sure we're not trying to close the file object Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Nov 23 20:59:37 2008 @@ -27,12 +27,17 @@ */ { KIRQL OldIrql; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TransContext; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + TransContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; + IoAcquireCancelSpinLock(&OldIrql); - if (!Irp->Cancel) { + if (!Irp->Cancel && !TransContext->CancelIrps) { (void)IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql);

15 years, 10 months

[hyperion] 37604: Missing from previous commit

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Nov 23 19:38:43 2008 New Revision: 37604 URL: http://svn.reactos.org/svn/reactos?rev=37604&view=rev Log: Missing from previous commit Modified: trunk/reactos/lib/pseh/framebased-gcchack.c Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sun Nov 23 19:38:43 2008 @@ -29,29 +29,29 @@ #include <excpt.h> -extern _SEHRegistration_t * __cdecl _SEH2CurrentRegistration(void); +extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); extern int __SEH2Except(void *, void *, void *); extern void __SEH2Finally(void *, void *); static __attribute__((always_inline)) -int _SEH2Except(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel, EXCEPTION_POINTERS * ep) +int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); } static __attribute__((noinline)) -void _SEH2Finally(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); } static -void _SEH2LocalUnwind(_SEHFrame_t * frame, volatile _SEHTryLevel_t * dsttrylevel) +void _SEH2LocalUnwind(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * dsttrylevel) { - volatile _SEHTryLevel_t * trylevel; + volatile _SEH2TryLevel_t * trylevel; for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) { @@ -66,7 +66,7 @@ static __attribute__((noreturn)) -void _SEH2Handle(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +void _SEH2Handle(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { _SEH2GlobalUnwind(frame); _SEH2LocalUnwind(frame, trylevel); @@ -92,7 +92,7 @@ void * DispatcherContext ) { - _SEHFrame_t * frame; + _SEH2Frame_t * frame; __asm__ __volatile__("cld"); @@ -107,7 +107,7 @@ else { int ret = 0; - volatile _SEHTryLevel_t * trylevel; + volatile _SEH2TryLevel_t * trylevel; frame->SF_Code = ExceptionRecord->ExceptionCode; @@ -134,7 +134,7 @@ } extern -void __cdecl _SEH2EnterFrame(_SEHFrame_t * frame) +void __cdecl _SEH2EnterFrame(_SEH2Frame_t * frame) { frame->SF_Registration.SER_Handler = _SEH2FrameHandler; frame->SF_Code = 0; @@ -161,7 +161,7 @@ extern void __cdecl _SEH2Return(void) { - _SEH2LocalUnwind(CONTAINING_RECORD(_SEH2CurrentRegistration(), _SEHFrame_t, SF_Registration), NULL); + _SEH2LocalUnwind(CONTAINING_RECORD(_SEH2CurrentRegistration(), _SEH2Frame_t, SF_Registration), NULL); _SEH2LeaveFrame(); }

15 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
66
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 November 2008