Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 35923: add a --winetest parameter which will run all sub tests from the given winetest module and redirect output to dbgout
by cwittich＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: cwittich Date: Thu Sep 4 03:56:03 2008 New Revision: 35923 URL: http://svn.reactos.org/svn/reactos?rev=35923&view=rev Log: add a --winetest parameter which will run all sub tests from the given winetest module and redirect output to dbgout Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Thu Sep 4 03:56:03 2008 @@ -31,7 +31,44 @@ return -1; } - if (_tcsstr(argv[1], "--process") && (argc == 3)) + if (_tcsstr(argv[1], "--winetest") && (argc == 3)) + { + char psBuffer[128]; + char psBuffer2[128]; + char cmd[255]; + FILE *pPipe; + FILE *pPipe2; + + /* get available tests */ + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + char *nlptr = strchr(psBuffer, '\n'); + if (nlptr) + psBuffer[*psBuffer - *nlptr - 1] = '\0'; + if (psBuffer[0] == ' ') + { + strcpy(cmd, argv[2]); + strcat(cmd, " "); + strcat(cmd, psBuffer+4); + /* run the current test */ + pPipe2 = _tpopen(cmd, "r"); + if (pPipe2 != NULL) + { + while(fgets(psBuffer2, 128, pPipe2)) + { + OutputDebugStringA(psBuffer2); + } + _pclose(pPipe2); + } + } + } + _pclose(pPipe); + } + } + else if (_tcsstr(argv[1], "--process") && (argc == 3)) { char psBuffer[128]; FILE *pPipe;

1 0

[hpoussin] 35922: Allocate without a tag if buffer won't be freed by the driver
by hpoussin＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: hpoussin Date: Thu Sep 4 03:49:22 2008 New Revision: 35922 URL: http://svn.reactos.org/svn/reactos?rev=35922&view=rev Log: Allocate without a tag if buffer won't be freed by the driver Modified: trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Thu Sep 4 03:49:22 2008 @@ -206,7 +206,7 @@ Size = sizeof(DEVICE_RELATIONS) + sizeof(Relations->Objects) * (DeviceExtension->DeviceListCount - 1); - Relations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, Size, TAG_PCI); + Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); if (!Relations) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Thu Sep 4 03:49:22 2008 @@ -136,7 +136,7 @@ DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceExtension->Fdo->DeviceExtension; - BusInformation = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), TAG_PCI); + BusInformation = ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); Irp->IoStatus.Information = (ULONG_PTR)BusInformation; if (BusInformation != NULL) { Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Thu Sep 4 03:49:22 2008 @@ -673,7 +673,7 @@ PDEVICE_RELATIONS DeviceRelations; TRACE_(I8042PRT, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); - DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), I8042PRT_TAG); + DeviceRelations = ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); if (DeviceRelations) { DeviceRelations->Count = 0;

1 0

[hpoussin] 35921: ExAllocatePoolWithTag should be paired with ExFreePoolWithTag Fix a memory leak in W32kGetDefaultKeyLayout Fix a possible double-free in IntFreeMenuItem
by hpoussin＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: hpoussin Date: Thu Sep 4 03:47:56 2008 New Revision: 35921 URL: http://svn.reactos.org/svn/reactos?rev=35921&view=rev Log: ExAllocatePoolWithTag should be paired with ExFreePoolWithTag Fix a memory leak in W32kGetDefaultKeyLayout Fix a possible double-free in IntFreeMenuItem Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -2,6 +2,7 @@ #define _WIN32K_TAGS_H #define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ +#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* RTL registry */ /* ntuser */ #define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ @@ -87,6 +88,7 @@ #define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ #define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ +#define TAG_PFF TAG('G', 'p', 'f', 'f') /* physical font file */ /* Dx internal tags rember I do not known if it right namees */ #define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -355,7 +355,7 @@ NULL, (HANDLE*)hWinSta); - RtlFreeUnicodeString(&FullName); + ExFreePoolWithTag(FullName.Buffer, TAG_STRING); if(!NT_SUCCESS(Status)) { @@ -389,7 +389,7 @@ NULL, (HANDLE*)hDesktop); - RtlFreeUnicodeString(&FullName); + ExFreePoolWithTag(FullName.Buffer, TAG_STRING); if(!NT_SUCCESS(Status)) { @@ -931,11 +931,12 @@ { SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WinStaObject); - if (lpszDesktopName) - RtlFreeUnicodeString(&SafeDesktopName); + if (lpszDesktopName) + ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); RETURN( NULL); } - RtlFreeUnicodeString(&SafeDesktopName); + if (lpszDesktopName) + ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); ObDereferenceObject(WinStaObject); /* @@ -963,7 +964,7 @@ if (!NT_SUCCESS(Status)) RETURN(NULL); if (Status == STATUS_OBJECT_NAME_EXISTS) { - ExFreePool(DesktopName.Buffer); + ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); RETURN( Desktop); } @@ -1019,7 +1020,7 @@ /* Initialize some local (to win32k) desktop state. */ DesktopObject->ActiveMessageQueue = NULL; - ExFreePool(DesktopName.Buffer); + ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); if (! NT_SUCCESS(Status)) { @@ -1138,7 +1139,8 @@ Result = IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, &SafeDesktopName); - RtlFreeUnicodeString(&SafeDesktopName); + if (lpszDesktopName) + ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); ObDereferenceObject(WinStaObject); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -92,7 +92,7 @@ if( !NT_SUCCESS(Status) ) { NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return Status; } @@ -104,7 +104,7 @@ if(!ReturnBuffer) { NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); return STATUS_NO_MEMORY; } @@ -113,7 +113,7 @@ KeyValuePartialInfo->DataLength); RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - ExFreePool(KeyValuePartialInfo); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); NtClose(KeyHandle); return Status; @@ -154,7 +154,7 @@ FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - RtlFreeUnicodeString(&LayoutFile); + ExFreePoolWithTag(LayoutFile.Buffer, TAG_STRING); *phModule = EngLoadImage(FullLayoutPath.Buffer); @@ -321,7 +321,10 @@ Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); if( NT_SUCCESS(Status) ) + { RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); + ExFreePoolWithTag(LayoutLocaleIdString.Buffer, TAG_STRING); + } else DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -95,7 +95,7 @@ { \ if((MENU_ITEM_TYPE((MenuItem)->fType) == MF_STRING) && \ (MenuItem)->Text.Length) { \ - RtlFreeUnicodeString(&(MenuItem)->Text); \ + ExFreePoolWithTag((MenuItem)->Text.Buffer, TAG_STRING); \ } \ } @@ -220,7 +220,6 @@ } /* Free memory */ - if (MenuItem->Text.Buffer) ExFreePool(MenuItem->Text.Buffer); ExFreePool(MenuItem); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -2259,7 +2259,7 @@ { if (! IS_ATOM(ClassName.Buffer)) { - RtlFreeUnicodeString(&ClassName); + ExFreePoolWithTag(ClassName.Buffer, TAG_STRING); } SetLastNtError(Status); RETURN( NULL); @@ -2273,10 +2273,13 @@ NewWindow = co_IntCreateWindowEx(dwExStyle, &ClassName, &WindowName, dwStyle, x, y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam, dwShowMode, bUnicodeWindow); - RtlFreeUnicodeString(&WindowName); + if (WindowName.Buffer) + { + ExFreePoolWithTag(WindowName.Buffer, TAG_STRING); + } if (! IS_ATOM(ClassName.Buffer)) { - RtlFreeUnicodeString(&ClassName); + ExFreePoolWithTag(ClassName.Buffer, TAG_STRING); } RETURN( NewWindow); @@ -4013,7 +4016,7 @@ Ret = (UINT)IntAddAtom(SafeMessageName.Buffer); - RtlFreeUnicodeString(&SafeMessageName); + ExFreePoolWithTag(SafeMessageName.Buffer, TAG_STRING); RETURN( Ret); CLEANUP: Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -216,7 +216,7 @@ QueryTable, NULL, NULL); - RtlFreeUnicodeString(&RegistryPath); + ExFreePoolWithTag(RegistryPath.Buffer, TAG_RTLREGISTRY); if (! NT_SUCCESS(Status)) { DPRINT1("No InstalledDisplayDrivers value in service entry found\n"); @@ -323,7 +323,7 @@ } } - RtlFreeUnicodeString(&RegistryPath); + ExFreePoolWithTag(RegistryPath.Buffer, TAG_RTLREGISTRY); if (! Valid) { @@ -428,14 +428,14 @@ if (!GotDriver) { ObDereferenceObject(PrimarySurface.VideoFileObject); - RtlFreeUnicodeString(&DriverFileNames); + ExFreePoolWithTag(DriverFileNames.Buffer, TAG_RTLREGISTRY); DPRINT1("No suitable DDI driver found\n"); continue; } DPRINT("Display driver %S loaded\n", CurrentName); - RtlFreeUnicodeString(&DriverFileNames); + ExFreePoolWithTag(DriverFileNames.Buffer, TAG_RTLREGISTRY); DPRINT("Building DDI Functions\n"); @@ -2453,7 +2453,7 @@ { if(Buf) { - ExFreePool(Buf); + ExFreePoolWithTag(Buf, TAG_DC); } DPRINT1("GDIOBJ_AllocObjWithHandle failed\n"); return NULL; @@ -2644,7 +2644,8 @@ DC_Cleanup(PVOID ObjectBody) { PDC pDC = (PDC)ObjectBody; - RtlFreeUnicodeString(&pDC->DriverName); + if (pDC->DriverName.Buffer) + ExFreePoolWithTag(pDC->DriverName.Buffer, TAG_DC); return TRUE; } @@ -3103,7 +3104,7 @@ } } - RtlFreeUnicodeString(&DriverFileNames); + ExFreePoolWithTag(DriverFileNames.Buffer, TAG_RTLREGISTRY); } /* return cached info */ Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Thu Sep 4 03:47:56 2008 @@ -355,7 +355,7 @@ return 0; } - FontGDI->Filename = ExAllocatePool(PagedPool, FileName->Length + sizeof(WCHAR)); + FontGDI->Filename = ExAllocatePoolWithTag(PagedPool, FileName->Length + sizeof(WCHAR), TAG_PFF); if (FontGDI->Filename == NULL) { EngFreeMem(FontGDI);

1 0

[cwittich] 35920: add a --process parameter to redirect stdout to dbgout usage: dbgprint --process version_winetest.exe
by cwittich＠svn.reactos.org 04 Sep '08

04 Sep '08

Author: cwittich Date: Thu Sep 4 02:58:28 2008 New Revision: 35920 URL: http://svn.reactos.org/svn/reactos?rev=35920&view=rev Log: add a --process parameter to redirect stdout to dbgout usage: dbgprint --process version_winetest.exe Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c [iso-8859-1] Thu Sep 4 02:58:28 2008 @@ -5,11 +5,13 @@ * FILE: tools/dbgprint/dbgprint.c * PURPOSE: outputs a text via DbgPrint API * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + * Christoph von Wittich (Christoph_vW(a)ReactOS.org) */ #include <windows.h> #include <tchar.h> #include <debug.h> +#include <stdio.h> int _tmain(int argc, TCHAR ** argv) { @@ -29,30 +31,48 @@ return -1; } - buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); - if (!buf) + if (_tcsstr(argv[1], "--process") && (argc == 3)) { - return -1; + char psBuffer[128]; + FILE *pPipe; + + pPipe = _tpopen(argv[2], "r"); + if (pPipe != NULL) + { + while(fgets(psBuffer, 128, pPipe)) + { + OutputDebugStringA(psBuffer); + } + _pclose(pPipe); + } } + else + { + buf = HeapAlloc(GetProcessHeap(), 0, (bufsize+1) * sizeof(TCHAR)); + if (!buf) + { + return -1; + } - offset = 0; - for(i = 1; i < argc; i++) - { - int length = _tcslen(argv[i]); - _tcsncpy(&buf[offset], argv[i], length); - offset += length; - if (i + 1 < argc) + offset = 0; + for(i = 1; i < argc; i++) { - buf[offset] = _T(' '); + int length = _tcslen(argv[i]); + _tcsncpy(&buf[offset], argv[i], length); + offset += length; + if (i + 1 < argc) + { + buf[offset] = _T(' '); + } + else + { + buf[offset] = _T('\n'); + buf[offset+1] = _T('\0'); + } + offset++; } - else - { - buf[offset] = _T('\n'); - buf[offset+1] = _T('\0'); - } - offset++; + OutputDebugString(buf); + HeapFree(GetProcessHeap(), 0, buf); } - OutputDebugString(buf); - HeapFree(GetProcessHeap(), 0, buf); return 0; }

