Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[tkreuzer] 56255: [REGEDIT] Handle Ctrl-A in address bar. Patch by Edijs Kolesnikovics (terminedijs at yahoo dot com) See issue #5936 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 08:06:21 2012 New Revision: 56255 URL: http://svn.reactos.org/svn/reactos?rev=56255&view=rev Log: [REGEDIT] Handle Ctrl-A in address bar. Patch by Edijs Kolesnikovics (terminedijs at yahoo dot com) See issue #5936 for more details. Modified: trunk/reactos/base/applications/regedit/main.c Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.c [iso-8859-1] Wed Mar 28 08:06:21 2012 @@ -177,6 +177,16 @@ BOOL TranslateChildTabMessage(MSG *msg) { if (msg->message != WM_KEYDOWN) return FALSE; + + /* Allow Ctrl+A on address bar */ + if ((msg->hwnd == g_pChildWnd->hAddressBarWnd) && + (msg->message == WM_KEYDOWN) && + (msg->wParam == 'A') && (GetKeyState(VK_CONTROL) < 0)) + { + SendMessage(msg->hwnd, EM_SETSEL, 0, -1); + return TRUE; + } + if (msg->wParam != VK_TAB) return FALSE; if (GetParent(msg->hwnd) != g_pChildWnd->hWnd) return FALSE; PostMessage(g_pChildWnd->hWnd, WM_COMMAND, ID_SWITCH_PANELS, 0);

12 years, 5 months

[tkreuzer] 56254: [DESK.CPL] Simplify code, patch by Edijs Kolesnikovics (terminedijs at yahoo dot com)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 07:09:53 2012 New Revision: 56254 URL: http://svn.reactos.org/svn/reactos?rev=56254&view=rev Log: [DESK.CPL] Simplify code, patch by Edijs Kolesnikovics (terminedijs at yahoo dot com) Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Mar 28 07:09:53 2012 @@ -1415,8 +1415,8 @@ /* Set mouse speed */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SPEED); - SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19)); - SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSpeed - 1); + SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(1, 20)); + SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSpeed); if (pOptionData->MouseAccel.nAcceleration) { @@ -1625,7 +1625,7 @@ case TB_TOP: case TB_BOTTOM: case TB_ENDTRACK: - pOptionData->ulMouseSpeed = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SPEED, TBM_GETPOS, 0, 0) + 1; + pOptionData->ulMouseSpeed = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SPEED, TBM_GETPOS, 0, 0); SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break;

12 years, 5 months

[tkreuzer] 56253: [RTL] Remove pointless ASSERTs, instead set the balance of the new node to balanced, before inserting it. Dedicated to Alex.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 21:41:39 2012 New Revision: 56253 URL: http://svn.reactos.org/svn/reactos?rev=56253&view=rev Log: [RTL] Remove pointless ASSERTs, instead set the balance of the new node to balanced, before inserting it. Dedicated to Alex. Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5625… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Mar 27 21:41:39 2012 @@ -203,45 +203,6 @@ return TRUE; } -#ifdef PRTL_BALANCED_LINKS -void -Indent(ULONG Level) -{ - while (Level--) - { - DbgPrint(" "); - } -} - -VOID -DbgDumpAvlNodes( - PRTL_BALANCED_LINKS Node, - ULONG Level) -{ - if (Level == 0) - { - DbgPrint("++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); - DbgPrint("Root = %p\n", Node); - } - - Indent(Level+1); DbgPrint("LetChid = %p", Node->LeftChild); - if (Node->LeftChild) - { - DbgPrint("(%lx, %lx)\n", Node->LeftChild->StartingVpn,Node->LeftChild->EndingVpn); - DbgDumpAvlNodes(Node->LeftChild, Level+1); - } - else DbgPrint("\n"); - Indent(Level+1); DbgPrint("RightChild = %p\n", Node->RightChild); - if (Node->RightChild) - { - DbgPrint("(%lx, %lx)\n", Node->RightChild->StartingVpn,Node->RightChild->EndingVpn); - DbgDumpAvlNodes(Node->RightChild, Level+1); - } - else DbgPrint("\n"); -} -#endif - - VOID FORCEINLINE RtlpInsertAvlTreeNode(IN PRTL_AVL_TABLE Table, @@ -254,6 +215,7 @@ /* Initialize the new inserted element */ MI_ASSERT(SearchResult != TableFoundNode); NewNode->LeftChild = NewNode->RightChild = NULL; + RtlSetBalance(NewNode, RtlBalancedAvlTree); /* Increase element count */ Table->NumberGenericTableElements++; @@ -263,15 +225,6 @@ { /* This is the new root node */ RtlInsertAsRightChildAvl(&Table->BalancedRoot, NewNode); - //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); - if (RtlBalance(NewNode) != RtlBalancedAvlTree) - { - DPRINT1("Warning: Root node unbalanced?\n"); -#ifdef PRTL_BALANCED_LINKS - DbgDumpAvlNodes(&Table->BalancedRoot, 0); - KeRosDumpStackFrames(NULL, 0); -#endif - } /* On AVL trees, we also update the depth */ ASSERT(Table->DepthOfTree == 0); @@ -290,15 +243,6 @@ } /* Little cheat to save on loop processing, taken from Timo */ - //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); - if (RtlBalance(NewNode) != RtlBalancedAvlTree) - { - DPRINT1("Warning: Root node unbalanced?\n"); -#ifdef PRTL_BALANCED_LINKS - DbgDumpAvlNodes(&Table->BalancedRoot, 0); - KeRosDumpStackFrames(NULL, 0); -#endif - } RtlSetBalance(&Table->BalancedRoot, RtlLeftHeavyAvlTree); /*

12 years, 5 months

[tkreuzer] 56252: [BROWSEUI] Make DllInstall export private to silence an MSVC warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 20:05:02 2012 New Revision: 56252 URL: http://svn.reactos.org/svn/reactos?rev=56252&view=rev Log: [BROWSEUI] Make DllInstall export private to silence an MSVC warning Modified: trunk/reactos/dll/win32/browseui/browseui.spec Modified: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] Tue Mar 27 20:05:02 2012 @@ -1,7 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) -@ stdcall DllInstall(long wstr) +@ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() 101 stdcall -noname InitOCHostClass(long)

12 years, 5 months

[tkreuzer] 56251: fx build second try

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 17:41:42 2012 New Revision: 56251 URL: http://svn.reactos.org/svn/reactos?rev=56251&view=rev Log: fx build second try Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5625… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Mar 27 17:41:42 2012 @@ -205,7 +205,6 @@ #ifdef PRTL_BALANCED_LINKS void -FORCEINLINE Indent(ULONG Level) { while (Level--) @@ -214,7 +213,7 @@ } } -static VOID +VOID DbgDumpAvlNodes( PRTL_BALANCED_LINKS Node, ULONG Level)

12 years, 5 months

