Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[cgutman] 36860: - Check status for success - Change a check

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 20 16:05:24 2008 New Revision: 36860 URL: http://svn.reactos.org/svn/reactos?rev=36860&view=rev Log: - Check status for success - Change a check Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Oct 20 16:05:24 2008 @@ -28,6 +28,7 @@ */ { PIPFRAGMENT_CONTEXT IFC = (PIPFRAGMENT_CONTEXT)Context; + NTSTATUS Status; TI_DbgPrint (MAX_TRACE, @@ -35,8 +36,14 @@ Context, NdisPacket, NdisStatus)); if (NT_SUCCESS(NdisStatus) && PrepareNextFragment(IFC)) { - /* A fragment was prepared for transmission, so send it */ - IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); + /* A fragment was prepared for transmission, so send it */ + Status = IPSendFragment(IFC->NdisPacket, IFC->NCE, IFC); + if (!NT_SUCCESS(Status)) + { + FreeNdisPacket(IFC->NdisPacket); + IFC->Complete(IFC->Context, IFC->Datagram, Status); + exFreePool(IFC); + } } else { TI_DbgPrint(MAX_TRACE, ("Calling completion handler.\n")); @@ -87,7 +94,7 @@ TI_DbgPrint(MAX_TRACE, ("Called. IFC (0x%X)\n", IFC)); - if (IFC->BytesLeft != 0) { + if (IFC->BytesLeft > 0) { TI_DbgPrint(MAX_TRACE, ("Preparing 1 fragment.\n")); @@ -203,7 +210,12 @@ /* Prepare next fragment for transmission and send it */ - PrepareNextFragment(IFC); + if (!PrepareNextFragment(IFC)) { + FreeNdisPacket(IFC->NdisPacket); + ExFreePool(IFC); + return NDIS_STATUS_FAILURE; + } + return IPSendFragment(IFC->NdisPacket, NCE, IFC); }

16 years, 2 months

[cgutman] 36859: - Change the possible return statuses

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 20 15:42:09 2008 New Revision: 36859 URL: http://svn.reactos.org/svn/reactos?rev=36859&view=rev Log: - Change the possible return statuses Modified: branches/aicom-network-fixes/lib/drivers/ip/network/router.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/router.c [iso-8859-1] Mon Oct 20 15:42:09 2008 @@ -390,7 +390,7 @@ TI_DbgPrint(DEBUG_ROUTER, ("Leaving\n")); - return Found ? STATUS_NO_SUCH_FILE : STATUS_SUCCESS; + return Found ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; }

16 years, 2 months

[cgutman] 36858: - Add some ASSERTs

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 20 15:32:53 2008 New Revision: 36858 URL: http://svn.reactos.org/svn/reactos?rev=36858&view=rev Log: - Add some ASSERTs Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Mon Oct 20 15:32:53 2008 @@ -44,6 +44,7 @@ Port = htons(Port); ASSERT(Port >= PortSet->StartingPort); + ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); Port -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); @@ -77,6 +78,9 @@ AllocatedPort = htons(AllocatedPort); + ASSERT(AllocatedPort >= PortSet->StartingPort); + ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); + return AllocatedPort; } @@ -109,5 +113,8 @@ AllocatedPort = htons(AllocatedPort); + ASSERT(AllocatedPort >= PortSet->StartingPort); + ASSERT(AllocatedPort < PortSet->StartingPort + PortSet->PortsToOversee); + return AllocatedPort; }

16 years, 2 months

[cgutman] 36857: - Don't start looking at 0

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Oct 20 15:17:58 2008 New Revision: 36857 URL: http://svn.reactos.org/svn/reactos?rev=36857&view=rev Log: - Don't start looking at 0 Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Mon Oct 20 15:17:58 2008 @@ -67,7 +67,7 @@ Next -= PortSet->StartingPort; ExAcquireFastMutex( &PortSet->Mutex ); - AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); + AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Next ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort;

16 years, 2 months

[jimtabor] 36856: - Add missing PUMDHPDEV.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 20 14:37:03 2008 New Revision: 36856 URL: http://svn.reactos.org/svn/reactos?rev=36856&view=rev Log: - Add missing PUMDHPDEV. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Oct 20 14:37:03 2008 @@ -214,6 +214,7 @@ /* TYPES *********************************************************************/ typedef PVOID KERNEL_PVOID; +typedef PVOID PUMDHPDEV; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; typedef LONG FIX;

16 years, 2 months