1 0

[cgutman] 35919: - Accept STATUS_SUCCESS also as done in config.c
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Wed Sep 3 18:37:09 2008 New Revision: 35919 URL: http://svn.reactos.org/svn/reactos?rev=35919&view=rev Log: - Accept STATUS_SUCCESS also as done in config.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Sep 3 18:37:09 2008 @@ -1623,7 +1623,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_SUCCESS) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status; Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Sep 3 18:37:09 2008 @@ -783,7 +783,7 @@ RtlInitUnicodeString(&ValueName, L"Bind"); NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL) + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) { NDIS_DbgPrint(MID_TRACE, ("Unable to query the Bind value for size\n")); ZwClose(DriverKeyHandle);

1 0

[ekohl] 35918: Add a missing VOID.
by ekohl＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: ekohl Date: Wed Sep 3 16:51:21 2008 New Revision: 35918 URL: http://svn.reactos.org/svn/reactos?rev=35918&view=rev Log: Add a missing VOID. Modified: trunk/reactos/base/services/svchost/svchost.c Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… ============================================================================== --- trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/svchost.c [iso-8859-1] Wed Sep 3 16:51:21 2008 @@ -142,7 +142,7 @@ return TRUE; } -VOID FreeServices() +VOID FreeServices(VOID) { while (FirstService) {

1 0

[ekohl] 35917: Add the spooler service to the bootcd and start the service upon startup.
by ekohl＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: ekohl Date: Wed Sep 3 16:06:22 2008 New Revision: 35917 URL: http://svn.reactos.org/svn/reactos?rev=35917&view=rev Log: Add the spooler service to the bootcd and start the service upon startup. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Sep 3 16:06:22 2008 @@ -695,6 +695,7 @@ "PNP_TDI", \ "TDI", \ "PlugPlay", \ + "SpoolerGroup", \ "Extended Base" ; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info @@ -1013,6 +1014,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Scsiport","Type",0x00010001,0x00000001 +; Spooler service +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DisplayName",0x00000000,"Printer Spooler" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Description",0x00000000,"Printer Spooler" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Group",0x00000000,"SpoolerGroup" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ImagePath",0x00020000,"%SystemRoot%\system32\spoolsv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Type",0x00010001,0x00000110 + ; Simple TCP services HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,"Supports the following TCP/IP services: Chargen, Daytime, Discard, Echo, QOTD" HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,"Simple TCP/IP Services" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Sep 3 16:06:22 2008 @@ -74,13 +74,14 @@ base\applications\winhlp32\winhlp32.exe 1 base\applications\wordpad\wordpad.exe 1 +base\services\audiosrv\audiosrv.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1 base\services\rpcss\rpcss.exe 1 +base\services\spoolsv\spoolsv.exe 1 base\services\tcpsvcs\tcpsvcs.exe 1 base\services\tcpsvcs\quotes 5 base\services\umpnpmgr\umpnpmgr.exe 1 -base\services\audiosrv\audiosrv.exe 1 base\setup\setup\setup.exe 1 base\setup\vmwinst\vmwinst.exe 1

1 0

[ekohl] 35916: Add a spooler service skeleton. Now the Service-Winetests can be used unmodified.
by ekohl＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: ekohl Date: Wed Sep 3 15:57:51 2008 New Revision: 35916 URL: http://svn.reactos.org/svn/reactos?rev=35916&view=rev Log: Add a spooler service skeleton. Now the Service-Winetests can be used unmodified. Added: trunk/reactos/base/services/spoolsv/ (with props) trunk/reactos/base/services/spoolsv/spoolsv.c (with props) trunk/reactos/base/services/spoolsv/spoolsv.rbuild (with props) trunk/reactos/base/services/spoolsv/spoolsv.rc (with props) Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Wed Sep 3 15:57:51 2008 @@ -13,6 +13,9 @@ <directory name="rpcss"> <xi:include href="rpcss/rpcss.rbuild" /> </directory> + <directory name="spoolsv"> + <xi:include href="spoolsv/spoolsv.rbuild" /> + </directory> <directory name="svchost"> <xi:include href="svchost/svchost.rbuild" /> </directory> Propchange: trunk/reactos/base/services/spoolsv/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Sep 3 15:57:51 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/services/spoolsv/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/services/spoolsv/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/services/spoolsv/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/spoolsv/spoolsv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.c (added) +++ trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] Wed Sep 3 15:57:51 2008 @@ -1,0 +1,87 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/spoolsv/spoolsv.c + * PURPOSE: Printer spooler + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#define WIN32_NO_STATUS +#include <windows.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ******************************************************************/ + +#define SERVICE_NAME TEXT("Spooler") + +SERVICE_STATUS_HANDLE ServiceStatusHandle; + + +/* FUNCTIONS *****************************************************************/ + + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + return ERROR_SUCCESS; + + default : + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + + +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, + ServiceControlHandler, + NULL); + + + + DPRINT("ServiceMain() done\n"); +} + + +int +wmain(int argc, WCHAR *argv[]) +{ + SERVICE_TABLE_ENTRY ServiceTable[2] = + { + {SERVICE_NAME, ServiceMain}, + {NULL, NULL} + }; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("Spoolsv: main() started\n"); + + StartServiceCtrlDispatcher(ServiceTable); + + DPRINT("Spoolsv: main() done\n"); + + ExitThread(0); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/services/spoolsv/spoolsv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/spoolsv/spoolsv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.rbuild (added) +++ trunk/reactos/base/services/spoolsv/spoolsv.rbuild [iso-8859-1] Wed Sep 3 15:57:51 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="spoolsv" type="win32cui" installbase="system32" installname="spoolsv.exe" unicode="yes"> + <include base="spoolsv">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>spoolsv.c</file> + <file>spoolsv.rc</file> +</module> Propchange: trunk/reactos/base/services/spoolsv/spoolsv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/spoolsv/spoolsv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.rc (added) +++ trunk/reactos/base/services/spoolsv/spoolsv.rc [iso-8859-1] Wed Sep 3 15:57:51 2008 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Spooler-Service\0" +#define REACTOS_STR_INTERNAL_NAME "Spoolsv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "Spoolsv.exe\0" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/spoolsv/spoolsv.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 35915: set eol-style:native
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Wed Sep 3 13:31:26 2008 New Revision: 35915 URL: http://svn.reactos.org/svn/reactos?rev=35915&view=rev Log: set eol-style:native Modified: trunk/rostests/directory.rbuild (props changed) Propchange: trunk/rostests/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 35914: remove sysregtest target
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Wed Sep 3 13:21:27 2008 New Revision: 35914 URL: http://svn.reactos.org/svn/reactos?rev=35914&view=rev Log: remove sysregtest target Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=35914&r1=3591… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Wed Sep 3 13:21:27 2008 @@ -438,9 +438,6 @@ ROS_OUTPUT=output-$(ARCH)-r \ world -sysregtest: - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg - .PHONY: rgenstat rgenstat: $(RGENSTAT_TARGET) $(ECHO_RGENSTAT)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs