Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[dgoette] 385: * start converter for new database layout * apply new layout to PHP code where possible * remove code that doesn't work any longer with the new layout

by dgoette＠svn.reactos.org

15 years, 9 months

[cwittich] 40603: sync SetupGetTargetPathW with wine fixes all setupapi query winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Apr 20 10:23:46 2009 New Revision: 40603 URL: http://svn.reactos.org/svn/reactos?rev=40603&view=rev Log: sync SetupGetTargetPathW with wine fixes all setupapi query winetests Modified: trunk/reactos/dll/win32/setupapi/query.c Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/query.c [iso-8859-1] Mon Apr 20 10:23:46 2009 @@ -563,19 +563,25 @@ {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; INFCONTEXT ctx; - WCHAR *dir; - INT size; + WCHAR *dir, systemdir[MAX_PATH]; + unsigned int size; + BOOL ret = FALSE; TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, buffer_size, required_size); - if (context && !SetupFindFirstLineW( hinf, destination_dirs, NULL, context )) return FALSE; - else if (section && !SetupFindFirstLineW( hinf, section, NULL, &ctx )) return FALSE; - else if (!SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx )) return FALSE; - - if (!(dir = PARSER_get_dest_dir( context ? context : &ctx ))) return FALSE; - - size = lstrlenW( dir ) + 1; + if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context ); + else if (section) + { + if (!(ret = SetupFindFirstLineW( hinf, destination_dirs, section, &ctx ))) + ret = SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx ); + } + if (!ret || !(dir = PARSER_get_dest_dir( context ? context : &ctx ))) + { + GetSystemDirectoryW( systemdir, MAX_PATH ); + dir = systemdir; + } + size = strlenW( dir ) + 1; if (required_size) *required_size = size; if (buffer) @@ -589,7 +595,7 @@ return FALSE; } } - HeapFree( GetProcessHeap(), 0, dir ); + if (dir != systemdir) HeapFree( GetProcessHeap(), 0, dir ); return TRUE; }

15 years, 9 months

[cwittich] 40602: fix 4 setupapi parser winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Apr 20 10:13:00 2009 New Revision: 40602 URL: http://svn.reactos.org/svn/reactos?rev=40602&view=rev Log: fix 4 setupapi parser winetests Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Mon Apr 20 10:13:00 2009 @@ -1494,11 +1494,9 @@ struct inf_file *file = hinf; int section_index; - SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; - SetLastError( ERROR_LINE_NOT_FOUND ); if (index < file->sections[section_index]->nb_lines) { context->Inf = hinf; @@ -1513,6 +1511,7 @@ index -= file->sections[section_index]->nb_lines; } TRACE( "(%p,%s) not found\n", hinf, debugstr_w(section) ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; } @@ -1554,7 +1553,6 @@ struct inf_file *file; int section_index; - SetLastError( ERROR_SECTION_NOT_FOUND ); for (file = hinf; file; file = file->next) { if ((section_index = find_section( file, section )) == -1) continue; @@ -1567,7 +1565,6 @@ ctx.Line = -1; return SetupFindNextMatchLineW( &ctx, key, context ); } - SetLastError( ERROR_LINE_NOT_FOUND ); /* found at least one section */ if (file->sections[section_index]->nb_lines) { context->Inf = hinf; @@ -1581,6 +1578,7 @@ } } TRACE( "(%p,%s,%s): not found\n", hinf, debugstr_w(section), debugstr_w(key) ); + SetLastError( ERROR_LINE_NOT_FOUND ); return FALSE; }

15 years, 9 months

[dgorbachev] 40601: More error checks. Bug #4393.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Apr 20 07:16:12 2009 New Revision: 40601 URL: http://svn.reactos.org/svn/reactos?rev=40601&view=rev Log: More error checks. Bug #4393. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/settings.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Apr 20 07:16:12 2009 @@ -580,6 +580,11 @@ if (LayoutList == NULL) { LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); + if (LayoutList == NULL) + { + /* FIXME: Handle error! */ + return; + } } ListEntry = GetFirstListEntry(LayoutList); @@ -841,9 +846,9 @@ ListEntry = GetNextListEntry(ListEntry); } - SetConsoleCodePage(); - - return INSTALL_INTRO_PAGE; + SetConsoleCodePage(); + + return INSTALL_INTRO_PAGE; } return LANGUAGE_PAGE; Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Apr 20 07:16:12 2009 @@ -825,6 +825,7 @@ PWCHAR UserData; const MUI_LAYOUTS * LayoutsList; ULONG uIndex = 0; + BOOL KeyboardLayoutsFound = FALSE; /* Get default layout id */ if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) @@ -856,7 +857,7 @@ /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); DestroyGenericList(List, FALSE); - break; + return NULL; } if (_wcsicmp(LayoutsList[uIndex].LayoutID, KeyName) == 0) @@ -868,6 +869,9 @@ if (UserData == NULL) { /* FIXME: Handle error! */ + DPRINT("RtlAllocateHeap() failed\n"); + DestroyGenericList(List, FALSE); + return NULL; } wcscpy(UserData, KeyName); @@ -877,13 +881,22 @@ Buffer, UserData, _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); + KeyboardLayoutsFound = TRUE; } - + } while (SetupFindNextLine(&Context, &Context)); uIndex++; } while (LayoutsList[uIndex].LangID != NULL); + + /* FIXME: Handle this case */ + if (!KeyboardLayoutsFound) + { + DPRINT1("No keyboard layouts have been found\n"); + DestroyGenericList(List, FALSE); + return NULL; + } return List; } Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Mon Apr 20 07:16:12 2009 @@ -330,7 +330,7 @@ rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)szNameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - strcpy(szErrorOut, "Language Default setting exists, but isn't readable"); + sprintf(szErrorOut, "Language Default setting exists, but isn't readable (%S)", szIdBuffer); return(FALSE); }

15 years, 9 months

[dgorbachev] 40600: Don't fail with Chinese language (bug #4393). Please also fix 0.3.9.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Apr 20 07:14:40 2009 New Revision: 40600 URL: http://svn.reactos.org/svn/reactos?rev=40600&view=rev Log: Don't fail with Chinese language (bug #4393). Please also fix 0.3.9. Modified: trunk/reactos/base/setup/usetup/lang/zh-CN.h trunk/reactos/base/setup/usetup/lang/zh-TW.h trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/base/setup/usetup/lang/zh-CN.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/zh-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1] Mon Apr 20 07:14:40 2009 @@ -3,6 +3,7 @@ MUI_LAYOUTS zhCNLayouts[] = { + { L"0409", L"00000409" }, { L"0804", L"00000804" }, { L"0804", L"E00E0804" }, { L"0804", L"E0010804" }, Modified: trunk/reactos/base/setup/usetup/lang/zh-TW.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/zh-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1] Mon Apr 20 07:14:40 2009 @@ -3,6 +3,7 @@ MUI_LAYOUTS zhTWLayouts[] = { + { L"0409", L"00000409" }, { L"0404", L"00000404" }, { L"0404", L"E0080404" }, { L"0404", L"E0010404" }, Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Mon Apr 20 07:14:40 2009 @@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls" 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] Mon Apr 20 07:14:40 2009 @@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"

15 years, 9 months

[cwittich] 40599: import SetupEnumInfSectionsA/W from wine fixes setupapi parser winetest crash

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Apr 20 03:08:05 2009 New Revision: 40599 URL: http://svn.reactos.org/svn/reactos?rev=40599&view=rev Log: import SetupEnumInfSectionsA/W from wine fixes setupapi parser winetest crash Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Mon Apr 20 03:08:05 2009 @@ -5337,7 +5337,7 @@ DWORD KeyType, REGSAM samDesired) { - struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; HKEY key = INVALID_HANDLE_VALUE; HKEY RootKey; Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Mon Apr 20 03:08:05 2009 @@ -1359,6 +1359,75 @@ /*********************************************************************** + * SetupEnumInfSectionsA (SETUPAPI.@) + */ +BOOL WINAPI SetupEnumInfSectionsA( HINF hinf, UINT index, PSTR buffer, DWORD size, DWORD *need ) +{ + struct inf_file *file = hinf; + + for (file = hinf; file; file = file->next) + { + if (index < file->nb_sections) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, file->sections[index]->name, -1, + NULL, 0, NULL, NULL ); + if (need) *need = len; + if (!buffer) + { + if (!size) return TRUE; + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + if (len > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + WideCharToMultiByte( CP_ACP, 0, file->sections[index]->name, -1, buffer, size, NULL, NULL ); + return TRUE; + } + index -= file->nb_sections; + } + SetLastError( ERROR_NO_MORE_ITEMS ); + return FALSE; +} + + +/*********************************************************************** + * SetupEnumInfSectionsW (SETUPAPI.@) + */ +BOOL WINAPI SetupEnumInfSectionsW( HINF hinf, UINT index, PWSTR buffer, DWORD size, DWORD *need ) +{ + struct inf_file *file = hinf; + + for (file = hinf; file; file = file->next) + { + if (index < file->nb_sections) + { + DWORD len = strlenW( file->sections[index]->name ) + 1; + if (need) *need = len; + if (!buffer) + { + if (!size) return TRUE; + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + if (len > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + memcpy( buffer, file->sections[index]->name, len * sizeof(WCHAR) ); + return TRUE; + } + index -= file->nb_sections; + } + SetLastError( ERROR_NO_MORE_ITEMS ); + return FALSE; +} + + +/*********************************************************************** * SetupGetLineCountA (SETUPAPI.@) */ LONG WINAPI SetupGetLineCountA( HINF hinf, PCSTR name ) Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon Apr 20 03:08:05 2009 @@ -390,8 +390,8 @@ @ stdcall SetupDiUnremoveDevice(ptr ptr) @ stub SetupDuplicateDiskSpaceListA @ stub SetupDuplicateDiskSpaceListW -@ stub SetupEnumInfSectionsA -@ stub SetupEnumInfSectionsW +@ stdcall SetupEnumInfSectionsA(long long ptr long ptr) +@ stdcall SetupEnumInfSectionsW(long long ptr long ptr) @ stdcall SetupFindFirstLineA(long str str ptr) @ stdcall SetupFindFirstLineW(long wstr wstr ptr) @ stdcall SetupFindNextLine(ptr ptr)

15 years, 9 months

[janderwald] 40598: - Forward & wait IRP_MN_START_DEVICE to lower device objects before starting the device - Fix several irp leaks and return correct status in PcForwardIrpSynchronous

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 20 02:57:21 2009 New Revision: 40598 URL: http://svn.reactos.org/svn/reactos?rev=40598&view=rev Log: - Forward & wait IRP_MN_START_DEVICE to lower device objects before starting the device - Fix several irp leaks and return correct status in PcForwardIrpSynchronous Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Mon Apr 20 02:57:21 2009 @@ -76,24 +76,37 @@ return Status; } - /* Assign the resource list to our extension */ - DeviceExt->resources = resource_list; - + /* forward irp to lower device object */ + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + /* lower device object failed to start */ + resource_list->lpVtbl->Release(resource_list); + /* complete the request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* return result */ + return Status; + } + + /* sanity check */ ASSERT(DeviceExt->StartDevice); - /* Call the StartDevice routine */ DPRINT("Calling StartDevice at 0x%8p\n", DeviceExt->StartDevice); Status = DeviceExt->StartDevice(DeviceObject, Irp, resource_list); if (!NT_SUCCESS(Status)) { DPRINT("StartDevice returned a failure code [0x%8x]\n", Status); - //resource_list->lpVtbl->Release(resource_list); + resource_list->lpVtbl->Release(resource_list); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } + /* Assign the resource list to our extension */ + DeviceExt->resources = resource_list; + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -112,7 +125,10 @@ case IRP_MN_QUERY_INTERFACE: DPRINT("IRP_MN_QUERY_INTERFACE\n"); - return PcForwardIrpSynchronous(DeviceObject, Irp); + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; case IRP_MN_QUERY_DEVICE_RELATIONS: Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -124,7 +140,10 @@ return STATUS_SUCCESS; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); - return PcForwardIrpSynchronous(DeviceObject, Irp); + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } DPRINT1("unhandled function %u\n", IoStack->MinorFunction); @@ -282,7 +301,7 @@ { /* not yet, lets wait a bit */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = STATUS_SUCCESS; + Status = Irp->IoStatus.Status; } return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Mon Apr 20 02:57:21 2009 @@ -691,6 +691,7 @@ This->CloseIrp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(This->CloseIrp, IO_NO_INCREMENT); } + DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); /* this line is never reached */ } @@ -970,7 +971,10 @@ DPRINT1("Failed to add pin to service group\n"); return Status; } + This->ServiceGroup->lpVtbl->AddRef(This->ServiceGroup); This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); + This->DmaChannel->lpVtbl->AddRef(This->DmaChannel); + This->State = KSSTATE_STOP; This->CommonBufferOffset = 0; @@ -979,6 +983,9 @@ This->Capture = Capture; Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); + + This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); + return STATUS_SUCCESS; }

15 years, 9 months

[janderwald] 40597: - Handle IRP_MN_QUERY_RESOURCE_REQUIREMENTS

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 20 02:12:56 2009 New Revision: 40597 URL: http://svn.reactos.org/svn/reactos?rev=40597&view=rev Log: - Handle IRP_MN_QUERY_RESOURCE_REQUIREMENTS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Mon Apr 20 02:12:56 2009 @@ -122,6 +122,9 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + return PcForwardIrpSynchronous(DeviceObject, Irp); } DPRINT1("unhandled function %u\n", IoStack->MinorFunction);

15 years, 9 months

[janderwald] 40596: - Silence a few debug prints - Fix memory leaks on failure

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 20 02:01:57 2009 New Revision: 40596 URL: http://svn.reactos.org/svn/reactos?rev=40596&view=rev Log: - Silence a few debug prints - Fix memory leaks on failure Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -122,7 +122,7 @@ /* set the input format */ PinRequest.PinId = 0; - //DPRINT1("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + DPRINT("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), @@ -134,7 +134,7 @@ /* set the the output format */ PinRequest.PinId = 1; - //DPRINT1("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + DPRINT("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -41,12 +41,18 @@ Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); if (!NT_SUCCESS(Status)) { + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } if (!Count) { + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } @@ -56,6 +62,9 @@ if (!DeviceEntry->Pins) { /* no memory */ + ObDereferenceObject(DeviceEntry->FileObject); + ZwClose(DeviceEntry->Handle); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return; } @@ -101,7 +110,7 @@ } - DPRINT1("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); + DPRINT("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -139,7 +148,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("ZwCreateFile failed with %x\n", Status); + DPRINT("ZwCreateFile failed with %x\n", Status); return Status; } @@ -147,7 +156,7 @@ if (!NT_SUCCESS(Status)) { ZwClose(NodeHandle); - DPRINT1("ObReferenceObjectByHandle failed with %x\n", Status); + DPRINT("ObReferenceObjectByHandle failed with %x\n", Status); return Status; } @@ -210,12 +219,13 @@ Status = OpenDevice(&DeviceEntry->DeviceName, &DeviceEntry->Handle, &DeviceEntry->FileObject); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwCreateFile failed with %x\n", Status); + DPRINT("ZwCreateFile failed with %x\n", Status); + ExFreePool(DeviceEntry->DeviceName.Buffer); ExFreePool(DeviceEntry); return Status; } - DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); + DPRINT("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); //FIXME // mutal exclusion @@ -224,7 +234,7 @@ } else { - DPRINT1("Remove interface to audio device!\n"); + DPRINT("Remove interface to audio device!\n"); UNIMPLEMENTED return STATUS_SUCCESS; } @@ -250,7 +260,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + DPRINT("IoRegisterPlugPlayNotification failed with %x\n", Status); } Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, @@ -264,7 +274,7 @@ if (!NT_SUCCESS(Status)) { /* ignore failure for now */ - DPRINT1("IoRegisterPlugPlayNotification failed for DMOCATEGORY_ACOUSTIC_ECHO_CANCEL\n", Status); + DPRINT("IoRegisterPlugPlayNotification failed for DMOCATEGORY_ACOUSTIC_ECHO_CANCEL\n", Status); } return STATUS_SUCCESS; @@ -287,7 +297,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_MIDIOUT_DEVICE interface Status %x\n", Status); return Status; } @@ -299,7 +309,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_WAVEIN_DEVICE interface Status %x\n", Status); return Status; } @@ -311,7 +321,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_PREFERRED_WAVEOUT_DEVICE interface Status %x\n", Status); } Status = IoRegisterDeviceInterface(DeviceObject, &KSCATEGORY_SYSAUDIO, NULL, &SymbolicLink); @@ -322,7 +332,7 @@ } else { - DPRINT1("Failed to register KSCATEGORY_SYSAUDIO interface Status %x\n", Status); + DPRINT("Failed to register KSCATEGORY_SYSAUDIO interface Status %x\n", Status); } return Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -128,7 +128,7 @@ ExFreePool(DispatchContext); - //DPRINT1("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); + DPRINT("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); if (!Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References) { DPRINT("Closing pin %p\n", Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].PinHandle); @@ -159,7 +159,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -174,7 +174,7 @@ PIRP Irp) { - DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -195,7 +195,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -214,7 +214,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -232,7 +232,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; } @@ -353,7 +353,7 @@ /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); - DPRINT1("KsAllocateObjectHeader result %x\n", Status); + DPRINT("KsAllocateObjectHeader result %x\n", Status); /* complete the irp */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -24,7 +24,7 @@ NTAPI SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) { - DPRINT1("SysAudio_Unload called\n"); + DPRINT("SysAudio_Unload called\n"); } NTSTATUS @@ -79,7 +79,7 @@ SYSAUDIODEVEXT *DeviceExtension; - DPRINT1("SysAudio_InstallDevice called\n"); + DPRINT("SysAudio_InstallDevice called\n"); /* Create the device */ Status = IoCreateDevice(DriverObject, @@ -191,7 +191,7 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT1("System audio graph builder (sysaudio) started\n"); + DPRINT("System audio graph builder (sysaudio) started\n"); /* Let ks handle these */ KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Apr 20 02:01:57 2009 @@ -206,7 +206,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -220,7 +220,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -235,7 +235,7 @@ PIRP Irp) { - DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; @@ -256,7 +256,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -275,7 +275,7 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT1("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); return FALSE; @@ -296,7 +296,7 @@ PDISPATCH_CONTEXT Context; NTSTATUS Status; - //DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); Context = (PDISPATCH_CONTEXT)FileObject->FsContext2;

15 years, 9 months

[cfinck] 40595: Merge 40594

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Apr 20 01:42:26 2009 New Revision: 40595 URL: http://svn.reactos.org/svn/reactos?rev=40595&view=rev Log: Merge 40594 Modified: branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c Modified: branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 20 01:42:26 2009 @@ -1097,10 +1097,10 @@ LPWSTR pszDeviceInstance2) { CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulMinorAction); - UNREFERENCED_PARAMETER(pszDeviceInstance1); UNREFERENCED_PARAMETER(pszDeviceInstance2); DPRINT("PNP_DeviceInstanceAction() called\n"); @@ -1114,10 +1114,15 @@ break; case PNP_DEVINST_ENABLE: + { + PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; DPRINT("Enable device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; - break; + RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, pszDeviceInstance1); + Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); + if (!NT_SUCCESS(Status)) + ret = NtStatusToCrError(Status); + break; + } case PNP_DEVINST_REENUMERATE: DPRINT("Reenumerate device instance\n"); Modified: branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Mon Apr 20 01:42:26 2009 @@ -4642,21 +4642,18 @@ IN PSP_DEVINFO_DATA DeviceInfoData) { #ifndef __WINESRC__ - PLUGPLAY_CONTROL_RESET_DEVICE_DATA ResetDeviceData; + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - NTSTATUS Status; - - if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) - { - /* At the moment, I only know how to start local devices */ - SetLastError(ERROR_INVALID_COMPUTERNAME); - return FALSE; - } - - RtlInitUnicodeString(&ResetDeviceData.DeviceInstance, deviceInfo->instanceId); - Status = NtPlugPlayControl(PlugPlayControlResetDevice, &ResetDeviceData, sizeof(PLUGPLAY_CONTROL_RESET_DEVICE_DATA)); - SetLastError(RtlNtStatusToDosError(Status)); - return NT_SUCCESS(Status); + CONFIGRET cr; + + cr = CM_Enable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; #else FIXME("Stub: ResetDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE;

15 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
48
Older →

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 April 2009