[jimtabor] 36855: - Add driver info for psdk, update local DC and fixed eng functions so that it can support user mode print drivers.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 20 14:33:20 2008 New Revision: 36855 URL: http://svn.reactos.org/svn/reactos?rev=36855&view=rev Log: - Add driver info for psdk, update local DC and fixed eng functions so that it can support user mode print drivers. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/eng.c trunk/reactos/include/psdk/winspool.h trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Mon Oct 20 14:33:20 2008 @@ -79,6 +79,29 @@ INT planes; } ENHMETAFILE,*PENHMETAFILE; + +#define PDEV_UMPD_ID 0xFEDCBA98 +// UMPDEV flags +#define UMPDEV_NO_ESCAPE 0x0002 +#define UMPDEV_SUPPORT_ESCAPE 0x0004 +typedef struct _UMPDEV +{ + DWORD Sig; // Init with PDEV_UMPD_ID + struct _UMPDEV *pumpdNext; + PDRIVER_INFO_5W pdi5Info; + HMODULE hModule; + DWORD dwFlags; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; // Number of times the configuration + // file for this driver has been upgraded + // or downgraded since the last spooler restart. + DWORD dwDriverCount; // After init should be 2 + DWORD WOW64_UMPDev; + DWORD WOW64_hMod; + WCHAR String[188]; +} UMPDEV, *PUMPDEV; + + /* FUNCTIONS *****************************************************************/ PVOID Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Mon Oct 20 14:33:20 2008 @@ -154,16 +154,15 @@ EngGetDriverName(HDEV hdev) { // DHPDEV from NtGdiGetDhpdev must be from print driver. - PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); - - if (!pDrvInfo2) return NULL; + PUMPDEV pPDev = (PUMPDEV)NtGdiGetDhpdev(hdev); + + if (!pPDev) return NULL; - if (pDrvInfo2->cVersion != 0xFEDCBA98 ) // Init mask for ver 2+ + if (pPDev->Sig != PDEV_UMPD_ID) { - PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; - return pDrvInfo1->pName; + pPDev = (PUMPDEV)pPDev->Sig; } - return pDrvInfo2->pDriverPath; + return pPDev->pdi5Info->pDriverPath; } /* @@ -172,16 +171,15 @@ LPWSTR STDCALL EngGetPrinterDataFileName(HDEV hdev) { - PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); - - if (!pDrvInfo2) return NULL; - - if (pDrvInfo2->cVersion != 0xFEDCBA98 ) + PUMPDEV pPDev = (PUMPDEV)NtGdiGetDhpdev(hdev); + + if (!pPDev) return NULL; + + if (pPDev->Sig != PDEV_UMPD_ID) { - PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; - return pDrvInfo1->pName; + pPDev = (PUMPDEV)pPDev->Sig; } - return pDrvInfo2->pDataFile; + return pPDev->pdi5Info->pDataFile; } /* Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Mon Oct 20 14:33:20 2008 @@ -374,6 +374,162 @@ LPWSTR pMonitorName; LPWSTR pDefaultDataType; } DRIVER_INFO_3W,*PDRIVER_INFO_3W,*LPDRIVER_INFO_3W; +typedef struct _DRIVER_INFO_4A { + DWORD cVersion; // SDK examples: + LPSTR pName; // QMS 810 + LPSTR pEnvironment; // Win32 x86 + LPSTR pDriverPath; // c:\drivers\pscript.dll + LPSTR pDataFile; // c:\drivers\QMS810.PPD + LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL + LPSTR pHelpFile; // c:\drivers\PSCRPTUI.HLP + LPSTR pDependentFiles; // PSCRIPT.DLL\0QMS810.PPD\0PSCRIPTUI.DLL\0PSCRIPTUI.HLP\0PSTEST.TXT\0\0 + LPSTR pMonitorName; // "PJL monitor" + LPSTR pDefaultDataType; // "EMF" + LPSTR pszzPreviousNames; // "OldName1\0OldName2\0\0 +} DRIVER_INFO_4A, *PDRIVER_INFO_4A, *LPDRIVER_INFO_4A; +typedef struct _DRIVER_INFO_4W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; +} DRIVER_INFO_4W, *PDRIVER_INFO_4W, *LPDRIVER_INFO_4W; +typedef struct _DRIVER_INFO_5A { + DWORD cVersion; // SDK examples: + LPSTR pName; // QMS 810 + LPSTR pEnvironment; // Win32 x86 + LPSTR pDriverPath; // c:\drivers\pscript.dll + LPSTR pDataFile; // c:\drivers\QMS810.PPD + LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL + DWORD dwDriverAttributes; // driver attributes (like UMPD/KMPD) + DWORD dwConfigVersion; // version number of the config file since reboot + DWORD dwDriverVersion; // version number of the driver file since reboot +} DRIVER_INFO_5A, *PDRIVER_INFO_5A, *LPDRIVER_INFO_5A; +typedef struct _DRIVER_INFO_5W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; +} DRIVER_INFO_5W, *PDRIVER_INFO_5W, *LPDRIVER_INFO_5W; +typedef struct _DRIVER_INFO_6A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; +} DRIVER_INFO_6A, *PDRIVER_INFO_6A, *LPDRIVER_INFO_6A; +typedef struct _DRIVER_INFO_6W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; +} DRIVER_INFO_6W, *PDRIVER_INFO_6W, *LPDRIVER_INFO_6W; +#define PRINTER_DRIVER_PACKAGE_AWARE 0x00000001 +typedef struct _DRIVER_INFO_8A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; + LPSTR pszPrintProcessor; + LPSTR pszVendorSetup; + LPSTR pszzColorProfiles; + LPSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A; +typedef struct _DRIVER_INFO_8W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; + LPWSTR pszPrintProcessor; + LPWSTR pszVendorSetup; + LPWSTR pszzColorProfiles; + LPWSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPWSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W; +// FLAGS for dwDriverAttributes +#define DRIVER_KERNELMODE 0x00000001 +#define DRIVER_USERMODE 0x00000002 +// FLAGS for DeletePrinterDriverEx. +#define DPD_DELETE_UNUSED_FILES 0x00000001 +#define DPD_DELETE_SPECIFIC_VERSION 0x00000002 +#define DPD_DELETE_ALL_FILES 0x00000004 +// FLAGS for AddPrinterDriverEx. +#define APD_STRICT_UPGRADE 0x00000001 +#define APD_STRICT_DOWNGRADE 0x00000002 +#define APD_COPY_ALL_FILES 0x00000004 +#define APD_COPY_NEW_FILES 0x00000008 +#if(_WIN32_WINNT >= 0x0501) + #define APD_COPY_FROM_DIRECTORY 0x00000010 +#endif typedef struct _MONITOR_INFO_1A{LPSTR pName;} MONITOR_INFO_1A,*PMONITOR_INFO_1A,*LPMONITOR_INFO_1A; typedef struct _MONITOR_INFO_1W{LPWSTR pName;} MONITOR_INFO_1W,*PMONITOR_INFO_1W,*LPMONITOR_INFO_1W; typedef struct _PORT_INFO_1A {LPSTR pName;} PORT_INFO_1A,*PPORT_INFO_1A,*LPPORT_INFO_1A; @@ -666,6 +822,10 @@ typedef PORT_INFO_2W PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2; typedef PORT_INFO_3W PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3; typedef DRIVER_INFO_2W DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2; +typedef DRIVER_INFO_4W DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4; +typedef DRIVER_INFO_5W DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5; +typedef DRIVER_INFO_6W DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6; +typedef DRIVER_INFO_8W DRIVER_INFO_8,*PDRIVER_INFO_8,*LPDRIVER_INFO_8; typedef PRINTER_INFO_1W PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1; typedef PRINTER_INFO_2W PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2; typedef PRINTER_INFO_4W PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4; @@ -731,6 +891,10 @@ typedef PORT_INFO_2A PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2; typedef PORT_INFO_3A PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3; typedef DRIVER_INFO_2A DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2; +typedef DRIVER_INFO_4A DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4; +typedef DRIVER_INFO_5A DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5; +typedef DRIVER_INFO_6A DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6; +typedef DRIVER_INFO_8A DRIVER_INFO_8,*PDRIVER_INFO_8,*LPDRIVER_INFO_8; typedef PRINTER_INFO_1A PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1; typedef PRINTER_INFO_2A PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2; typedef PRINTER_INFO_4A PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4; Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon Oct 20 14:33:20 2008 @@ -251,6 +251,8 @@ ABORTPROC pAbortProc; /* AbortProc for Printing */ DWORD CallBackTick; HANDLE hPrinter; /* Local or Remote Printer driver */ + PVOID pUMPDev; + PUMDHPDEV pUMdhpdev; DEVCAPS DevCaps; HBRUSH BrushColor; HPEN PenColor;

16 years, 2 months

[tkreuzer] 36854: Some ULONG -> SIZE_T / ULONG_PTR fixes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 20 14:15:40 2008 New Revision: 36854 URL: http://svn.reactos.org/svn/reactos?rev=36854&view=rev Log: Some ULONG -> SIZE_T / ULONG_PTR fixes Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/lib/rtl/thread.c Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Mon Oct 20 14:15:40 2008 @@ -11207,8 +11207,8 @@ IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, @@ -11222,8 +11222,8 @@ IN HANDLE SectionHandle, IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, IN OUT PSIZE_T ViewSize, IN SECTION_INHERIT InheritDisposition, Modified: branches/ros-amd64-bringup/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/thread.c [iso-8859-1] Mon Oct 20 14:15:40 2008 @@ -31,7 +31,8 @@ PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack = 0; BOOLEAN UseGuard = FALSE; - ULONG Dummy, GuardPageSize; + ULONG Dummy; + SIZE_T GuardPageSize; /* Get some memory information */ Status = ZwQuerySystemInformation(SystemBasicInformation,

16 years, 2 months

[tkreuzer] 36853: remove functions from stubs file, fix some warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 20 14:12:41 2008 New Revision: 36853 URL: http://svn.reactos.org/svn/reactos?rev=36853&view=rev Log: remove functions from stubs file, fix some warnings Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Oct 20 14:12:41 2008 @@ -181,7 +181,6 @@ STUB(PsGetCurrentThreadWin32ThreadAndEnterCriticalRegion) STUB(PsGetProcessSessionIdEx) STUB(PsGetProcessWow64Process) -STUB(PsIsSystemProcess) STUB(PsProcessType) STUB(PsWrapApcWow64Thread) STUB(RtlAnsiStringToUnicodeSize) @@ -218,12 +217,9 @@ STUB(WmiFlushTrace) STUB(WmiGetClock) STUB(WmiQueryTrace) -STUB(WmiQueryTraceInformation) STUB(WmiStartTrace) STUB(WmiStopTrace) STUB(WmiTraceFastEvent) -STUB(WmiTraceMessage) -STUB(WmiTraceMessageVa) STUB(WmiUpdateTrace) STUB(XIPDispatch) STUB(__C_specific_handler) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Mon Oct 20 14:12:41 2008 @@ -43,13 +43,13 @@ } - +/* static ULONG ProtectToPTE(ULONG flProtect) { - -} - + return 0; +} +*/ NTSTATUS NTAPI Mmi386ReleaseMmInfo(PEPROCESS Process) @@ -323,7 +323,7 @@ if (Index != VAtoPXI(PXE_BASE)) { (void)InterlockedCompareExchangePointer((PVOID*)&Pde[Index], - MmGlobalKernelPageDirectory[Index], + (PVOID)MmGlobalKernelPageDirectory[Index], 0); } }

