Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 40606: - Partially implement CancelDC, DrawEscape - Add check of params for EnumObjects, SetMetaFileBitsEx
by dchapyshev＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dchapyshev Date: Mon Apr 20 16:28:59 2009 New Revision: 40606 URL: http://svn.reactos.org/svn/reactos?rev=40606&view=rev Log: - Partially implement CancelDC, DrawEscape - Add check of params for EnumObjects, SetMetaFileBitsEx Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Apr 20 16:28:59 2009 @@ -78,9 +78,8 @@ WINAPI CancelDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + /* FIXME Sharememory */ + return NtGdiCancelDC(hdc); } @@ -90,13 +89,12 @@ int WINAPI DrawEscape(HDC hdc, - int a1, - int a2, - LPCSTR a3) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + INT nEscape, + INT cbInput, + LPCSTR lpszInData) +{ + /* FIXME Sharememory */ + return NtGdiDrawEscape(hdc, nEscape, cbInput, (LPSTR) lpszInData); } @@ -106,10 +104,21 @@ int WINAPI EnumObjects(HDC hdc, - int a1, - GOBJENUMPROC a2, - LPARAM a3) -{ + int nObjectType, + GOBJENUMPROC lpObjectFunc, + LPARAM lParam) +{ + switch (nObjectType) + { + case OBJ_BRUSH: + case OBJ_PEN: + break; + + default: + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; @@ -182,10 +191,21 @@ HMETAFILE WINAPI SetMetaFileBitsEx( - UINT a0, - CONST BYTE *a1 - ) -{ + UINT size, + CONST BYTE *lpData + ) +{ + const METAHEADER *mh_in = (const METAHEADER *)lpData; + + if (size & 1) return 0; + + if (!size || mh_in->mtType != METAFILE_MEMORY || mh_in->mtVersion != 0x300 || + mh_in->mtHeaderSize != sizeof(METAHEADER) / 2) + { + SetLastError(ERROR_INVALID_DATA); + return 0; + } + UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0;

1 0

[tkreuzer] 40605: Fix handling of UWOP_ALLOC_LARGE, thanks to ktietz for noticing.
by tkreuzer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: tkreuzer Date: Mon Apr 20 15:11:12 2009 New Revision: 40605 URL: http://svn.reactos.org/svn/reactos?rev=40605&view=rev Log: Fix handling of UWOP_ALLOC_LARGE, thanks to ktietz for noticing. Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Mon Apr 20 15:11:12 2009 @@ -354,8 +354,8 @@ { Code[0].UnwindOp = UWOP_ALLOC_LARGE; Code[0].OpInfo = 1; - Code[1].FrameOffset = (AllocSize / 8); - Code[2].FrameOffset = (AllocSize / 8) >> 16; + Code[1].FrameOffset = (USHORT)AllocSize; + Code[2].FrameOffset = (USHORT)(AllocSize >> 16); cCodes = 3; } break;

1 0

[tkreuzer] 40604: Simplify code in RtlLookupFunctionEntry. Add missing breaks in RtlVirtualUnwind. Improve documentation comments.
by tkreuzer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: tkreuzer Date: Mon Apr 20 14:25:49 2009 New Revision: 40604 URL: http://svn.reactos.org/svn/reactos?rev=40604&view=rev Log: Simplify code in RtlLookupFunctionEntry. Add missing breaks in RtlVirtualUnwind. Improve documentation comments. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Mon Apr 20 14:25:49 2009 @@ -103,8 +103,11 @@ return (PVOID)((ULONG64)DosHeader + Directory->VirtualAddress); } - -// http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx +/*! RtlLookupFunctionEntry + * \brief Locates the RUNTIME_FUNCTION entry corresponding to a code address. + * \ref http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx + * \todo Implement HistoryTable + */ PRUNTIME_FUNCTION NTAPI RtlLookupFunctionEntry( @@ -136,22 +139,20 @@ IndexMid = (IndexLo + IndexHi) / 2; FunctionEntry = &FunctionTable[IndexMid]; - if ( (ControlPc >= FunctionEntry->BeginAddress) && - (ControlPc < FunctionEntry->EndAddress) ) + if (ControlPc < FunctionEntry->BeginAddress) + { + /* Continue search in lower half */ + IndexHi = IndexMid; + } + else if (ControlPc >= FunctionEntry->EndAddress) + { + /* Continue search in upper half */ + IndexLo = IndexMid + 1; + } + else { /* ControlPc is within limits, return entry */ return FunctionEntry; - } - - if (ControlPc < FunctionEntry->BeginAddress) - { - /* Continue search in lower half */ - IndexHi = IndexMid; - } - else - { - /* Continue search in upper half */ - IndexLo = IndexMid + 1; } } @@ -182,13 +183,14 @@ SetReg(Context, Reg, Value); } -/* Helper function that tries to unwind epilog instructions. - * Returns TRUE we have been in an epilog and it could be unwound. +/*! RtlpTryToUnwindEpilog + * \brief Helper function that tries to unwind epilog instructions. + * \return TRUE if we have been in an epilog and it could be unwound. * FALSE if the instructions were not allowed for an epilog. - * References: + * \ref * http://msdn.microsoft.com/en-us/library/8ydc79k6(VS.80).aspx * http://msdn.microsoft.com/en-us/library/tawsa7cb.aspx - * TODO: + * \todo * - Test and compare with Windows behaviour */ BOOLEAN @@ -426,12 +428,19 @@ case UWOP_SAVE_XMM_FAR: i += 3; + break; + case UWOP_SAVE_XMM128: i += 2; + break; + case UWOP_SAVE_XMM128_FAR: i += 3; + break; + case UWOP_PUSH_MACHFRAME: i += 1; + break; } } @@ -542,7 +551,9 @@ return i; } -// http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Debug… +/*! RtlGetCallersAddress + * \ref http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Debug… + */ #undef RtlGetCallersAddress VOID NTAPI

1 0

[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 20 Apr '09

20 Apr '09

1 0

[cwittich] 40603: sync SetupGetTargetPathW with wine fixes all setupapi query winetests
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

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; }

1 0

[cwittich] 40602: fix 4 setupapi parser winetests
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

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; }

1 0

[dgorbachev] 40601: More error checks. Bug #4393.
by dgorbachev＠svn.reactos.org 20 Apr '09

20 Apr '09

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); }

1 0

[dgorbachev] 40600: Don't fail with Chinese language (bug #4393). Please also fix 0.3.9.
by dgorbachev＠svn.reactos.org 20 Apr '09

20 Apr '09

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"

1 0

[cwittich] 40599: import SetupEnumInfSectionsA/W from wine fixes setupapi parser winetest crash
by cwittich＠svn.reactos.org 19 Apr '09

19 Apr '09

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)

1 0

[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 19 Apr '09

19 Apr '09

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; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs