Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[gedmurphy] 29119: forgot to remove the lib I linked for testing
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:32:58 2007 New Revision: 29119 URL: http://svn.reactos.org/svn/reactos?rev=29119&view=rev Log: forgot to remove the lib I linked for testing Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Thu Sep 20 17:32:58 2007 @@ -9,7 +9,6 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> - <library>ntdll</library> <library>setupapi</library> <file>main.c</file> <file>pnp_list_manager.c</file>

1 0

[gedmurphy] 29118: add the correct key name to match the service name
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:27:44 2007 New Revision: 29118 URL: http://svn.reactos.org/svn/reactos?rev=29118&view=rev Log: add the correct key name to match the service name Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Thu Sep 20 17:27:44 2007 @@ -481,13 +481,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 ; Audio Service -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,"Audio Service" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,"Provides audio facilities to applications" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 ; BusLogic 958 miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000

1 0

[gedmurphy] 29117: - use correct name when registering. - use unicode apis exclusively when required. - fix rbuild file
by gedmurphy＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: gedmurphy Date: Thu Sep 20 17:26:19 2007 New Revision: 29117 URL: http://svn.reactos.org/svn/reactos?rev=29117&view=rev Log: - use correct name when registering. - use unicode apis exclusively when required. - fix rbuild file Modified: trunk/reactos/base/services/audiosrv/audiosrv.h trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/audiosrv/main.c trunk/reactos/base/services/audiosrv/pnp.c trunk/reactos/base/services/audiosrv/pnp_list_manager.c Modified: trunk/reactos/base/services/audiosrv/audiosrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.h (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.h Thu Sep 20 17:26:19 2007 @@ -13,19 +13,6 @@ #define AUDIOSRV_PRIVATE_H extern SERVICE_STATUS_HANDLE service_status_handle; - - -/* main.c */ - -VOID CALLBACK -ServiceMain(DWORD argc, char** argv); - -DWORD WINAPI -ServiceControlHandler( - DWORD dwControl, - DWORD dwEventType, - LPVOID lpEventData, - LPVOID lpContext); /* List management (pnp_list_manager.c) */ Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Thu Sep 20 17:26:19 2007 @@ -1,7 +1,7 @@ -<module name="audiosrv" type="win32cui" installbase="system32" -installname="audiosrv.exe" allowwarnings="true"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true"> <include base="audiosrv">.</include> - <define name="UNICODE" /> <define name="__USE_W32API" /> <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0501</define> @@ -9,6 +9,7 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> + <library>ntdll</library> <library>setupapi</library> <file>main.c</file> <file>pnp_list_manager.c</file> Modified: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c (original) +++ trunk/reactos/base/services/audiosrv/main.c Thu Sep 20 17:26:19 2007 @@ -10,15 +10,6 @@ #include <audiosrv/audiosrv.h> #include "audiosrv.h" - - -/* Service table */ - -SERVICE_TABLE_ENTRY service_table[2] = -{ - { L"AudioSrv", (LPSERVICE_MAIN_FUNCTION) ServiceMain }, - { NULL, NULL } -}; SERVICE_STATUS_HANDLE service_status_handle; SERVICE_STATUS service_status; @@ -88,13 +79,13 @@ } VOID CALLBACK -ServiceMain(DWORD argc, char** argv) +ServiceMain(DWORD argc, LPWSTR argv) { logmsg("* Service starting\n"); logmsg("Registering service control handler...\n"); - service_status_handle = RegisterServiceCtrlHandlerEx(SERVICE_NAME, - ServiceControlHandler, - NULL); + service_status_handle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, + ServiceControlHandler, + NULL); logmsg("Service status handle %d\n", service_status_handle); if ( ! service_status_handle ) @@ -165,9 +156,17 @@ SetServiceStatus(service_status_handle, &service_status); } -int main() +int wmain() { + SERVICE_TABLE_ENTRYW service_table[] = + { + { SERVICE_NAME, (LPSERVICE_MAIN_FUNCTIONW) ServiceMain }, + { NULL, NULL } + }; + logmsg("Audio Service main()\n"); - StartServiceCtrlDispatcher(service_table); + if (!StartServiceCtrlDispatcherW(service_table)) + logmsg("StartServiceCtrlDispatcher failed\n"); + return 0; } Modified: trunk/reactos/base/services/audiosrv/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp.c (original) +++ trunk/reactos/base/services/audiosrv/pnp.c Thu Sep 20 17:26:19 2007 @@ -30,20 +30,20 @@ { SP_DEVICE_INTERFACE_DATA interface_data; SP_DEVINFO_DATA device_data; - PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data; + PSP_DEVICE_INTERFACE_DETAIL_DATA_W detail_data; HDEVINFO dev_info; DWORD length; int index = 0; const GUID category_guid = {STATIC_KSCATEGORY_AUDIO}; - dev_info = SetupDiGetClassDevsEx(&category_guid, - NULL, - NULL, - DIGCF_PRESENT | DIGCF_DEVICEINTERFACE, - NULL, - NULL, - NULL); + dev_info = SetupDiGetClassDevsExW(&category_guid, + NULL, + NULL, + DIGCF_PRESENT | DIGCF_DEVICEINTERFACE, + NULL, + NULL, + NULL); /* printf("%s:\n", ClassString); */ @@ -57,9 +57,9 @@ + (MAX_PATH * sizeof(WCHAR)); detail_data = - (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), - 0, - length); + (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), + 0, + length); while ( SetupDiEnumDeviceInterfaces(dev_info, @@ -73,15 +73,15 @@ ZeroMemory(detail_data, length); /* NOTE: We don't actually use device_data... */ - detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); + detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); device_data.cbSize = sizeof(device_data); device_data.Reserved = 0; - SetupDiGetDeviceInterfaceDetail(dev_info, - &interface_data, - detail_data, - length, - NULL, - &device_data); + SetupDiGetDeviceInterfaceDetailW(dev_info, + &interface_data, + detail_data, + length, + NULL, + &device_data); list_node = CreateDeviceDescriptor(detail_data->DevicePath, TRUE); AppendAudioDeviceToList(list_node); @@ -133,9 +133,9 @@ notification_filter.dbcc_classguid = wdmaud_guid; device_notification_handle = - RegisterDeviceNotification((HANDLE) service_status_handle, - &notification_filter, - DEVICE_NOTIFY_SERVICE_HANDLE + RegisterDeviceNotificationW((HANDLE) service_status_handle, + &notification_filter, + DEVICE_NOTIFY_SERVICE_HANDLE /* | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES*/); Modified: trunk/reactos/base/services/audiosrv/pnp_list_manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp_list_manager.c (original) +++ trunk/reactos/base/services/audiosrv/pnp_list_manager.c Thu Sep 20 17:26:19 2007 @@ -114,12 +114,12 @@ logmsg("Creating file mapping\n"); /* Expose our device list to the world */ - device_list_file = CreateFileMapping(INVALID_HANDLE_VALUE, - NULL, - PAGE_READWRITE, - 0, - max_size, - AUDIO_LIST_NAME); + device_list_file = CreateFileMappingW(INVALID_HANDLE_VALUE, + NULL, + PAGE_READWRITE, + 0, + max_size, + AUDIO_LIST_NAME); if ( ! device_list_file ) {