16 years, 2 months

[tkreuzer] 36852: Some ULONG -> SIZE_T / ULONG_PTR fixes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 20 14:11:57 2008 New Revision: 36852 URL: http://svn.reactos.org/svn/reactos?rev=36852&view=rev Log: Some ULONG -> SIZE_T / ULONG_PTR fixes Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -752,7 +752,7 @@ PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength + PSIZE_T ResultLength ); VOID @@ -1410,7 +1410,7 @@ PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength + PSIZE_T ResultLength ); NTSTATUS @@ -1503,8 +1503,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); /* sysldr.c ******************************************************************/ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -212,7 +212,7 @@ ULONG ClassListEntries, PVOID Buffer, ULONG BufferLength, - PULONG ReturnLength, + PSIZE_T ReturnLength, KPROCESSOR_MODE PreviousMode) { NTSTATUS Status = STATUS_SUCCESS; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -1034,7 +1034,7 @@ MmQueryAnonMem(PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength) + PSIZE_T ResultLength) { PMM_REGION Region; PVOID RegionBase = NULL; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -438,9 +438,9 @@ NtGetWriteWatch(IN HANDLE ProcessHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG RegionSize, + IN SIZE_T RegionSize, IN PVOID *UserAddressArray, - OUT PULONG EntriesInUserAddressArray, + OUT PULONG_PTR EntriesInUserAddressArray, OUT PULONG Granularity) { UNIMPLEMENTED; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -2052,7 +2052,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength) + PSIZE_T ResultLength) { PMM_REGION Region; PVOID RegionBaseAddress; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon Oct 20 14:11:57 2008 @@ -762,7 +762,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; NTSTATUS Status = STATUS_SUCCESS; - ULONG BytesWritten = 0; + SIZE_T BytesWritten = 0; PAGED_CODE(); /* Check if we came from user mode */

16 years, 2 months

[fireball] 36851: <kjk_hyperion> die it <kjk_hyperion> I'll revive it whenever

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 20 13:33:16 2008 New Revision: 36851 URL: http://svn.reactos.org/svn/reactos?rev=36851&view=rev Log: <kjk_hyperion> die it <kjk_hyperion> I'll revive it whenever Removed: branches/rox-u/

16 years, 2 months

← Newer
1
...
24
25
26
27
28
29
30
...
52
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 October 2008