Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[cgutman] 53013: [TCPIP] - Add a couple more debug prints
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 23:32:38 2011 New Revision: 53013 URL: http://svn.reactos.org/svn/reactos?rev=53013&view=rev Log: [TCPIP] - Add a couple more debug prints Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 31 23:32:38 2011 @@ -284,6 +284,7 @@ { /* The client specified an explicit port so we force a bind to this */ AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + DbgPrint("Bind - Explicit port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) @@ -299,6 +300,7 @@ { /* The client is trying to bind to a local address so allocate a port now too */ AddrFile->Port = TCPAllocatePort(0); + DbgPrint("Bind - Unspecified port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff)

1 0

[rharabien] 53012: [INETCPL] - Add missing security propsheet to Polish translation. Should be synced to WINE. Spotted by Adam Stachowicz.
by rharabien＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: rharabien Date: Sun Jul 31 23:00:20 2011 New Revision: 53012 URL: http://svn.reactos.org/svn/reactos?rev=53012&view=rev Log: [INETCPL] - Add missing security propsheet to Polish translation. Should be synced to WINE. Spotted by Adam Stachowicz. Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sun Jul 31 23:00:20 2011 @@ -70,6 +70,24 @@ END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "BezpieczeÅstwo" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

[rharabien] 53011: [INETCPL] - Add Polish language to build. Spotted by Adam Stachowicz
by rharabien＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: rharabien Date: Sun Jul 31 22:50:05 2011 New Revision: 53011 URL: http://svn.reactos.org/svn/reactos?rev=53011&view=rev Log: [INETCPL] - Add Polish language to build. Spotted by Adam Stachowicz Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Sun Jul 31 22:50:05 2011 @@ -30,6 +30,7 @@ #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/Sr.rc" Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sun Jul 31 22:50:05 2011 @@ -1,7 +1,7 @@ /* * Internet control panel applet * - * Copyright 2010 £ukasz Wojni³owicz + * Copyright 2010 Åukasz WojniÅowicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,24 +23,27 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +/* UTF-8 */ +#pragma code_page(65001) + /* "General" propsheet */ IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Ogólne" +CAPTION "OgÃ³lne" BEGIN GROUPBOX " Strona domowa ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Mo¿esz wybraæ adres strony, która bêdzie twoj¹ stron¹ domow¹.", + LTEXT "MoÅ¼esz wybraÄ adres strony, ktÃ³ra bÄdzie twojÄ stronÄ domowÄ.", IDC_STATIC, 58, 10, 252, 10 EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL - PUSHBUTTON "U¿yj &bie¿¹cej", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "U¿yj d&omylnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 - PUSHBUTTON "U¿yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Historia przegl¹dania ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "Mo¿esz usun¹æ przechowywane strony, ciasteczka i inne dane.", + PUSHBUTTON "UÅ¼yj &bieÅ¼Äcej", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "UÅ¼yj d&omyÅlnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "UÅ¼yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 + GROUPBOX " Historia przeglÄdania ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "MoÅ¼esz usunÄÄ przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "&Usuñ pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&UsuÅ pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 PUSHBUTTON "Ustawie&nia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END @@ -49,21 +52,21 @@ IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Usuwanie historii przegl¹dania" +CAPTION "Usuwanie historii przeglÄdania" BEGIN - AUTOCHECKBOX "Tymczasowe pliki internetowe\nKopie stron sieci Web, obrazów i certyfikatów.", + AUTOCHECKBOX "Tymczasowe pliki internetowe\nKopie stron sieci Web, obrazÃ³w i certyfikatÃ³w.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Pliki cookies\nPliki przechowywane na komputerze przez witryny sieci Web w celu zapisania preferencji takich jak informacje logowania.", IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Historia\nLista odwiedzonych witryn sieci Web.", IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Dane formularzy\nZapisane informacje, które zosta³y wpisane w formularzach.", + AUTOCHECKBOX "Dane formularzy\nZapisane informacje, ktÃ³re zostaÅy wpisane w formularzach.", IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Has³a\nHas³a uzupe³niane automatycznie po zalogowaniu siê do wczeniej odwiedzonej witryny Web.", + AUTOCHECKBOX "HasÅa\nHasÅa uzupeÅniane automatycznie po zalogowaniu siÄ do wczeÅniej odwiedzonej witryny Web.", IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Anuluj", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Usuñ", IDOK, 120, 230, 60, 15, WS_GROUP + PUSHBUTTON "UsuÅ", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -71,11 +74,11 @@ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Zawartoæ" +CAPTION "ZawartoÅÄ" BEGIN GROUPBOX " Certyfikaty ", IDC_STATIC, 4, 4, 312, 50 - LTEXT "Certyfikaty s¹ u¿ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawców i urzêdów certyfikuj¹cych.", + LTEXT "Certyfikaty sÄ uÅ¼ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawcÃ³w i urzÄdÃ³w certyfikujÄcych.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Certyfikaty...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14

1 0

[cgutman] 53010: [IP] - Add some temporary debug prints to troubleshoot some seemingly random bind failures
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 22:32:18 2011 New Revision: 53010 URL: http://svn.reactos.org/svn/reactos?rev=53010&view=rev Log: [IP] - Add some temporary debug prints to troubleshoot some seemingly random bind failures Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Jul 31 22:32:18 2011 @@ -88,6 +88,8 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); + + DbgPrint("Listen - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -108,6 +110,7 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + DbgPrint("Listen - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jul 31 22:32:18 2011 @@ -773,6 +773,8 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); + + DbgPrint("Connect - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -803,6 +805,7 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + DbgPrint("Connect - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF);

1 0

[cgutman] 53009: [AFD] - Clear the sendable flag after a disconnect - Don't set the sendable flag if send has been closed
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 19:51:32 2011 New Revision: 53009 URL: http://svn.reactos.org/svn/reactos?rev=53009&view=rev Log: [AFD] - Clear the sendable flag after a disconnect - Don't set the sendable flag if send has been closed Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Jul 31 19:51:32 2011 @@ -720,6 +720,7 @@ FCB->DisconnectTimeout = DisReq->Timeout; FCB->DisconnectPending = TRUE; FCB->SendClosed = TRUE; + FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); if (Status == STATUS_PENDING) @@ -755,6 +756,8 @@ ExFreePool(FCB->RemoteAddress); FCB->RemoteAddress = NULL; + + FCB->PollState &= ~AFD_EVENT_SEND; } } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jul 31 19:51:32 2011 @@ -176,7 +176,8 @@ break; } - if (FCB->Send.Size - FCB->Send.BytesUsed != 0) + if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && + !FCB->SendClosed) { FCB->PollState |= AFD_EVENT_SEND; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS;

1 0

[tkreuzer] 53008: [NTOSKRNL] Fix OBTRACE definition. the macro used __VA_ARGS__ and passes that to DPRINT(fmt, ...) The preprocessor interpretes all arguments of __VA_ARGS__ as one token. This toke...
by tkreuzer＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: tkreuzer Date: Sun Jul 31 19:26:11 2011 New Revision: 53008 URL: http://svn.reactos.org/svn/reactos?rev=53008&view=rev Log: [NTOSKRNL] Fix OBTRACE definition. the macro used __VA_ARGS__ and passes that to DPRINT(fmt, ...) The preprocessor interpretes all arguments of __VA_ARGS__ as one token. This token was now passed as the first parameter of DPRINT1. This caused wrong parameters being used, resulting in a crash. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Sun Jul 31 19:26:11 2011 @@ -31,7 +31,7 @@ if (x & ObpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define OBTRACE(x, ...) DPRINT(__VA_ARGS__) +#define OBTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif //

1 0

[cgutman] 53007: [FREELDR] - Skip the floppy drive if the reset command failed
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 19:16:48 2011 New Revision: 53007 URL: http://svn.reactos.org/svn/reactos?rev=53007&view=rev Log: [FREELDR] - Skip the floppy drive if the reset command failed Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Jul 31 19:16:48 2011 @@ -670,7 +670,8 @@ if ((FloppyType > 5) || (FloppyType == 0)) continue; - DiskResetController(FloppyNumber); + if (!DiskResetController(FloppyNumber)) + continue; Ptr = GetInt1eTable();

1 0

[cgutman] 53006: [FLOPPY] - Report recalibration failure if the EC flag is set after seeking to fix a hang while trying to read - Thanks to igorko for testing
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 18:47:35 2011 New Revision: 53006 URL: http://svn.reactos.org/svn/reactos?rev=53006&view=rev Log: [FLOPPY] - Report recalibration failure if the EC flag is set after seeking to fix a hang while trying to read - Thanks to igorko for testing Modified: trunk/reactos/drivers/storage/floppy/hardware.c Modified: trunk/reactos/drivers/storage/floppy/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] Sun Jul 31 18:47:35 2011 @@ -448,7 +448,10 @@ /* Is the equipment check flag set? Could be no disk in drive... */ if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK) - INFO_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"); + { + WARN_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning failure\n"); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; }

1 0

[cgutman] 53005: [SERIAL] - Update the I/O manager's global configuration table with the correct number of serial ports
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 17:18:50 2011 New Revision: 53005 URL: http://svn.reactos.org/svn/reactos?rev=53005&view=rev Log: [SERIAL] - Update the I/O manager's global configuration table with the correct number of serial ports Modified: trunk/reactos/drivers/serial/serial/pnp.c Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Sun Jul 31 17:18:50 2011 @@ -24,8 +24,6 @@ NTSTATUS Status; WCHAR DeviceNameBuffer[32]; UNICODE_STRING DeviceName; - static ULONG DeviceNumber = 0; - static ULONG ComPortNumber = 1; TRACE_(SERIAL, "SerialAddDeviceInternal()\n"); @@ -33,7 +31,7 @@ ASSERT(Pdo); /* Create new device object */ - swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); + swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", IoGetConfigurationInformation()->SerialCount); RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); Status = IoCreateDevice(DriverObject, sizeof(SERIAL_DEVICE_EXTENSION), @@ -59,9 +57,9 @@ goto ByeBye; } - DeviceExtension->SerialPortNumber = DeviceNumber++; + DeviceExtension->SerialPortNumber = IoGetConfigurationInformation()->SerialCount++; if (pComPortNumber == NULL) - DeviceExtension->ComPort = ComPortNumber++; + DeviceExtension->ComPort = DeviceExtension->SerialPortNumber + 1; else DeviceExtension->ComPort = *pComPortNumber; DeviceExtension->Pdo = Pdo;

1 0

[ekohl] 53004: [SERVICES] - ScmCreateOrReferenceServiceImage: Link the SERVICE_IMAGE struct to the SERVICE struct in the create and the reference case. Otherwise only the first service started from...
by ekohl＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: ekohl Date: Sun Jul 31 10:29:41 2011 New Revision: 53004 URL: http://svn.reactos.org/svn/reactos?rev=53004&view=rev Log: [SERVICES] - ScmCreateOrReferenceServiceImage: Link the SERVICE_IMAGE struct to the SERVICE struct in the create and the reference case. Otherwise only the first service started from an image gets a valid pImage pointer. - Add some debug code. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Jul 31 10:29:41 2011 @@ -116,7 +116,7 @@ PLIST_ENTRY ImageEntry; PSERVICE_IMAGE CurrentImage; - DPRINT("ScmGetServiceImageByImagePath() called\n"); + DPRINT("ScmGetServiceImageByImagePath(%S) called\n", lpImagePath); ImageEntry = ImageListHead.Flink; while (ImageEntry != &ImageListHead) @@ -149,7 +149,7 @@ NTSTATUS Status; DWORD dwError = ERROR_SUCCESS; - DPRINT("ScmCreateOrReferenceServiceImage()"); + DPRINT("ScmCreateOrReferenceServiceImage(%p)\n", pService); RtlInitUnicodeString(&ImagePath, NULL); @@ -211,17 +211,20 @@ /* Append service record */ InsertTailList(&ImageListHead, &pServiceImage->ImageListEntry); - - pService->lpImage = pServiceImage; } else { - /* Create a new service image */ - pService->lpImage->dwImageRunCount++; - } + /* Increment the run counter */ + pServiceImage->dwImageRunCount++; + } + + /* Link the service image to the service */ + pService->lpImage = pServiceImage; done:; RtlFreeUnicodeString(&ImagePath); + + DPRINT("ScmCreateOrReferenceServiceImage() done (Error: %lu)\n", dwError); return dwError; } @@ -1075,6 +1078,8 @@ BOOL Result; DWORD dwError = ERROR_SUCCESS; DWORD dwProcessId; + + DPRINT("ScmStartUserModeService(%p)\n", Service); StartupInfo.cb = sizeof(StartupInfo); StartupInfo.lpReserved = NULL;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011