1 0

[hpoussin] 29116: Read Characteristics and BusType keys from .inf file, and write them in registry. This will probably help for installation of 3rd party drivers
by hpoussin＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: hpoussin Date: Thu Sep 20 17:26:18 2007 New Revision: 29116 URL: http://svn.reactos.org/svn/reactos?rev=29116&view=rev Log: Read Characteristics and BusType keys from .inf file, and write them in registry. This will probably help for installation of 3rd party drivers Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Thu Sep 20 17:26:18 2007 @@ -175,6 +175,15 @@ IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { + SP_DRVINFO_DATA_W DriverInfoData; + SP_DRVINFO_DETAIL_DATA_W DriverInfoDetail; + WCHAR SectionName[LINE_LEN]; + HINF hInf = INVALID_HANDLE_VALUE; + INFCONTEXT InfContext; + UINT ErrorLine; + INT CharacteristicsInt; + DWORD Characteristics; + LPWSTR BusType = NULL; RPC_STATUS RpcStatus; UUID Uuid; LPWSTR InstanceId = NULL; @@ -189,12 +198,42 @@ HKEY hNetworkKey = NULL; HKEY hConnectionKey = NULL; SP_DEVINSTALL_PARAMS_W installParams; - + if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + /* Get driver info details */ + DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + if (!SetupDiGetSelectedDriverW(DeviceInfoSet, DeviceInfoData, &DriverInfoData)) + { + rc = GetLastError(); + DPRINT("SetupDiGetSelectedDriverW() failed with error 0x%lx\n", rc); + goto cleanup; + } + DriverInfoDetail.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA_W); + if (!SetupDiGetDriverInfoDetailW(DeviceInfoSet, DeviceInfoData, &DriverInfoData, &DriverInfoDetail, sizeof(DriverInfoDetail), NULL) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + rc = GetLastError(); + DPRINT("SetupDiGetDriverInfoDetailW() failed with error 0x%lx\n", rc); + goto cleanup; + } + hInf = SetupOpenInfFileW(DriverInfoDetail.InfFileName, NULL, INF_STYLE_WIN4, &ErrorLine); + if (hInf == INVALID_HANDLE_VALUE) + { + rc = GetLastError(); + DPRINT("SetupOpenInfFileW() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (!SetupDiGetActualSectionToInstallW(hInf, DriverInfoDetail.SectionName, SectionName, LINE_LEN, NULL, NULL)) + { + rc = GetLastError(); + DPRINT("SetupDiGetActualSectionToInstallW() failed with error 0x%lx\n", rc); + goto cleanup; + } + /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) { @@ -202,7 +241,7 @@ rc = ERROR_GEN_FAILURE; goto cleanup; } - InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength); + InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); if (!InstanceId) { DPRINT("HeapAlloc() failed\n"); @@ -215,6 +254,46 @@ DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); goto cleanup; } + + /* Get Characteristics and BusType (optional) from .inf file */ + if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) + { + rc = GetLastError(); + DPRINT("Unable to find key %S in section %S of file %S (error 0x%lx)\n", + L"Characteristics", SectionName, DriverInfoDetail.InfFileName, rc); + goto cleanup; + } + if (!SetupGetIntField(&InfContext, 1, &CharacteristicsInt)) + { + rc = GetLastError(); + DPRINT("SetupGetIntField() failed with error 0x%lx\n", rc); + goto cleanup; + } + Characteristics = (DWORD)CharacteristicsInt; + if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext)) + { + if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } + BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); + if (!BusType) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } + } + else + BusType = NULL; /* Create a new UUID */ RpcStatus = UuidCreate(&Uuid); @@ -254,7 +333,7 @@ } wcscpy(DeviceName, L"\\Device\\"); wcscat(DeviceName, UuidString); - + /* Create export name */ ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!ExportName) @@ -331,6 +410,19 @@ DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); goto cleanup; } + rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (BusType) + rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); if (rc != ERROR_SUCCESS) { @@ -462,8 +554,11 @@ rc = ERROR_SUCCESS; cleanup: + if (hInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(hInf); if (UuidRpcString != NULL) RpcStringFreeW(&UuidRpcString); + HeapFree(GetProcessHeap(), 0, BusType); HeapFree(GetProcessHeap(), 0, InstanceId); HeapFree(GetProcessHeap(), 0, UuidString); HeapFree(GetProcessHeap(), 0, DeviceName); Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Thu Sep 20 17:26:18 2007 @@ -23,14 +23,14 @@ ;----------------------------- PCNET DRIVER ----------------------------- [PCNet_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 5 ; PCIBus AddReg = PCNet_AddReg.NT CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" -HKR,,BUSTYPE,,"5" HKR,,EXTPHY,,"0" HKR,,FDUP,,"0" HKR,,LED0,,"10000" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Thu Sep 20 17:26:18 2007 @@ -23,11 +23,12 @@ ;---------------------------- NE2000 DRIVER ----------------------------- [NE2000_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 14 ; PNPIsaBus AddReg = NE2000_AddReg.NT CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455" Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== --- trunk/reactos/media/inf/netrtpnt.inf (original) +++ trunk/reactos/media/inf/netrtpnt.inf Thu Sep 20 17:26:18 2007 @@ -23,12 +23,12 @@ ;---------------------------- NE2000 DRIVER ----------------------------- [NE2000_Inst.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 5 ; PCIBus AddReg = NE2000_AddReg.NT CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL -HKR,,BusType,0x00000000,"5" HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[fireball] 29115: Timo Kreuzer: - The debug object created by NtCreateDebugObject() is restricted to DEBUG_OBJECT_WAIT_STATE_CHANGE, change to DEBUG_OBJECT_ALL_ACCESS. See issue #2310 for more details.
by fireball＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: fireball Date: Thu Sep 20 16:46:58 2007 New Revision: 29115 URL: http://svn.reactos.org/svn/reactos?rev=29115&view=rev Log: Timo Kreuzer: - The debug object created by NtCreateDebugObject() is restricted to DEBUG_OBJECT_WAIT_STATE_CHANGE, change to DEBUG_OBJECT_ALL_ACCESS. See issue #2310 for more details. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Thu Sep 20 16:46:58 2007 @@ -1400,7 +1400,7 @@ ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DEBUG_OBJECT); ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_WAIT_STATE_CHANGE; + ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject;