[tkreuzer] 56250: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 17:30:51 2012 New Revision: 56250 URL: http://svn.reactos.org/svn/reactos?rev=56250&view=rev Log: Fix build Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5625… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Mar 27 17:30:51 2012 @@ -203,6 +203,7 @@ return TRUE; } +#ifdef PRTL_BALANCED_LINKS void FORCEINLINE Indent(ULONG Level) @@ -213,13 +214,11 @@ } } -VOID -FORCEINLINE +static VOID DbgDumpAvlNodes( PRTL_BALANCED_LINKS Node, ULONG Level) { -#ifdef PRTL_BALANCED_LINKS if (Level == 0) { DbgPrint("++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); @@ -239,8 +238,9 @@ DbgPrint("(%lx, %lx)\n", Node->RightChild->StartingVpn,Node->RightChild->EndingVpn); DbgDumpAvlNodes(Node->RightChild, Level+1); } + else DbgPrint("\n"); +} #endif -} VOID @@ -268,8 +268,8 @@ if (RtlBalance(NewNode) != RtlBalancedAvlTree) { DPRINT1("Warning: Root node unbalanced?\n"); +#ifdef PRTL_BALANCED_LINKS DbgDumpAvlNodes(&Table->BalancedRoot, 0); -#ifdef PRTL_BALANCED_LINKS KeRosDumpStackFrames(NULL, 0); #endif } @@ -295,8 +295,8 @@ if (RtlBalance(NewNode) != RtlBalancedAvlTree) { DPRINT1("Warning: Root node unbalanced?\n"); +#ifdef PRTL_BALANCED_LINKS DbgDumpAvlNodes(&Table->BalancedRoot, 0); -#ifdef PRTL_BALANCED_LINKS KeRosDumpStackFrames(NULL, 0); #endif }

12 years, 5 months

