Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 19076: - Implement cases 2 & 4 of RtlSplayTree
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Implement cases 2 & 4 of RtlSplayTree Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:42:40 UTC (rev 19075) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:47:25 UTC (rev 19076) @@ -258,12 +258,124 @@ /* Case 2: P is the right child of G */ if (RtlIsRightChild(P)) { + /* + * P's left-child becomes G's right child and + * N's left-child becomes P's right child. + */ + RtlRightChild(G) = RtlLeftChild(P); + RtlRightChild(P) = RtlLeftChild(N); + /* + * If they exist, update their parent pointers too, + * since they've changed trees. + */ + if (RtlRightChild(G)) RtlParent(RtlRightChild(G)) = G; + if (RtlRightChild(P)) RtlParent(RtlRightChild(P)) = P; + + /* + * Now we'll shove N all the way to the top. + * Check if G is the root first. + */ + if (RtlIsRoot(G)) + { + /* G doesn't have a parent, so N will become the root! */ + RtlParent(N) = N; + } + else + { + /* G has a parent, so inherit it since we take G's place */ + RtlParent(N) = RtlParent(G); + + /* + * Now find out who was referencing G and have it reference + * N instead, since we're taking G's place. + */ + if (RtlIsLeftChild(G)) + { + /* + * G was a left child, so change its parent's left + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + else + { + /* + * G was a right child, so change its parent's right + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + } + + /* Now N is on top, so P has become its child. */ + RtlLeftChild(N) = P; + RtlParent(P) = N; + + /* N is on top, P is its child, so G is grandchild. */ + RtlLeftChild(P) = G; + RtlParent(G) = P; } /* Case 4: P is the left child of G */ else if (RtlIsLeftChild(P)) { + /* + * N's left-child becomes G's right child and + * N's right-child becomes P's left child. + */ + RtlRightChild(P) = RtlLeftChild(N); + RtlLeftChild(G) = RtlRightChild(N); + /* + * If they exist, update their parent pointers too, + * since they've changed trees. + */ + if (RtlRightChild(P)) RtlParent(RtlRightChild(P)) = P; + if (RtlLeftChild(G)) RtlParent(RtlLeftChild(G)) = G; + + /* + * Now we'll shove N all the way to the top. + * Check if G is the root first. + */ + if (RtlIsRoot(G)) + { + /* G doesn't have a parent, so N will become the root! */ + RtlParent(N) = N; + } + else + { + /* G has a parent, so inherit it since we take G's place */ + RtlParent(N) = RtlParent(G); + + /* + * Now find out who was referencing G and have it reference + * N instead, since we're taking G's place. + */ + if (RtlIsLeftChild(G)) + { + /* + * G was a left child, so change its parent's left + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + else + { + /* + * G was a right child, so change its parent's right + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + } + + /* Now N is on top, so P has become its left child. */ + RtlLeftChild(N) = P; + RtlParent(G) = N; + + /* N is on top, P is its left child, so G is right child. */ + RtlRightChild(N) = G; + RtlParent(P) = N; } /* "Finally" case: N doesn't have a grandparent => P is root */ else

1 0

[ion] 19075: - Fix bug in case 2/4 denomination.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Fix bug in case 2/4 denomination. Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:40:37 UTC (rev 19074) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:42:40 UTC (rev 19075) @@ -255,13 +255,13 @@ /* Case 2 & 4: N is right child of P */ else { - /* Case 2: P is the left child of G */ - if (RtlIsLeftChild(P)) + /* Case 2: P is the right child of G */ + if (RtlIsRightChild(P)) { } - /* Case 4: P is the right child of G */ - else if (RtlIsRightChild(P)) + /* Case 4: P is the left child of G */ + else if (RtlIsLeftChild(P)) { }

1 0

[ion] 19074: - Implement Case 3 of RtlSplay
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Implement Case 3 of RtlSplay Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:33:07 UTC (rev 19073) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:40:37 UTC (rev 19074) @@ -136,7 +136,7 @@ /* * If they exist, update their parent pointers too, - * since they've changed trees + * since they've changed trees. */ if (RtlLeftChild(P)) RtlParent(RtlLeftChild(P)) = P; if (RtlLeftChild(G)) RtlParent(RtlLeftChild(G)) = G; @@ -177,18 +177,74 @@ } } - /* Now N is on top, so P has become its child */ + /* Now N is on top, so P has become its child. */ RtlRightChild(N) = P; RtlParent(P) = N; - /* N is on top, P is its child, so G is grandchild */ + /* N is on top, P is its child, so G is grandchild. */ RtlRightChild(P) = G; RtlParent(G) = P; } /* Case 3: P is the right child of G */ else if (RtlIsRightChild(P)) { + /* + * N's left-child becomes G's right child and + * N's right-child becomes P's left child. + */ + RtlRightChild(G) = RtlLeftChild(N); + RtlLeftChild(P) = RtlRightChild(N); + /* + * If they exist, update their parent pointers too, + * since they've changed trees. + */ + if (RtlRightChild(G)) RtlParent(RtlRightChild(G)) = G; + if (RtlLeftChild(P)) RtlParent(RtlLeftChild(P)) = P; + + /* + * Now we'll shove N all the way to the top. + * Check if G is the root first. + */ + if (RtlIsRoot(G)) + { + /* G doesn't have a parent, so N will become the root! */ + RtlParent(N) = N; + } + else + { + /* G has a parent, so inherit it since we take G's place */ + RtlParent(N) = RtlParent(G); + + /* + * Now find out who was referencing G and have it reference + * N instead, since we're taking G's place. + */ + if (RtlIsLeftChild(G)) + { + /* + * G was a left child, so change its parent's left + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + else + { + /* + * G was a right child, so change its parent's right + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + } + + /* Now N is on top, so G has become its left child. */ + RtlLeftChild(N) = G; + RtlParent(G) = N; + + /* N is on top, G is its left child, so P is right child. */ + RtlRightChild(N) = P; + RtlParent(P) = N; } /* "Finally" case: N doesn't have a grandparent => P is root */ else

1 0

[ion] 19073: - Implement Case 1 of RtlSplay
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Implement Case 1 of RtlSplay Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 22:54:39 UTC (rev 19072) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 23:33:07 UTC (rev 19073) @@ -127,7 +127,63 @@ /* Case 1: P is the left child of G */ if (RtlIsLeftChild(P)) { + /* + * N's right-child becomes P's left child and + * P's right-child becomes G's left child. + */ + RtlLeftChild(P) = RtlRightChild(N); + RtlLeftChild(G) = RtlRightChild(P); + /* + * If they exist, update their parent pointers too, + * since they've changed trees + */ + if (RtlLeftChild(P)) RtlParent(RtlLeftChild(P)) = P; + if (RtlLeftChild(G)) RtlParent(RtlLeftChild(G)) = G; + + /* + * Now we'll shove N all the way to the top. + * Check if G is the root first. + */ + if (RtlIsRoot(G)) + { + /* G doesn't have a parent, so N will become the root! */ + RtlParent(N) = N; + } + else + { + /* G has a parent, so inherit it since we take G's place */ + RtlParent(N) = RtlParent(G); + + /* + * Now find out who was referencing G and have it reference + * N instead, since we're taking G's place. + */ + if (RtlIsLeftChild(G)) + { + /* + * G was a left child, so change its parent's left + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + else + { + /* + * G was a right child, so change its parent's right + * child link to point to N now. + */ + RtlLeftChild(RtlParent(G)) = N; + } + } + + /* Now N is on top, so P has become its child */ + RtlRightChild(N) = P; + RtlParent(P) = N; + + /* N is on top, P is its child, so G is grandchild */ + RtlRightChild(P) = G; + RtlParent(G) = P; } /* Case 3: P is the right child of G */ else if (RtlIsRightChild(P))

1 0

[ion] 19072: - Implement RtlSplay skeleton cases.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Implement RtlSplay skeleton cases. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-08 22:45:45 UTC (rev 19071) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-08 22:54:39 UTC (rev 19072) @@ -24,6 +24,9 @@ #define RtlIsLeftChild(Links) \ (RtlLeftChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)) +#define RtlIsRightChild(Links) \ + (RtlRightChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)) + #define RtlRightChild(Links) \ ((PRTL_SPLAY_LINKS)(Links))->RightChild _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 22:45:45 UTC (rev 19071) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 22:54:39 UTC (rev 19072) @@ -109,8 +109,60 @@ * we keep recently accessed nodes near the root and keep the tree * roughly balanced, so that we achieve the desired amortized time bounds. */ - UNIMPLEMENTED; - return 0; + PRTL_SPLAY_LINKS N, P, G; + + /* N is the item we'll be playing with */ + N = Links; + + /* Let the algorithm run until N becomes the root entry */ + while (!RtlIsRoot(N)) + { + /* Now get the parent and grand-parent */ + P = RtlParent(N); + G = RtlParent(P); + + /* Case 1 & 3: N is left child of P */ + if (RtlIsLeftChild(N)) + { + /* Case 1: P is the left child of G */ + if (RtlIsLeftChild(P)) + { + + } + /* Case 3: P is the right child of G */ + else if (RtlIsRightChild(P)) + { + + } + /* "Finally" case: N doesn't have a grandparent => P is root */ + else + { + + } + } + /* Case 2 & 4: N is right child of P */ + else + { + /* Case 2: P is the left child of G */ + if (RtlIsLeftChild(P)) + { + + } + /* Case 4: P is the right child of G */ + else if (RtlIsRightChild(P)) + { + + } + /* "Finally" case: N doesn't have a grandparent => P is root */ + else + { + + } + } + } + + /* Return the root entry */ + return N; }

1 0

[ion] 19071: - Add implementation notes for RtlSplayTree
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Add implementation notes for RtlSplayTree Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-08 22:25:29 UTC (rev 19070) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-08 22:45:45 UTC (rev 19071) @@ -73,10 +73,42 @@ */ PRTL_SPLAY_LINKS NTAPI -RtlSplay ( - PRTL_SPLAY_LINKS Links - ) +RtlSplay(PRTL_SPLAY_LINKS Links) { + /* + * Implementation Notes (http://en.wikipedia.org/wiki/Splay_tree): + * + * To do a splay, we carry out a sequence of rotations, + * each of which moves the target node N closer to the root. + * + * Each particular step depends on only two factors: + * - Whether N is the left or right child of its parent node, P, + * - Whether P is the left or right child of its parent, G (for grandparent node). + * + * Thus, there are four cases: + * - Case 1: N is the left child of P and P is the left child of G. + * In this case we perform a double right rotation, so that + * P becomes N's right child, and G becomes P's right child. + * + * - Case 2: N is the right child of P and P is the right child of G. + * In this case we perform a double left rotation, so that + * P becomes N's left child, and G becomes P's left child. + * + * - Case 3: N is the left child of P and P is the right child of G. + * In this case we perform a rotation so that + * G becomes N's left child, and P becomes N's right child. + * + * - Case 4: N is the right child of P and P is the left child of G. + * In this case we perform a rotation so that + * P becomes N's left child, and G becomes N's right child. + * + * Finally, if N doesn't have a grandparent node, we simply perform a + * left or right rotation to move it to the root. + * + * By performing a splay on the node of interest after every operation, + * we keep recently accessed nodes near the root and keep the tree + * roughly balanced, so that we achieve the desired amortized time bounds. + */ UNIMPLEMENTED; return 0; }

1 0

[cwittich] 19070: started implementation of device driver installation wizard
by cwittich＠svn.reactos.com 08 Nov '05

08 Nov '05

started implementation of device driver installation wizard Modified: trunk/reactos/lib/newdev/De.rc Modified: trunk/reactos/lib/newdev/En.rc Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.h Modified: trunk/reactos/lib/newdev/newdev.xml Modified: trunk/reactos/lib/newdev/resource.h _____ Modified: trunk/reactos/lib/newdev/De.rc --- trunk/reactos/lib/newdev/De.rc 2005-11-08 22:04:46 UTC (rev 19069) +++ trunk/reactos/lib/newdev/De.rc 2005-11-08 22:25:29 UTC (rev 19070) @@ -6,15 +6,15 @@ CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Willkommen",IDC_WELCOMETITLE,115,8,195,24 + LTEXT "Willkommen",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Dieser Assistent installiert einen neuen Gerõtetreiber f³r:", - IDC_STATIC,115,40,195,16 - LTEXT "Klicken Sie auf Weiter um fortzufahren.",IDC_STATIC,115,169,195,17 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,129,55,164,11 + IDC_STATIC,120,40,195,16 + LTEXT "Klicken Sie auf Weiter um fortzufahren.",IDC_STATIC,120,169,195,17 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 CONTROL "Treiber automatisch installieren",IDC_RADIO_AUTO,"Button", - BS_AUTORADIOBUTTON,115,112,178,13 + BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Treiber von einer bestimmten Position installieren",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,115,133,164,14 + "Button",BS_AUTORADIOBUTTON,120,133,164,14 END IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 @@ -23,13 +23,13 @@ CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,115,8,195,24 + LTEXT "Installation fehlgeschlagen",IDC_FINISHTITLE,120,8,195,24 LTEXT "Der Gerõt konnte nicht installiert werden, da kein passender Treiber gefunden werden konnte.", - IDC_STATIC,115,40,195,19 + IDC_STATIC,120,40,195,19 LTEXT "Klicken Sie auf Zur³ck, wenn Sie eine Treiber CD oder Diskette haben oder den Pfad zum Treiber kennen.", - IDC_STATIC,113,98,181,24 + IDC_STATIC,120,98,181,24 CONTROL "Diesen Dialog nicht mehr anzeigen",IDC_DONOTSHOWDLG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11 + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -45,7 +45,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 CONTROL "Diesen Pfad ebenfalls durchsuchen",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,54,162,10 - PUSHBUTTON "Durchsuchen",IDC_BROWSE,248,69,45,14 + PUSHBUTTON "Durchsuchen",IDC_BROWSE,248,69,50,14 COMBOBOX IDC_COMBO_PATH,64,71,176,12,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -64,10 +64,10 @@ CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation abgeschlossen",IDC_FINISHTITLE,115,8,195,11 + LTEXT "Installation abgeschlossen",IDC_FINISHTITLE,120,8,195,11 LTEXT "Der Assistent hat die Installation erfolgreich abgeschlossen.", - IDC_STATIC,115,32,195,19 - LTEXT "Klicken Sie zum Beenden der Installation auf Fertigstellen.",IDC_STATIC,115,174, + IDC_STATIC,120,32,195,19 + LTEXT "Klicken Sie zum Beenden der Installation auf Fertigstellen.",IDC_STATIC,120,174, 190,11 LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END _____ Modified: trunk/reactos/lib/newdev/En.rc --- trunk/reactos/lib/newdev/En.rc 2005-11-08 22:04:46 UTC (rev 19069) +++ trunk/reactos/lib/newdev/En.rc 2005-11-08 22:25:29 UTC (rev 19070) @@ -6,15 +6,15 @@ CAPTION "Device installation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome",IDC_WELCOMETITLE,115,8,195,24 + LTEXT "Welcome",IDC_WELCOMETITLE,120,8,195,24 LTEXT "This wizard installs a new device driver for:", - IDC_STATIC,115,40,195,16 - LTEXT "Click Next to continue.",IDC_STATIC,115,169,195,17 - LTEXT "UNKNOWN DEVICE",IDC_DEVICE,129,55,164,11 + IDC_STATIC,120,40,195,16 + LTEXT "Click Next to continue.",IDC_STATIC,120,169,195,17 + LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 CONTROL "Install driver automatically",IDC_RADIO_AUTO,"Button", - BS_AUTORADIOBUTTON,115,112,178,13 + BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Install driver from specific location",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,115,133,164,14 + "Button",BS_AUTORADIOBUTTON,120,133,164,14 END IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 @@ -23,13 +23,13 @@ CAPTION "Device installation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation failed",IDC_FINISHTITLE,115,8,195,24 + LTEXT "Installation failed",IDC_FINISHTITLE,120,8,195,24 LTEXT "The device could not be installed because the driver could not be found.", - IDC_STATIC,115,40,195,19 + IDC_STATIC,120,40,195,19 LTEXT "Click on Back if you have a driver disk or know the path to the driver.", - IDC_STATIC,113,98,181,24 + IDC_STATIC,120,98,181,24 CONTROL "Do not show this dialog anymore",IDC_DONOTSHOWDLG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11 + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -45,7 +45,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 CONTROL "Include this path",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,54,162,10 - PUSHBUTTON "Browse",IDC_BROWSE,248,69,45,14 + PUSHBUTTON "Browse",IDC_BROWSE,248,69,50,14 COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -64,10 +64,10 @@ CAPTION "Device installation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation complete",IDC_FINISHTITLE,115,8,195,11 + LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 LTEXT "The wizard has finished installing the driver for:", - IDC_STATIC,115,32,195,19 - LTEXT "Click Finish to close the wizard.",IDC_STATIC,115,174, + IDC_STATIC,120,32,195,19 + LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, 179,11 LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-08 22:04:46 UTC (rev 19069) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-08 22:25:29 UTC (rev 19070) @@ -1,227 +1,922 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS New devices installation - * FILE: lib/newdev/newdev.c - * PURPOSE: New devices installation - * - * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) - */ +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS New devices installation +* FILE: lib/newdev/newdev.c +* PURPOSE: New devices installation +* +* PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) +*/ -#define NDEBUG + +//#define NDEBUG #include <debug.h> +#include <tchar.h> +#include <windows.h> +#include <commctrl.h> +#include <regstr.h> +#include <stdio.h> + #include "newdev.h" +#include "resource.h" -BOOL WINAPI -DevInstallW( - IN HWND hWndParent, - IN HINSTANCE hInstance, - IN LPCWSTR InstanceId, - IN INT Show) +static DEVINSTDATA DevInstData; +HINSTANCE hDllInstance; +HANDLE hThread; + +static HFONT +CreateTitleFont(VOID) { - HDEVINFO hDevInfo; - SP_DEVINFO_DATA devInfoData; - DWORD requiredSize; - DWORD regDataType; - PBYTE buffer = NULL; - SP_DRVINFO_DATA drvInfoData; - BOOL ret; + NONCLIENTMETRICS ncm; + LOGFONT LogFont; + HDC hdc; + INT FontSize; + HFONT hFont; - devInfoData.cbSize = 0; /* Tell if the devInfoData is valid */ + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - if (hDevInfo == INVALID_HANDLE_VALUE) + LogFont = ncm.lfMessageFont; + LogFont.lfWeight = FW_BOLD; + _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + + hdc = GetDC(NULL); + FontSize = 12; + LogFont.lfHeight = 0 - GetDeviceCaps (hdc, LOGPIXELSY) * FontSize / 72; + hFont = CreateFontIndirect(&LogFont); + ReleaseDC(NULL, hdc); + + return hFont; +} + +static VOID +CenterWindow(HWND hWnd) +{ + HWND hWndParent; + RECT rcParent; + RECT rcWindow; + + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); + + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); + + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); +} + +INT_PTR CALLBACK +WelcomeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + PDEVINSTDATA DevInstData; + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) { - DPRINT("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); - ret = FALSE; - goto cleanup; + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_WELCOMETITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->buffer); + + SendDlgItemMessage(hwndDlg, + IDC_RADIO_AUTO, + BM_SETCHECK, + (WPARAM) TRUE, + (LPARAM) 0); + + + } + break; + + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the Next button */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; + + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ + + if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_SEARCHDRV); + + break; + + default: + break; + } + } + break; + + default: + break; } - devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); - ret = SetupDiOpenDeviceInfoW( - hDevInfo, - InstanceId, - NULL, - 0, /* Open flags */ - &devInfoData); - if (!ret) + return FALSE; +} + +INT_PTR CALLBACK +CHSourceDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + PDEVINSTDATA DevInstData; + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) { - DPRINT("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); - devInfoData.cbSize = 0; - goto cleanup; + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + SendDlgItemMessage(hwndDlg, + IDC_RADIO_SEARCHHERE, + BM_SETCHECK, + (WPARAM) TRUE, + (LPARAM) 0); + + + } + break; + + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the Next and Back buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ + PropSheet_SetCurSel(GetParent(hwndDlg), 0, 4); + break; + + default: + break; + } + } + break; + + default: + break; } - SetLastError(ERROR_GEN_FAILURE); - ret = SetupDiGetDeviceRegistryProperty( - hDevInfo, - &devInfoData, - SPDRP_DEVICEDESC, - &regDataType, - NULL, 0, - &requiredSize); - if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER && regDataType == REG_SZ) + return FALSE; +} + +INT_PTR CALLBACK +SearchDrvDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + PDEVINSTDATA DevInstData; + DWORD dwThreadId; + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) { - buffer = HeapAlloc(GetProcessHeap(), 0, requiredSize); - if (!buffer) + case WM_INITDIALOG: { - DPRINT("HeapAlloc() failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + HWND hwndControl; + DWORD dwStyle; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + DevInstData->hDialog = hwndDlg; + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->buffer); + + /* Hide the system menu */ + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); } - else + break; + + case WM_SEARCH_FINISHED: { - ret = SetupDiGetDeviceRegistryProperty( - hDevInfo, - &devInfoData, - SPDRP_DEVICEDESC, - &regDataType, - buffer, requiredSize, - &requiredSize); + CloseHandle(hThread); + hThread = 0; + if (wParam == 0) + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_NODRIVER); + else + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_FINISHPAGE); + break; } + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), !PSWIZB_NEXT | !PSWIZB_BACK); + hThread = CreateThread( NULL, 0, FindDriverProc, DevInstData, 0, &dwThreadId); + break; + + case PSN_KILLACTIVE: + if (hThread != 0) { + SetWindowLong ( hwndDlg, DWL_MSGRESULT, TRUE); + return TRUE; + } + break; + case PSN_WIZNEXT: + /* Handle a Next button click, if necessary */ + break; + + default: + break; + } + } + break; + + default: + break; } - if (!ret) + + return FALSE; +} + +DWORD WINAPI FindDriverProc( LPVOID lpParam ) +{ + TCHAR drive[] = {'?',':',0}; + size_t nType; + DWORD dwDrives; + PDEVINSTDATA DevInstData; + UINT i = 1; + + DevInstData = (PDEVINSTDATA)lpParam; + + dwDrives = GetLogicalDrives(); + for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { + if (dwDrives & i) { + nType = GetDriveType( drive ); + if ((nType == DRIVE_CDROM) || (nType == DRIVE_FIXED)) { + /* search for inf file */ + if (SearchDriver ( DevInstData, drive )) { + /* if we found a valid driver inf... */ + if (FindDriver ( DevInstData )) { + InstallDriver ( DevInstData ); + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 1, 0); + return 0; + } + } + } + } + i <<= 1; + } + + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); + return 0; +} + +INT_PTR CALLBACK +FinishDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + PDEVINSTDATA DevInstData; + + /* Retrieve pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) { - DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", GetLastError()); - goto cleanup; + case WM_INITDIALOG: + { + HWND hwndControl; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + + SendDlgItemMessage(hwndDlg, + IDC_DEVICE, + WM_SETTEXT, + 0, + (LPARAM) DevInstData->buffer); + + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + + case PSN_WIZBACK: + /* Handle a Back button click, if necessary */ + break; + + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + break; + + default: + break; + } + } + break; + + default: + break; } - DPRINT("Installing %s (%S)\n", buffer, InstanceId); + return FALSE; +} - ret = SetupDiBuildDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); +INT_PTR CALLBACK +InstFailDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + PDEVINSTDATA DevInstData; + + /* Get pointer to the global setup data */ + DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + + DevInstData = (PDEVINSTDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)DevInstData); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + + /* Set title font */ + SendDlgItemMessage(hwndDlg, + IDC_FINISHTITLE, + WM_SETFONT, + (WPARAM)DevInstData->hTitleFont, + (LPARAM)TRUE); + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + DWORD config_flags; + BOOL ret; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + /* Enable the correct buttons on for the active page */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + break; + + case PSN_WIZBACK: + PropSheet_SetCurSel(GetParent(hwndDlg), 0, IDD_WELCOMEPAGE); + /* Handle a Back button click, if necessary */ + break; + + case PSN_WIZFINISH: + /* Handle a Finish button click, if necessary */ + if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) { + + if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, + (BYTE *)&config_flags, + sizeof(config_flags), + NULL)) + { + config_flags |= CONFIGFLAG_FAILEDINSTALL; + ret = SetupDiSetDeviceRegistryProperty( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + SPDRP_CONFIGFLAGS, + NULL, 0 ); + } + + } + break; + + default: + break; + } + } + break; + + default: + break; + } + + return FALSE; +} + + +BOOL FindDriver ( PDEVINSTDATA DevInstData ) { + BOOL ret; + + ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); if (!ret) { DPRINT("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } - drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + DevInstData->drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA); ret = SetupDiEnumDriverInfo( - hDevInfo, - &devInfoData, + DevInstData->hDevInfo, + &DevInstData->devInfoData, SPDIT_COMPATDRIVER, 0, - &drvInfoData); + &DevInstData->drvInfoData); if (!ret) { + if (GetLastError() == ERROR_NO_MORE_ITEMS) + return FALSE; DPRINT("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } - DPRINT("Installing driver %s: %s\n", drvInfoData.MfgName, drvInfoData.Description); + DPRINT("Installing driver %S: %S\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + return TRUE; +} + + +BOOL IsDots(const TCHAR* str) { + if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; + return TRUE; +} + +TCHAR* GetFileExt(TCHAR* FileName) +{ + if (FileName == 0) + return _T(""); + + int i = _tcsclen(FileName); + while ((i >= 0) && (FileName[i] != _T('.'))) + i--; + + FileName = _tcslwr(FileName); + + if (i >= 0) + return &FileName[i]; + else + return _T(""); +} + +BOOL SearchDriver ( PDEVINSTDATA DevInstData, const TCHAR* Path ) { + WIN32_FIND_DATA wfd; + SP_DEVINSTALL_PARAMS DevInstallParams; + TCHAR DirPath[MAX_PATH]; + TCHAR FileName[MAX_PATH]; + TCHAR FullPath[MAX_PATH]; + TCHAR LastDirPath[MAX_PATH] = _T(""); + TCHAR PathWithPattern[MAX_PATH]; + BOOL ok = TRUE; + BOOL ret; + HANDLE hFindFile; + + _tcscpy(DirPath, Path); + + if (DirPath[_tcsclen(DirPath) - 1] != '\\') + _tcscat(DirPath, _T("\\")); + + _tcscpy(PathWithPattern, DirPath); + _tcscat(PathWithPattern, _T("\\*")); + + for (hFindFile = FindFirstFile(PathWithPattern, &wfd); ((hFindFile != INVALID_HANDLE_VALUE) && ok); ok = FindNextFile(hFindFile, &wfd)) + { + + _tcscpy(FileName, wfd.cFileName); + if(IsDots(FileName)) continue; + + if((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + _tcscpy(FullPath, DirPath); + _tcscat(FullPath, FileName); + if(SearchDriver(DevInstData, FullPath)) + break; + } + else { + TCHAR* pszExtension = GetFileExt(FileName); + + if ((_tcscmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)){ + _tcscpy(LastDirPath, DirPath); + ZeroMemory (&DevInstallParams, sizeof(SP_DEVINSTALL_PARAMS)); + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + + ret = SetupDiGetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &DevInstallParams); + + if (_tcsclen(DirPath) <= MAX_PATH) { + memcpy(DevInstallParams.DriverPath, DirPath, (_tcsclen(DirPath) + 1) * sizeof(TCHAR)); + } + + ret = SetupDiSetDeviceInstallParams( + DevInstData->hDevInfo, + &DevInstData->devInfoData, + &DevInstallParams); + + if ( FindDriver ( DevInstData ) ) { + if (hFindFile != INVALID_HANDLE_VALUE) + FindClose(hFindFile); + return TRUE; + } + + } + } + } + + if (hFindFile != INVALID_HANDLE_VALUE) + FindClose(hFindFile); + + return FALSE; +} + +BOOL InstallDriver ( PDEVINSTDATA DevInstData ) { + BOOL ret; + ret = SetupDiCallClassInstaller( DIF_SELECTBESTCOMPATDRV, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_ALLOW_INSTALL, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_NEWDEVICEWIZARD_PREANALYZE, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_NEWDEVICEWIZARD_POSTANALYZE, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_INSTALLDEVICEFILES, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_REGISTER_COINSTALLERS, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_INSTALLINTERFACES, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_INSTALLDEVICE, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_NEWDEVICEWIZARD_FINISHINSTALL, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } ret = SetupDiCallClassInstaller( DIF_DESTROYPRIVATEDATA, - hDevInfo, - &devInfoData); + DevInstData->hDevInfo, + &DevInstData->devInfoData); if (!ret) { DPRINT("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); - goto cleanup; + return FALSE; } -cleanup: - if (devInfoData.cbSize != 0) + return TRUE; + +} + +void CleanUp ( void ) { + + if (DevInstData.devInfoData.cbSize != 0) { - if (!SetupDiDestroyDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER)) + if (!SetupDiDestroyDriverInfoList(DevInstData.hDevInfo, &DevInstData.devInfoData, SPDIT_COMPATDRIVER)) DPRINT("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); } - if (hDevInfo != INVALID_HANDLE_VALUE) + if (DevInstData.hDevInfo != INVALID_HANDLE_VALUE) { - if (!SetupDiDestroyDeviceInfoList(hDevInfo)) + if (!SetupDiDestroyDeviceInfoList(DevInstData.hDevInfo)) [truncated at 1000 lines; 248 more skipped]

1 0

[gvg] 19069: SVN maintenance
by gvg＠svn.reactos.com 08 Nov '05

08 Nov '05

SVN maintenance Property changes on: trunk/reactos/lib/dplay ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/reactos/lib/dplayx ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/reactos/lib/mesa32 ___________________________________________________________________ Name: svn:ignore + GNUmakefile

1 0

[gvg] 19068: Allocate mem for the structure, not only for a pointer.
by gvg＠svn.reactos.com 08 Nov '05

08 Nov '05

Allocate mem for the structure, not only for a pointer. Modified: trunk/reactos/drivers/storage/pciidex/pdo.c _____ Modified: trunk/reactos/drivers/storage/pciidex/pdo.c --- trunk/reactos/drivers/storage/pciidex/pdo.c 2005-11-08 21:07:11 UTC (rev 19067) +++ trunk/reactos/drivers/storage/pciidex/pdo.c 2005-11-08 21:49:27 UTC (rev 19068) @@ -180,7 +180,7 @@ /* FIXME: what to do with BusMasterPortBase? */ - ListSize = sizeof(PIO_RESOURCE_REQUIREMENTS_LIST) + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + 2 * sizeof(IO_RESOURCE_DESCRIPTOR); RequirementsList = ExAllocatePool(PagedPool, ListSize); if (!RequirementsList)

1 0

[ion] 19067: - Implement proper version of WaitNamedPipeW to be used when NPFS will be modified to work as documented. Define USING_PROPER_NPFS_WAIT_SEMANTICS if you want to use Windows NPFS
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Implement proper version of WaitNamedPipeW to be used when NPFS will be modified to work as documented. Define USING_PROPER_NPFS_WAIT_SEMANTICS if you want to use Windows NPFS Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-08 20:57:31 UTC (rev 19066) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-08 21:07:11 UTC (rev 19067) @@ -199,7 +199,195 @@ return(r); } +/* + * When NPFS will work properly, use this code instead. It is compatible with + * Microsoft's NPFS.SYS. The main difference is that: + * - This code actually respects the timeout instead of ignoring it! + * - This code validates and creates the proper names for both UNC and local pipes + * - On NT, you open the *root* pipe directory (either \DosDevices\Pipe or + * \DosDevices\Unc\Server\Pipe) and then send the pipe to wait on in the + * FILE_PIPE_WAIT_FOR_BUFFER structure. + */ +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS +/* + * @implemented + */ +BOOL +WINAPI +WaitNamedPipeW(LPCWSTR lpNamedPipeName, + DWORD nTimeOut) +{ + UNICODE_STRING NamedPipeName, NewName, DevicePath, PipePrefix; + ULONG NameLength; + ULONG i; + PWCHAR p; + ULONG Type; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE FileHandle; + IO_STATUS_BLOCK IoStatusBlock; + ULONG WaitPipeInfoSize; + PFILE_PIPE_WAIT_FOR_BUFFER WaitPipeInfo; + /* Start by making a unicode string of the name */ + DPRINT("Sent path: %S\n", lpNamedPipeName); + RtlCreateUnicodeString(&NamedPipeName, lpNamedPipeName); + NameLength = NamedPipeName.Length / sizeof(WCHAR); + + /* All slashes must become backslashes */ + for (i = 0; i < NameLength; i++) + { + /* Check and convert */ + if (NamedPipeName.Buffer[i] == L'/') NamedPipeName.Buffer[i] = L'\\'; + } + + /* Find the path type of the name we were given */ + NewName = NamedPipeName; + Type = RtlDetermineDosPathNameType_U(lpNamedPipeName); + + /* Check if this was a device path, ie : "\\.\pipe\name" */ + if (Type == DEVICE_PATH) + { + /* Make sure it's a valid prefix */ + RtlInitUnicodeString(&PipePrefix, L"\\\\.\\pipe\\"); + RtlPrefixString((PANSI_STRING)&PipePrefix, (PANSI_STRING)&NewName, TRUE); + + /* Move past it */ + NewName.Buffer += 9; + NewName.Length -= 9 * sizeof(WCHAR); + + /* Initialize the Dos Devices name */ + DPRINT("NewName: %wZ\n", &NewName); + RtlInitUnicodeString(&DevicePath, L"\\DosDevices\\pipe\\"); + } + else if (Type == UNC_PATH) + { + /* The path is \\server\\pipe\name; find the pipename itself */ + p = &NewName.Buffer[2]; + + /* First loop to get past the server name */ + do + { + /* Check if this is a backslash */ + if (*p == L'\\') break; + + /* Check next */ + p++; + } while (*p); + + /* Now make sure the full name contains "pipe\" */ + if ((*p) && !(_wcsnicmp(p + 1, L"pipe\\", sizeof("pipe\\")))) + { + /* Get to the pipe name itself now */ + p += sizeof("pipe\\") - 1; + } + else + { + /* The name is invalid */ + DPRINT1("Invalid name!\n"); + SetLastErrorByStatus(STATUS_OBJECT_PATH_SYNTAX_BAD); + return FALSE; + } + + /* FIXME: Open \DosDevices\Unc\Server\Pipe\Name */ + } + else + { + DPRINT1("Invalid path type\n"); + SetLastErrorByStatus(STATUS_OBJECT_PATH_SYNTAX_BAD); + return FALSE; + } + + /* Initialize the object attributes */ + DPRINT("Opening: %wZ\n", &DevicePath); + InitializeObjectAttributes(&ObjectAttributes, + &DevicePath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the path */ + Status = NtOpenFile(&FileHandle, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + /* Fail; couldn't open */ + DPRINT1("Status: %lx\n", Status); + SetLastErrorByStatus(Status); + RtlFreeUnicodeString(&NamedPipeName); + return(FALSE); + } + + /* Now calculate the total length of the structure and allocate it */ + WaitPipeInfoSize = FIELD_OFFSET(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + + NewName.Length; + WaitPipeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, WaitPipeInfoSize); + + /* Check what timeout we got */ + if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) + { + /* Don't use a timeout */ + WaitPipeInfo->TimeoutSpecified = FALSE; + } + else + { + /* Check if we should wait forever */ + if (nTimeOut == NMPWAIT_WAIT_FOREVER) + { + /* Set the max */ + WaitPipeInfo->Timeout.LowPart = 0; + WaitPipeInfo->Timeout.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + WaitPipeInfo->Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); + } + + /* In both cases, we do have a timeout */ + WaitPipeInfo->TimeoutSpecified = FALSE; + } + + /* Set the length and copy the name */ + WaitPipeInfo->NameLength = NewName.Length; + RtlCopyMemory(WaitPipeInfo->Name, NewName.Buffer, NewName.Length); + + /* Get rid of the full name */ + RtlFreeUnicodeString(&NamedPipeName); + + /* Let NPFS know of our request */ + Status = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_PIPE_WAIT, + WaitPipeInfo, + WaitPipeInfoSize, + NULL, + 0); + + /* Free our pipe info data and close the handle */ + RtlFreeHeap(RtlGetProcessHeap(), 0, WaitPipeInfo); + NtClose(FileHandle); + + /* Check the status */ + if (!NT_SUCCESS(Status)) + { + /* Failure to wait on the pipe */ + DPRINT1("Status: %lx\n", Status); + SetLastErrorByStatus (Status); + return FALSE; + } + + /* Success */ + return TRUE; +} +#else /* * @implemented */ @@ -262,8 +450,8 @@ return(TRUE); } +#endif - /* * @implemented */ @@ -335,7 +523,6 @@ return TRUE; } - /* * @implemented */

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