1 0

[fireball] 29114: - Implement a fast->slow leaf conversion (this assert was hit by OO.o setup)
by fireball＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: fireball Date: Thu Sep 20 14:36:36 2007 New Revision: 29114 URL: http://svn.reactos.org/svn/reactos?rev=29114&view=rev Log: - Implement a fast->slow leaf conversion (this assert was hit by OO.o setup) Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Thu Sep 20 14:36:36 2007 @@ -1125,10 +1125,11 @@ { PCM_KEY_NODE KeyNode; PCM_KEY_INDEX Index; + PCM_KEY_FAST_INDEX OldIndex; UNICODE_STRING Name; HCELL_INDEX IndexCell = HCELL_NIL, CellToRelease = HCELL_NIL, LeafCell; PHCELL_INDEX RootPointer = NULL; - ULONG Type; + ULONG Type, i; BOOLEAN IsCompressed; PAGED_CODE(); @@ -1245,9 +1246,21 @@ if ((Index->Signature == CM_KEY_FAST_LEAF) && (Index->Count >= CmpMaxFastIndexPerHblock)) { - /* Not handled yet */ - DPRINT1("Fast->Slow Leaf Conversion not yet implemented!\n"); - ASSERT(FALSE); + DPRINT("Doing Fast->Slow Leaf conversion\n"); + + /* Mark this cell as dirty */ + HvMarkCellDirty(Hive, CellToRelease); + + /* Convert */ + OldIndex = (PCM_KEY_FAST_INDEX)Index; + + for (i=0; i < OldIndex->Count; i++) + { + Index->List[i] = OldIndex->List[i].Cell; + } + + /* Set the new type value */ + Index->Signature = CM_KEY_INDEX_LEAF; } else if (((Index->Signature == CM_KEY_INDEX_LEAF) || (Index->Signature == CM_KEY_HASH_LEAF)) &&

1 0

[hpoussin] 29113: Add missing svn:eol-style=native properties
by hpoussin＠svn.reactos.org 20 Sep '07

20 Sep '07

Author: hpoussin Date: Thu Sep 20 13:47:58 2007 New Revision: 29113 URL: http://svn.reactos.org/svn/reactos?rev=29113&view=rev Log: Add missing svn:eol-style=native properties Modified: trunk/reactos/include/ndk/powerpc/ketypes.h (props changed) trunk/reactos/include/ndk/powerpc/mmtypes.h (props changed) trunk/reactos/include/reactos/elf/elf-powerpc.h (props changed) trunk/reactos/include/reactos/libs/ppcmmu/mmu.h (props changed) trunk/reactos/include/reactos/libs/ppcmmu/mmuutil.h (props changed) trunk/reactos/include/reactos/ppcboot.h (props changed) trunk/reactos/include/reactos/ppcdebug.h (props changed) trunk/reactos/include/reactos/ppcfont.h (props changed) trunk/reactos/lib/rtl/powerpc/except.c (props changed) trunk/reactos/lib/rtl/powerpc/interlocked.c (props changed) trunk/reactos/lib/rtl/powerpc/thread.c (props changed) trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h (props changed) Propchange: trunk/reactos/include/ndk/powerpc/ketypes.h ------------------------------------------------------------------------------ --- eol-style (original) +++ eol-style (removed) @@ -1,1 +1,0 @@ -native Propchange: trunk/reactos/include/ndk/powerpc/ketypes.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ndk/powerpc/mmtypes.h ------------------------------------------------------------------------------ --- eol-style (original) +++ eol-style (removed) @@ -1,1 +1,0 @@ -native Propchange: trunk/reactos/include/reactos/elf/elf-powerpc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/libs/ppcmmu/mmu.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/libs/ppcmmu/mmuutil.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/ppcboot.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/ppcdebug.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/ppcfont.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/rtl/powerpc/except.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/rtl/powerpc/interlocked.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/rtl/powerpc/thread.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/powerpc/intrin_i.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 29112: Move the settings read code into a single function which is called before creating the property sheet.
by ekohl＠svn.reactos.org 19 Sep '07

19 Sep '07

Author: ekohl Date: Thu Sep 20 01:31:49 2007 New Revision: 29112 URL: http://svn.reactos.org/svn/reactos?rev=29112&view=rev Log: Move the settings read code into a single function which is called before creating the property sheet. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Thu Sep 20 01:31:49 2007 @@ -12,6 +12,7 @@ #include <commctrl.h> #include <cpl.h> #include <stdlib.h> +#include <tchar.h> #include "resource.h" #include "access.h" @@ -25,6 +26,135 @@ { {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; + + +static BOOL +ReadSettings(PGLOBAL_DATA pGlobalData) +{ + DWORD dwDisposition; + DWORD dwLength; + HKEY hKey; + LONG lError; + + /* Get sticky keys information */ + pGlobalData->stickyKeys.cbSize = sizeof(STICKYKEYS); + if (!SystemParametersInfo(SPI_GETSTICKYKEYS, + sizeof(STICKYKEYS), + &pGlobalData->stickyKeys, + 0)) + return FALSE; + + /* Get filter keys information */ + pGlobalData->filterKeys.cbSize = sizeof(FILTERKEYS); + if (!SystemParametersInfo(SPI_GETFILTERKEYS, + sizeof(FILTERKEYS), + &pGlobalData->filterKeys, + 0)) + return FALSE; + + /* Get toggle keys information */ + pGlobalData->toggleKeys.cbSize = sizeof(TOGGLEKEYS); + if (!SystemParametersInfo(SPI_GETTOGGLEKEYS, + sizeof(TOGGLEKEYS), + &pGlobalData->toggleKeys, + 0)) + return FALSE; + + /* Get keyboard preference information */ + if (!SystemParametersInfo(SPI_GETKEYBOARDPREF, + 0, + &pGlobalData->bKeyboardPref, + 0)) + return FALSE; + + /* Get high contrast information */ + pGlobalData->highContrast.cbSize = sizeof(HIGHCONTRAST); + SystemParametersInfo(SPI_GETHIGHCONTRAST, + sizeof(HIGHCONTRAST), + &pGlobalData->highContrast, + 0); + + SystemParametersInfo(SPI_GETCARETWIDTH, + 0, + &pGlobalData->uCaretWidth, + 0); + + pGlobalData->uCaretBlinkTime = GetCaretBlinkTime(); + + /* get sound settings */ + pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); + SystemParametersInfo(SPI_GETSOUNDSENTRY, + sizeof(SOUNDSENTRY), + &pGlobalData->ssSoundSentry, + 0); + + SystemParametersInfo(SPI_GETSHOWSOUNDS, + 0, + &pGlobalData->bShowSounds, + 0); + + /* Get mouse keys information */ + pGlobalData->mouseKeys.cbSize = sizeof(MOUSEKEYS); + SystemParametersInfo(SPI_GETMOUSEKEYS, + sizeof(MOUSEKEYS), + &pGlobalData->mouseKeys, + 0); + + /* Get access timeout information */ + pGlobalData->accessTimeout.cbSize = sizeof(ACCESSTIMEOUT); + SystemParametersInfo(SPI_GETACCESSTIMEOUT, + sizeof(ACCESSTIMEOUT), + &pGlobalData->accessTimeout, + 0); + + /* Get serial keys information */ + pGlobalData->serialKeys.cbSize = sizeof(SERIALKEYS); + pGlobalData->serialKeys.lpszActivePort = pGlobalData->szActivePort; + pGlobalData->serialKeys.lpszPort = pGlobalData->szPort; + SystemParametersInfo(SPI_GETSERIALKEYS, + sizeof(SERIALKEYS), + &pGlobalData->serialKeys, + 0); + + pGlobalData->bWarningSounds = TRUE; + pGlobalData->bSoundOnActivation = TRUE; + + lError = RegCreateKeyEx(HKEY_CURRENT_USER, + _T("Control Panel\\Accessibility"), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_EXECUTE | KEY_QUERY_VALUE, + NULL, + &hKey, + &dwDisposition); + if (lError != ERROR_SUCCESS) + return TRUE; + + dwLength = sizeof(BOOL); + lError = RegQueryValueEx(hKey, + _T("Warning Sounds"), + NULL, + NULL, + (LPBYTE)&pGlobalData->bWarningSounds, + &dwLength); + if (lError != ERROR_SUCCESS) + pGlobalData->bWarningSounds = TRUE; + + dwLength = sizeof(BOOL); + lError = RegQueryValueEx(hKey, + _T("Sound On Activation"), + NULL, + NULL, + (LPBYTE)&pGlobalData->bSoundOnActivation, + &dwLength); + if (lError != ERROR_SUCCESS) + pGlobalData->bSoundOnActivation = TRUE; + + RegCloseKey(hKey); + + return TRUE; +} static VOID @@ -55,6 +185,9 @@ pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); if (pGlobalData == NULL) + return 0; + + if (!ReadSettings(pGlobalData)) return 0; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Thu Sep 20 01:31:49 2007 @@ -150,20 +150,6 @@ return FALSE; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - - /* Get high contrast information */ - pGlobalData->highContrast.cbSize = sizeof(HIGHCONTRAST); - SystemParametersInfo(SPI_GETHIGHCONTRAST, - sizeof(HIGHCONTRAST), - &pGlobalData->highContrast, - 0); - - SystemParametersInfo(SPI_GETCARETWIDTH, - 0, - &pGlobalData->uCaretWidth, - 0); - - pGlobalData->uCaretBlinkTime = GetCaretBlinkTime(); pGlobalData->fShowCaret = TRUE; GetWindowRect(GetDlgItem(hwndDlg, IDC_CURSOR_WIDTH_TEXT), &pGlobalData->rcCaret); Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Thu Sep 20 01:31:49 2007 @@ -127,70 +127,6 @@ 0, (LPARAM)szBuffer); } -} - - -static VOID -ReadGlobalData(PGLOBAL_DATA pGlobalData) -{ - DWORD dwDisposition; - DWORD dwLength; - HKEY hKey; - LONG lError; - - /* Get access timeout information */ - pGlobalData->accessTimeout.cbSize = sizeof(ACCESSTIMEOUT); - SystemParametersInfo(SPI_GETACCESSTIMEOUT, - sizeof(ACCESSTIMEOUT), - &pGlobalData->accessTimeout, - 0); - - /* Get serial keys information */ - pGlobalData->serialKeys.cbSize = sizeof(SERIALKEYS); - pGlobalData->serialKeys.lpszActivePort = pGlobalData->szActivePort; - pGlobalData->serialKeys.lpszPort = pGlobalData->szPort; - SystemParametersInfo(SPI_GETSERIALKEYS, - sizeof(SERIALKEYS), - &pGlobalData->serialKeys, - 0); - - pGlobalData->bWarningSounds = TRUE; - pGlobalData->bSoundOnActivation = TRUE; - - lError = RegCreateKeyEx(HKEY_CURRENT_USER, - _T("Control Panel\\Accessibility"), - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_EXECUTE | KEY_QUERY_VALUE, - NULL, - &hKey, - &dwDisposition); - if (lError != ERROR_SUCCESS) - return; - - dwLength = sizeof(BOOL); - lError = RegQueryValueEx(hKey, - _T("Warning Sounds"), - NULL, - NULL, - (LPBYTE)&pGlobalData->bWarningSounds, - &dwLength); - if (lError != ERROR_SUCCESS) - pGlobalData->bWarningSounds = TRUE; - - dwLength = sizeof(BOOL); - lError = RegQueryValueEx(hKey, - _T("Sound On Activation"), - NULL, - NULL, - (LPBYTE)&pGlobalData->bSoundOnActivation, - &dwLength); - if (lError != ERROR_SUCCESS) - pGlobalData->bSoundOnActivation = TRUE; - - - RegCloseKey(hKey); } @@ -262,8 +198,6 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - ReadGlobalData(pGlobalData); - /* Set access timeout info */ CheckDlgButton(hwndDlg, IDC_RESET_BOX, Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Thu Sep 20 01:31:49 2007 @@ -580,66 +580,6 @@ } -static VOID -OnInitDialog(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData) -{ - /* Get sticky keys information */ - pGlobalData->stickyKeys.cbSize = sizeof(STICKYKEYS); - if (!SystemParametersInfo(SPI_GETSTICKYKEYS, - sizeof(STICKYKEYS), - &pGlobalData->stickyKeys, - 0)) - { - return; - } - - /* Get filter keys information */ - pGlobalData->filterKeys.cbSize = sizeof(FILTERKEYS); - if (!SystemParametersInfo(SPI_GETFILTERKEYS, - sizeof(FILTERKEYS), - &pGlobalData->filterKeys, - 0)) - { - return; - } - - /* Get toggle keys information */ - pGlobalData->toggleKeys.cbSize = sizeof(TOGGLEKEYS); - if (!SystemParametersInfo(SPI_GETTOGGLEKEYS, - sizeof(TOGGLEKEYS), - &pGlobalData->toggleKeys, - 0)) - { - return; - } - - /* Get keyboard preference information */ - if (!SystemParametersInfo(SPI_GETKEYBOARDPREF, - 0, - &pGlobalData->bKeyboardPref, - 0)) - { - return; - } - - CheckDlgButton(hwndDlg, - IDC_STICKY_BOX, - pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, - IDC_FILTER_BOX, - pGlobalData->filterKeys.dwFlags & FKF_FILTERKEYSON ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, - IDC_TOGGLE_BOX, - pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON ? BST_CHECKED : BST_UNCHECKED); - - CheckDlgButton(hwndDlg, - IDC_KEYBOARD_EXTRA, - pGlobalData->bKeyboardPref ? BST_CHECKED : BST_UNCHECKED); -} - - /* Property page dialog callback */ INT_PTR CALLBACK KeyboardPageProc(HWND hwndDlg, @@ -660,7 +600,22 @@ return FALSE; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - OnInitDialog(hwndDlg, pGlobalData); + + CheckDlgButton(hwndDlg, + IDC_STICKY_BOX, + pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_FILTER_BOX, + pGlobalData->filterKeys.dwFlags & FKF_FILTERKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_TOGGLE_BOX, + pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_KEYBOARD_EXTRA, + pGlobalData->bKeyboardPref ? BST_CHECKED : BST_UNCHECKED); return TRUE; case WM_COMMAND: Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Thu Sep 20 01:31:49 2007 @@ -166,13 +166,6 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - /* Get mouse keys information */ - pGlobalData->mouseKeys.cbSize = sizeof(MOUSEKEYS); - SystemParametersInfo(SPI_GETMOUSEKEYS, - sizeof(MOUSEKEYS), - &pGlobalData->mouseKeys, - 0); - /* Set the checkbox */ CheckDlgButton(hwndDlg, IDC_MOUSE_BOX, Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Thu Sep 20 01:31:49 2007 @@ -21,17 +21,6 @@ { TCHAR szBuffer[256]; UINT i; - - pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); - SystemParametersInfo(SPI_GETSOUNDSENTRY, - sizeof(SOUNDSENTRY), - &pGlobalData->ssSoundSentry, - 0); - - SystemParametersInfo(SPI_GETSHOWSOUNDS, - 0, - &pGlobalData->bShowSounds, - 0); /* Add strings to the combo-box */ for (i = 0; i < 4; i++)

1 0

[silverblade] 29111: Add prototype for UnregisterDeviceNotifications() to audiosrv.h (bug 2664)
by silverblade＠svn.reactos.org 19 Sep '07

19 Sep '07

Author: silverblade Date: Thu Sep 20 00:11:28 2007 New Revision: 29111 URL: http://svn.reactos.org/svn/reactos?rev=29111&view=rev Log: Add prototype for UnregisterDeviceNotifications() to audiosrv.h (bug 2664) Modified: trunk/reactos/base/services/audiosrv/audiosrv.h Modified: trunk/reactos/base/services/audiosrv/audiosrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.h (original) +++ trunk/reactos/base/services/audiosrv/audiosrv.h Thu Sep 20 00:11:28 2007 @@ -56,6 +56,9 @@ BOOL RegisterForDeviceNotifications(); +VOID +UnregisterDeviceNotifications(); + DWORD HandleDeviceEvent( DWORD dwEventType,

1 0

[hpoussin] 29110: Fix compilation Remove broken property
by hpoussin＠svn.reactos.org 19 Sep '07

19 Sep '07

Author: hpoussin Date: Wed Sep 19 23:29:40 2007 New Revision: 29110 URL: http://svn.reactos.org/svn/reactos?rev=29110&view=rev Log: Fix compilation Remove broken property Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild (props changed) trunk/reactos/base/services/audiosrv/audiosrv.rc (props changed) trunk/reactos/base/services/audiosrv/audiosrv.txt (props changed) trunk/reactos/base/services/audiosrv/debug.c (props changed) trunk/reactos/base/services/audiosrv/main.c (props changed) trunk/reactos/base/services/audiosrv/pnp.c (props changed) trunk/reactos/base/services/audiosrv/pnp_list_lock.c (props changed) trunk/reactos/base/services/audiosrv/pnp_list_manager.c (contents, props changed) Propchange: trunk/reactos/base/services/audiosrv/audiosrv.rbuild ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/audiosrv.rc ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/audiosrv.txt ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/debug.c ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/main.c ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/pnp.c ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Propchange: trunk/reactos/base/services/audiosrv/pnp_list_lock.c ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h Modified: trunk/reactos/base/services/audiosrv/pnp_list_manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp… ============================================================================== --- trunk/reactos/base/services/audiosrv/pnp_list_manager.c (original) +++ trunk/reactos/base/services/audiosrv/pnp_list_manager.c Wed Sep 19 23:29:40 2007 @@ -29,7 +29,7 @@ if ( ! device ) { - log("Failed to create a device descriptor (malloc fail)\n"); + logmsg("Failed to create a device descriptor (malloc fail)\n"); return NULL; } @@ -76,7 +76,7 @@ /* We DON'T want to overshoot the end of the buffer! */ if ( audio_device_list->size + device_info_size > audio_device_list->max_size ) { - printf("max_size would be exceeded! Failing...\n"); + /*printf("max_size would be exceeded! Failing...\n");*/ return FALSE; } @@ -91,7 +91,7 @@ UnlockAudioDeviceList(); - log("Device added to list\n"); + logmsg("Device added to list\n"); return TRUE; } @@ -112,7 +112,7 @@ turning up before we're ready... */ LockAudioDeviceList(); - log("Creating file mapping\n"); + logmsg("Creating file mapping\n"); /* Expose our device list to the world */ device_list_file = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, @@ -123,7 +123,7 @@ if ( ! device_list_file ) { - log("Creation of audio device list failed (err %d)\n", GetLastError()); + logmsg("Creation of audio device list failed (err %d)\n", GetLastError()); UnlockAudioDeviceList(); KillAudioDeviceListLock(); @@ -131,7 +131,7 @@ return FALSE; } - log("Mapping view of file\n"); + logmsg("Mapping view of file\n"); /* Of course, we'll need to access the list ourselves */ audio_device_list = MapViewOfFile(device_list_file, FILE_MAP_WRITE, @@ -141,7 +141,7 @@ if ( ! audio_device_list ) { - log("MapViewOfFile FAILED (err %d)\n", GetLastError()); + logmsg("MapViewOfFile FAILED (err %d)\n", GetLastError()); CloseHandle(device_list_file); device_list_file = NULL; @@ -162,7 +162,7 @@ UnlockAudioDeviceList(); - log("Device list created\n"); + logmsg("Device list created\n"); return TRUE; } @@ -170,7 +170,7 @@ VOID DestroyAudioDeviceList() { - log("Destroying device list\n"); + logmsg("Destroying device list\n"); LockAudioDeviceList(); Propchange: trunk/reactos/base/services/audiosrv/pnp_list_manager.c ------------------------------------------------------------------------------ --- eol-style:native (original) +++ eol-style:native (removed) @@ -1,1 +1,0 @@ -base/services/audiosrv/audiosrv.h

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
59
Older →

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 September 2007