[tkreuzer] 56249: [RTL] Add some temp AVL debugging code: In case an AVL table gets unbalanced, dump the table and a backtrace.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 17:19:53 2012 New Revision: 56249 URL: http://svn.reactos.org/svn/reactos?rev=56249&view=rev Log: [RTL] Add some temp AVL debugging code: In case an AVL table gets unbalanced, dump the table and a backtrace. Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5624… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Mar 27 17:19:53 2012 @@ -140,7 +140,7 @@ { /* This performs the rotation described in Knuth A8-A10 for Case 1 */ RtlPromoteAvlTreeNode(ChildNode); - + /* The nodes are now balanced */ RtlSetBalance(ChildNode, RtlBalancedAvlTree); RtlSetBalance(Node, RtlBalancedAvlTree); @@ -189,19 +189,59 @@ RtlSetBalance(SubChildNode, RtlBalancedAvlTree); return FALSE; } - + /* * The case that remains is that the child was already balanced, so this is * This is the rotation required for Case 3 in Knuth A8-A10 */ RtlPromoteAvlTreeNode(ChildNode); - + /* Now the child has the opposite weight of the node */ RtlSetBalance(ChildNode, -Balance); - + /* This only happens on deletion, so we return TRUE to terminate the delete */ return TRUE; } + +void +FORCEINLINE +Indent(ULONG Level) +{ + while (Level--) + { + DbgPrint(" "); + } +} + +VOID +FORCEINLINE +DbgDumpAvlNodes( + PRTL_BALANCED_LINKS Node, + ULONG Level) +{ +#ifdef PRTL_BALANCED_LINKS + if (Level == 0) + { + DbgPrint("++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); + DbgPrint("Root = %p\n", Node); + } + + Indent(Level+1); DbgPrint("LetChid = %p", Node->LeftChild); + if (Node->LeftChild) + { + DbgPrint("(%lx, %lx)\n", Node->LeftChild->StartingVpn,Node->LeftChild->EndingVpn); + DbgDumpAvlNodes(Node->LeftChild, Level+1); + } + else DbgPrint("\n"); + Indent(Level+1); DbgPrint("RightChild = %p\n", Node->RightChild); + if (Node->RightChild) + { + DbgPrint("(%lx, %lx)\n", Node->RightChild->StartingVpn,Node->RightChild->EndingVpn); + DbgDumpAvlNodes(Node->RightChild, Level+1); + } +#endif +} + VOID FORCEINLINE @@ -211,7 +251,7 @@ IN OUT TABLE_SEARCH_RESULT SearchResult) { CHAR Balance; - + /* Initialize the new inserted element */ MI_ASSERT(SearchResult != TableFoundNode); NewNode->LeftChild = NewNode->RightChild = NULL; @@ -225,8 +265,15 @@ /* This is the new root node */ RtlInsertAsRightChildAvl(&Table->BalancedRoot, NewNode); //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); - if (RtlBalance(NewNode) != RtlBalancedAvlTree) DPRINT1("Warning: Root node unbalanced?\n"); - + if (RtlBalance(NewNode) != RtlBalancedAvlTree) + { + DPRINT1("Warning: Root node unbalanced?\n"); + DbgDumpAvlNodes(&Table->BalancedRoot, 0); +#ifdef PRTL_BALANCED_LINKS + KeRosDumpStackFrames(NULL, 0); +#endif + } + /* On AVL trees, we also update the depth */ ASSERT(Table->DepthOfTree == 0); Table->DepthOfTree = 1; @@ -245,7 +292,14 @@ /* Little cheat to save on loop processing, taken from Timo */ //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); - if (RtlBalance(NewNode) != RtlBalancedAvlTree) DPRINT1("Warning: Root node unbalanced?\n"); + if (RtlBalance(NewNode) != RtlBalancedAvlTree) + { + DPRINT1("Warning: Root node unbalanced?\n"); + DbgDumpAvlNodes(&Table->BalancedRoot, 0); +#ifdef PRTL_BALANCED_LINKS + KeRosDumpStackFrames(NULL, 0); +#endif + } RtlSetBalance(&Table->BalancedRoot, RtlLeftHeavyAvlTree); /* @@ -258,13 +312,13 @@ { /* Calculate which side to balance on */ Balance = RtlIsLeftChildAvl(NewNode) ? RtlLeftHeavyAvlTree : RtlRightHeavyAvlTree; - + /* Check if the parent node was balanced */ if (RtlBalance(NodeOrParent) == RtlBalancedAvlTree) { /* It's not balanced anymore (heavy on one side) */ RtlSetBalance(NodeOrParent, Balance); - + /* Move up */ NewNode = NodeOrParent; NodeOrParent = RtlParentAvl(NodeOrParent); @@ -273,14 +327,14 @@ { /* The parent's balance is opposite, so the tree is balanced now */ RtlSetBalance(NodeOrParent, RtlBalancedAvlTree); - + /* Check if this is the root (the cheat applied earlier gets us here) */ if (RtlBalance(&Table->BalancedRoot) == RtlBalancedAvlTree) { /* The depth has thus increased */ Table->DepthOfTree++; } - + /* We reached the root or a balanced node, so we're done */ break; } @@ -301,10 +355,10 @@ PRTL_BALANCED_LINKS DeleteNode = NULL, ParentNode; PRTL_BALANCED_LINKS *Node1, *Node2; CHAR Balance; - + /* Take one of the children if possible */ if (!(RtlLeftChildAvl(Node)) || !(RtlRightChildAvl(Node))) DeleteNode = Node; - + /* Otherwise, check if one side is longer */ if (!(DeleteNode) && (RtlBalance(Node) >= RtlBalancedAvlTree)) { @@ -316,34 +370,34 @@ { /* Pick the predecessor which will be the longest side in this case */ DeleteNode = RtlLeftChildAvl(Node); - while (RtlRightChildAvl(DeleteNode)) DeleteNode = RtlRightChildAvl(DeleteNode); - } - + while (RtlRightChildAvl(DeleteNode)) DeleteNode = RtlRightChildAvl(DeleteNode); + } + /* Get the parent node */ ParentNode = RtlParentAvl(DeleteNode); DPRINT("Parent: %p\n", ParentNode); - + /* Pick which now to use based on whether or not we have a left child */ Node1 = RtlLeftChildAvl(DeleteNode) ? &DeleteNode->LeftChild : &DeleteNode->RightChild; DPRINT("Node 1: %p %p\n", Node1, *Node1); - + /* Pick which node to swap based on if we're already a left child or not */ Node2 = RtlIsLeftChildAvl(DeleteNode) ? &ParentNode->LeftChild : &ParentNode->RightChild; DPRINT("Node 2: %p %p\n", Node2, *Node2); - + /* Pick the correct balance depending on which side will get heavier */ Balance = RtlIsLeftChildAvl(DeleteNode) ? RtlLeftHeavyAvlTree : RtlRightHeavyAvlTree; DPRINT("Balance: %lx\n", Balance); - + /* Swap the children nodes, making one side heavier */ *Node2 = *Node1; - + /* If the node has a child now, update its parent */ if (*Node1) RtlSetParent(*Node1, ParentNode); /* Assume balanced root for loop optimization */ RtlSetBalance(&Table->BalancedRoot, RtlBalancedAvlTree); - + /* Loop up the tree by parents */ while (TRUE) { @@ -374,7 +428,7 @@ /* Choose which balance factor to use based on which side we're on */ Balance = RtlIsRightChild(ParentNode) ? RtlRightHeavyAvlTree : RtlLeftHeavyAvlTree; - + /* Iterate up the tree */ ParentNode = RtlParentAvl(ParentNode); } @@ -384,7 +438,7 @@ /* Copy the deleted node itself */ RtlpCopyAvlNodeData(DeleteNode, Node); - + /* Pick the right node to unlink */ Node1 = RtlIsLeftChildAvl(Node) ? &(RtlParentAvl(DeleteNode))->LeftChild : &(RtlParentAvl(DeleteNode))->RightChild;

12 years, 5 months

[akhaldi] 56248: [FBTUSB] * Properly add fbtusb. This fixes both gcc and msvc builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 27 16:36:53 2012 New Revision: 56248 URL: http://svn.reactos.org/svn/reactos?rev=56248&view=rev Log: [FBTUSB] * Properly add fbtusb. This fixes both gcc and msvc builds. Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Tue Mar 27 16:36:53 2012 @@ -1,18 +1,27 @@ -include_directories( - BEFORE include - include) +include_directories(include) -add_library(fbtusb SHARED +list(APPEND SOURCE fbtdev.c fbtpnp.c fbtpwr.c fbtrwr.c - fbtusb.c # fbtwmi.c + fbtusb.c) + +add_library(fbtusb SHARED + ${SOURCE} fbtusb.rc) -allow_warnings(fbtusb) +# FIXME: http://www.cmake.org/Bug/view.php?id=12998 +if(MSVC) + #add_target_compile_flags(fbtusb "/Gz") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") +else() + #allow_warnings(fbtusb) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -mrtd -fno-builtin") +endif() + set_module_type(fbtusb kernelmodedriver) add_importlibs(fbtusb ntoskrnl hal usbd) add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all)

12 years, 5 months

[tkreuzer] 56247: [FREELDR] - Refactor some multiply used overly complex expressions into human readable variable names - Output some useful debuginfo when an import could bot be resolved

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Mar 27 09:47:10 2012 New Revision: 56247 URL: http://svn.reactos.org/svn/reactos?rev=56247&view=rev Log: [FREELDR] - Refactor some multiply used overly complex expressions into human readable variable names - Output some useful debuginfo when an import could bot be resolved Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Tue Mar 27 09:47:10 2012 @@ -156,7 +156,8 @@ if (!Status) { - ERR("WinLdrpScanImportAddressTable() failed\n"); + ERR("WinLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n", + ImportName, DirectoryPath); return Status; } } @@ -507,6 +508,8 @@ PUSHORT OrdinalTable; LONG High, Low, Middle, Result; ULONG Hint; + PIMAGE_IMPORT_BY_NAME ImportData; + PCHAR ExportName; //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); @@ -540,9 +543,12 @@ //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); } + /* Get the import name */ + ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData); + /* Get pointers to Name and Ordinal tables (RVA -> VA) */ - NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); - OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); + NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); + OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); @@ -551,15 +557,13 @@ Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; //TRACE("HintIndex %d\n", Hint); + /* Get the export name from the hint */ + ExportName = VaToPa(RVA(DllBase, NameTable[Hint])); + /* If Hint is less than total number of entries in the export directory, and import name == export name, then we can just get it from the OrdinalTable */ - if ( - (Hint < ExportDirectory->NumberOfNames) && - ( - strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), - (PCHAR)VaToPa( RVA(DllBase, NameTable[Hint])) ) == 0 - ) - ) + if ((Hint < ExportDirectory->NumberOfNames) && + (strcmp(ExportName, (PCHAR)ImportData->Name) == 0)) { Ordinal = OrdinalTable[Hint]; //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); @@ -579,11 +583,13 @@ while (High >= Low) { /* Divide by 2 by shifting to the right once */ - Middle = (Low + High) >> 1; + Middle = (Low + High) / 2; + + /* Get the name from the name table */ + ExportName = VaToPa(RVA(DllBase, NameTable[Middle])); /* Compare the names */ - Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), - (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); + Result = strcmp(ExportName, (PCHAR)ImportData->Name); /*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/ /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ @@ -595,12 +601,12 @@ /* Depending on result of strcmp, perform different actions */ - if (Result < 0) + if (Result > 0) { /* Adjust top boundary */ High = Middle - 1; } - else if (Result > 0) + else if (Result < 0) { /* Adjust bottom boundary */ Low = Middle + 1; @@ -616,7 +622,7 @@ if (High < Low) { //Print(L"Error in binary search\n"); - ERR("Error in binary search!\n"); + ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); return FALSE; }

12 years, 5 months

[cgutman] 56246: [INF] - Add bth.inf [FBTUSB] - Add to build and bootcd

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Mar 27 08:47:46 2012 New Revision: 56246 URL: http://svn.reactos.org/svn/reactos?rev=56246&view=rev Log: [INF] - Add bth.inf [FBTUSB] - Add to build and bootcd Added: trunk/reactos/drivers/bluetooth/CMakeLists.txt (with props) trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt (with props) trunk/reactos/media/inf/bth.inf (with props) Modified: trunk/reactos/drivers/CMakeLists.txt trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Tue Mar 27 08:47:46 2012 @@ -1,6 +1,7 @@ add_subdirectory(base) add_subdirectory(battery) +add_subdirectory(bluetooth) add_subdirectory(bus) add_subdirectory(directx) add_subdirectory(filesystems) Added: trunk/reactos/drivers/bluetooth/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/CMakeLis… ============================================================================== --- trunk/reactos/drivers/bluetooth/CMakeLists.txt (added) +++ trunk/reactos/drivers/bluetooth/CMakeLists.txt [iso-8859-1] Tue Mar 27 08:47:46 2012 @@ -1,0 +1,2 @@ + +add_subdirectory(fbtusb) Propchange: trunk/reactos/drivers/bluetooth/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt (added) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Tue Mar 27 08:47:46 2012 @@ -1,0 +1,18 @@ + +include_directories( + BEFORE include + include) + +add_library(fbtusb SHARED + fbtdev.c + fbtpnp.c + fbtpwr.c + fbtrwr.c + fbtusb.c +# fbtwmi.c + fbtusb.rc) + +allow_warnings(fbtusb) +set_module_type(fbtusb kernelmodedriver) +add_importlibs(fbtusb ntoskrnl hal usbd) +add_cd_file(TARGET fbtusb DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Tue Mar 27 08:47:46 2012 @@ -3,6 +3,7 @@ audio.inf battery.inf bda.inf + bth.inf cdrom.inf cpu.inf disk.inf Added: trunk/reactos/media/inf/bth.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bth.inf?rev=5624… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/bth.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Tue Mar 27 08:47:46 2012 @@ -3,7 +3,8 @@ ClassGUID = {00000000-0000-0000-0000-000000000000} [DeviceInfsToInstall] -battery.inf +battery.inf +bth.inf cdrom.inf cpu.inf disk.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

12 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2012