Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 14637: PackageManager: Ported GUI to C
by mbosma＠svn.reactos.com 16 Apr '05

16 Apr '05

PackageManager: Ported GUI to C Added: trunk/rosapps/packmgr/gui/main.c Deleted: trunk/rosapps/packmgr/gui/main.cpp Modified: trunk/rosapps/packmgr/gui/main.h _____ Copied: trunk/rosapps/packmgr/gui/main.c (from rev 14635, trunk/rosapps/packmgr/gui/main.cpp) --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/rosapps/packmgr/gui/main.c 2005-04-16 17:09:12 UTC (rev 14637) @@ -0,0 +1,429 @@ +//////////////////////////////////////////////////////// +// +// main.cpp +// +// Implementation of the Package Manager GUI +// +// +// Maarten Bosma, 09.01.2004 +// maarten.paul(a)bosma.de +// +//////////////////////////////////////////////////////////////////// + +#include "main.h" + + +// Application's Entry Point +int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) +{ + HWND hwnd; + MSG msg; + WNDCLASSEX wc = {0}; + + // Window creation + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpszClassName = L"pgkmgr"; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = (WNDPROC)WndProc; + wc.hInstance = hinst; + wc.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_MAIN)); + wc.hbrBackground = (HBRUSH)(COLOR_SCROLLBAR); + + RegisterClassEx(&wc); + + hwnd = CreateWindow(L"pgkmgr", + L"ReactOS - Package Manager v0.3", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 500, 600, + NULL, NULL, + hinst, + NULL); + + + // Toolbar creation + InitCommonControls(); + + hTBar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, 0, 8, hinst, IDB_TOOLBAR, + Buttons, sizeof(Buttons)/sizeof(TBBUTTON), TBSIZE, TBSIZE, TBSIZE, TBSIZE, sizeof(TBBUTTON)); + + // Show the windows + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + // Load the tree + int error = PML_LoadTree(&tree, "tree.xml", AddItem); + + if(error) + { + MessageBox(0,PML_TransError(error),0,0); + return 0; + } + + // Read the help + Help(); + + // Start getting messages + while(GetMessage(&msg,NULL,0,0)) + { + if(!TranslateAccelerator(hwnd, hHotKeys, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + // Close our handle + PML_CloseTree (tree); + + return 0; +} + +// Add a item to our tree +int AddItem (int id, const char* name, int parent, int icon) +{ + TV_INSERTSTRUCT tvins; + + tvins.item.lParam = (UINT)id; + tvins.item.mask = TVIF_TEXT|TVIF_PARAM; + tvins.item.pszText = (WCHAR*)name; //that is ok + tvins.item.cchTextMax = strlen(name); + tvins.hInsertAfter = TVI_LAST; + + if(icon) + { + tvins.item.iImage = icon; + tvins.item.iSelectedImage = icon; + tvins.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE; + } + + if (parent==0) + tvins.hParent = TVI_ROOT; + else + tvins.hParent = nodes[parent]; + + nodes[id] = (HTREEITEM)SendMessage(hTree, TVM_INSERTITEMA, 0, (LPARAM)&tvins); + + return 0; +} + +// Load the Help from file and display it +void Help (void) +{ + int i; + char buffer [2000]; + FILE* file = fopen ("help.txt", "r"); + + if(!file) + return; + + for(i=0; i<2000; i++) + { + buffer[i] = getc(file); + if(!buffer[i]) break; + } + + SetText(buffer); +} + +// Create our Controls +void InitControls (HWND hwnd) +{ + + HINSTANCE hinst = GetModuleHandle(NULL); + + // Create the controls + hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, + 0, 0, 0, 0, hwnd, NULL, hinst, NULL); + + hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, + 0, 0, 100, 100, hwnd, NULL, hinst, NULL); + + hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); + + // Create Tree Icons + HIMAGELIST hIcon = ImageList_Create(16,16,ILC_COLOR32,1,1); + SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hIcon); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(1))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(11))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(12))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(13))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(14))); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(2))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(3))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(4))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(5))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(6))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(7))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(8))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(9))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); + + // Setup Hotkeys + hHotKeys = LoadAccelerators (hinst, MAKEINTRESOURCE(IDR_HOTKEYS)); +} + +// Set the Icons +int SetIcon (int id, int icon) +{ + TVITEMEX item; + + item.hItem = nodes[id]; + item.iImage = icon; + item.iSelectedImage = icon; + item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + + TreeView_SetItem(hTree, &item); + + return 1; +} + +// Set the Icons +int Ask (const WCHAR* message) +{ + int ans = MessageBox (0,message,0,MB_YESNO); + + if(ans == IDYES) + return 1; + + return 0; +} + +// En- or Disable a Button inside of the toolbar and the Context Menu +int SetButton (DWORD id, BOOL state) +{ + // Change the Toorbar Button + TBBUTTONINFO ti; + + ti.cbSize = sizeof (ti); + ti.dwMask = TBIF_STATE; +/* + if(state&&id==1) + MessageBox(0,L"on",0,0); + else if(!state&&id==1) + MessageBox(0,L"off",0,0); +*/ + if(state) + ti.fsState = TBSTATE_ENABLED; + else + ti.fsState = TBSTATE_INDETERMINATE; + + SendMessage (hTBar, TB_SETBUTTONINFO, id, (LPARAM)&ti); + + // Change the Context Menu item + MENUITEMINFO mi; + + mi.cbSize = sizeof (mi); + mi.fMask = MIIM_STATE; + + if(state) + mi.fState = MFS_ENABLED; + + else + mi.fState = MFS_GRAYED; + + SetMenuItemInfo(hPopup, id, FALSE, &mi); + + return 0; +} + +// Set the text of the text box +int SetText (const char* text) +{ + int i, j; + char buffer [2000]; + + if(!text) + return 1; + + // the windows does not need "\n" + // for new lines but "\r\n" + for(i=0,j=0; text[i]; i++,j++) + { + buffer[j] = text[i]; + if(buffer[j] == '\n') + buffer[++j] = '\r'; + } + buffer[i] = 0; + + SetWindowTextA(hEdit, buffer); + + return 0; +} + +// Windows Message Callback (this is where most things happen) +LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + // at the very beginning ... + case WM_CREATE: + { + InitControls(hwnd); + } + break; + + // calculate the size of the controls + case WM_SIZE: + { + RECT rcl; + SendMessage(hTBar, TB_AUTOSIZE, 0L, 0L); + GetWindowRect(hTBar, &rcl); + + int win_top = rcl.bottom - rcl.top; + int win_hight = HIWORD(lParam) - win_top; + + MoveWindow(hTree, 0, win_top, LOWORD(lParam), splitter_pos*win_hight/100, TRUE); + MoveWindow(hEdit, 0, (splitter_pos*win_hight/100)+win_top, LOWORD(lParam), win_hight, TRUE); + } + break; + + // for the treeview + case WM_NOTIFY: + { + if(((LPNMHDR)lParam)->code == TVN_SELCHANGED) + { + selected = ((LPNMTREEVIEW)lParam)->itemNew.lParam; + PML_LoadPackage (tree, selected, SetButton); + SetText(PML_GetDescription (tree, selected)); + } + + else if ((int)(((LPNMHDR)lParam)->code) == NM_RCLICK) // <= aarrggg LISP + { + // which item has been click on + HTREEITEM item = TreeView_GetDropHilight(hTree); + + if(item != NULL) + { + // mark the one as seleacted + SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); + TreeView_EnsureVisible (hTree, item); + } + + // create the context menu + if(selected != 0) + { + POINT pt; + GetCursorPos (&pt); + TrackPopupMenu (GetSubMenu(hPopup, 0), 0, (UINT)pt.x, (UINT)pt.y, 0, hwnd, NULL); + } + } + } + break; + + // for the toolbar + case WM_COMMAND: + { + // All Actions + if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) + { + if(selected) + if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) + break; + + MessageBeep(MB_ICONHAND); + } + + // DoIt + else if(LOWORD(wParam)==6) + { + if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); + else + MessageBeep(MB_ICONHAND); + } + + // Help + else if(LOWORD(wParam)==7) + Help(); + + // Options + else if(LOWORD(wParam)==8) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsProc); + } + break; + + // prozess hotkeys + case WM_HOTKEY: + { + if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) + MessageBeep(MB_ICONHAND); + } + break; + + // ... at the very end + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +// Warning: This function is called from another thread +int SetStatus (int status1, int status2, WCHAR* text) +{ + // Set the Rage to 1000 + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); + + // The prozessbars and the text filds + if(text) + SetDlgItemText(hStatus, IDC_TSTATUS, text); + + if(status1!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETPOS, status1, 0); + + if(status2!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETPOS, status2, 0); + + // If the Status is 1000 very thing is done + if(status1==1000) + { + EndDialog(hStatus, TRUE); + MessageBox(0,PML_TransError(status2),0,0); + } + + return 0; +} + +// Callback for the Status Dialog +INT_PTR CALLBACK StatusProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + hStatus = hwnd; + + } break; + + case WM_COMMAND: // can only be the about button + case WM_CLOSE: // the close-window-[x] + { + PML_Abort(); + EndDialog(hwnd, TRUE); + return 0; + } + } + + return 0; +} + +// Callback for the Options Dialog +INT_PTR CALLBACK OptionsProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CLOSE: + EndDialog(hwnd, TRUE); + return 0; + } + + return 0; +} _____ Deleted: trunk/rosapps/packmgr/gui/main.cpp --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 16:04:38 UTC (rev 14636) +++ trunk/rosapps/packmgr/gui/main.cpp 2005-04-16 17:09:12 UTC (rev 14637) @@ -1,420 +0,0 @@ -//////////////////////////////////////////////////////// -// -// main.cpp -// -// Implementation of the Package Manager GUI -// -// -// Maarten Bosma, 09.01.2004 -// maarten.paul(a)bosma.de -// -//////////////////////////////////////////////////////////////////// - -#include "main.h" - - -// Application's Entry Point -int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) -{ - HWND hwnd; - MSG msg; - WNDCLASSEX wc = {0}; - - // Window creation - wc.cbSize = sizeof(WNDCLASSEX); - wc.lpszClassName = L"pgkmgr"; - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = (WNDPROC)WndProc; - wc.hInstance = hinst; - wc.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_MAIN)); - wc.hbrBackground = (HBRUSH)(COLOR_SCROLLBAR); - - RegisterClassEx(&wc); - - hwnd = CreateWindow(L"pgkmgr", - L"ReactOS - Package Manager v0.3", - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, - CW_USEDEFAULT, - 500, 600, - NULL, NULL, - hinst, - NULL); - - - // Toolbar creation - InitCommonControls(); - - hTBar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, 0, 8, hinst, IDB_TOOLBAR, - Buttons, sizeof(Buttons)/sizeof(TBBUTTON), TBSIZE, TBSIZE, TBSIZE, TBSIZE, sizeof(TBBUTTON)); - - // Show the windows - ShowWindow(hwnd, SW_SHOW); - UpdateWindow(hwnd); - - // Load the tree - int error = PML_LoadTree(&tree, "tree.xml", AddItem); - - if(error) - { - MessageBox(0,PML_TransError(error),0,0); - return 0; - } - - // Read the help - Help(); - - // Start getting messages - while(GetMessage(&msg,NULL,0,0)) - { - if(!TranslateAccelerator(hwnd, hHotKeys, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - - // Close our handle - PML_CloseTree (tree); - - return 0; -} - -// Add a item to our tree -int AddItem (int id, const char* name, int parent, int icon) -{ - TV_INSERTSTRUCT tvins; - - tvins.item.lParam = (UINT)id; - tvins.item.mask = TVIF_TEXT|TVIF_PARAM; - tvins.item.pszText = (WCHAR*)name; //that is ok - tvins.item.cchTextMax = strlen(name); - tvins.hInsertAfter = TVI_LAST; - - if(icon) - { - tvins.item.iImage = icon; - tvins.item.iSelectedImage = icon; - tvins.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE; - } - - if (parent==0) - tvins.hParent = TVI_ROOT; - else - tvins.hParent = nodes[parent]; - - nodes[id] = (HTREEITEM)SendMessage(hTree, TVM_INSERTITEMA, 0, (LPARAM)&tvins); - - return 0; -} - -// Load the Help from file and display it -void Help (void) -{ - string source; - - ifstream file("help.txt", ios_base::in); - getline(file, source, '\0'); - - SetText(source.c_str()); -} - -// Create our Controls -void InitControls (HWND hwnd) -{ - - HINSTANCE hinst = GetModuleHandle(NULL); - - // Create the controls - hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, - 0, 0, 0, 0, hwnd, NULL, hinst, NULL); - - hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, - 0, 0, 100, 100, hwnd, NULL, hinst, NULL); - - hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); - - // Create Tree Icons - HIMAGELIST hIcon = ImageList_Create(16,16,ILC_COLOR32,1,1); - SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hIcon); - - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(1))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(11))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(12))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(13))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(14))); - - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(2))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(3))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(4))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(5))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(6))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(7))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(8))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(9))); - ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); - - // Setup Hotkeys - hHotKeys = LoadAccelerators (hinst, MAKEINTRESOURCE(IDR_HOTKEYS)); -} - -// Set the Icons -int SetIcon (int id, int icon) -{ - TVITEMEX item; - - item.hItem = nodes[id]; - item.iImage = icon; - item.iSelectedImage = icon; - item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; - - TreeView_SetItem(hTree, &item); - - return 1; -} - -// Set the Icons -int Ask (const WCHAR* message) -{ - int ans = MessageBox (0,message,0,MB_YESNO); - - if(ans == IDYES) - return 1; - - return 0; -} - -// En- or Disable a Button inside of the toolbar and the Context Menu -int SetButton (DWORD id, BOOL state) -{ - // Change the Toorbar Button - TBBUTTONINFO ti; - - ti.cbSize = sizeof (ti); - ti.dwMask = TBIF_STATE; -/* - if(state&&id==1) - MessageBox(0,L"on",0,0); - else if(!state&&id==1) - MessageBox(0,L"off",0,0); -*/ - if(state) - ti.fsState = TBSTATE_ENABLED; - else - ti.fsState = TBSTATE_INDETERMINATE; - - SendMessage (hTBar, TB_SETBUTTONINFO, id, (LPARAM)&ti); - - // Change the Context Menu item - MENUITEMINFO mi; - - mi.cbSize = sizeof (mi); - mi.fMask = MIIM_STATE; - - if(state) - mi.fState = MFS_ENABLED; - - else - mi.fState = MFS_GRAYED; - - SetMenuItemInfo(hPopup, id, FALSE, &mi); - - return 0; -} - -// Set the text of the text box -int SetText (const char* text) -{ - if(!text) - return 1; - - int i = 0; - string source = text; - - // the windows does not need "\n" - // for new lines but "\r\n" - for(i=0; source[i]; i++) - if(source[i]=='\n' && source[i]!='\r') - source.insert (i++, "\r"); - - SetWindowTextA(hEdit, source.c_str()); - - return 0; -} - -// Windows Message Callback (this is where most things happen) -LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - // at the very beginning ... - case WM_CREATE: - { - InitControls(hwnd); - } - break; - - // calculate the size of the controls - case WM_SIZE: - { - RECT rcl; - SendMessage(hTBar, TB_AUTOSIZE, 0L, 0L); - GetWindowRect(hTBar, &rcl); - - int win_top = rcl.bottom - rcl.top; - int win_hight = HIWORD(lParam) - win_top; - - MoveWindow(hTree, 0, win_top, LOWORD(lParam), splitter_pos*win_hight/100, TRUE); - MoveWindow(hEdit, 0, (splitter_pos*win_hight/100)+win_top, LOWORD(lParam), win_hight, TRUE); - } - break; - - // for the treeview - case WM_NOTIFY: - { - if(((LPNMHDR)lParam)->code == TVN_SELCHANGED) - { - selected = ((LPNMTREEVIEW)lParam)->itemNew.lParam; - PML_LoadPackage (tree, selected, SetButton); - SetText(PML_GetDescription (tree, selected)); - } - - else if ((int)(((LPNMHDR)lParam)->code) == NM_RCLICK) // <= ahhh LISP - { - // which item has been click on - HTREEITEM item = TreeView_GetDropHilight(hTree); - - if(item != NULL) - { - // mark the one as seleacted - SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); - TreeView_EnsureVisible (hTree, item); - } - - // create the context menu - if(selected != 0) - { - POINT pt; - GetCursorPos (&pt); - TrackPopupMenu (GetSubMenu(hPopup, 0), 0, (UINT)pt.x, (UINT)pt.y, 0, hwnd, NULL); - } - } - } - break; - - // for the toolbar - case WM_COMMAND: - { - // All Actions - if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) - { - if(selected) - if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) - break; - - MessageBeep(MB_ICONHAND); - } - - // DoIt - else if(LOWORD(wParam)==6) - { - if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) - DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); - else - MessageBeep(MB_ICONHAND); - } - - // Help - else if(LOWORD(wParam)==7) - Help(); - - // Options - else if(LOWORD(wParam)==8) - DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsProc); - - else - MessageBox(0,0,0,0); - } - break; - - // prozess hotkeys - case WM_HOTKEY: - { - if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) - MessageBeep(MB_ICONHAND); - } - break; - - // ... at the very end - case WM_DESTROY: - { - PostQuitMessage(0); - return 0; - } - } - - return DefWindowProc (hwnd, message, wParam, lParam); -} - -// Warning: This function is called from another thread -int SetStatus (int status1, int status2, WCHAR* text) -{ - // Set the Rage to 1000 - SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); - SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); - - // The prozessbars and the text filds - if(text) - SetDlgItemText(hStatus, IDC_TSTATUS, text); - - if(status1!=-1) - SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETPOS, status1, 0); - - if(status2!=-1) - SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETPOS, status2, 0); - - // If the Status is 1000 very thing is done - if(status1==1000) - { - EndDialog(hStatus, TRUE); - MessageBox(0,PML_TransError(status2),0,0); - } - - return 0; -} - -// Callback for the Status Dialog -INT_PTR CALLBACK StatusProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_INITDIALOG: - { - hStatus = hwnd; - - } break; - - case WM_COMMAND: // can only be the about button - case WM_CLOSE: // the close-window-[x] - { - PML_Abort(); - EndDialog(hwnd, TRUE); - return 0; - } - } - - return 0; -} - -// Callback for the Options Dialog -INT_PTR CALLBACK OptionsProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_CLOSE: - EndDialog(hwnd, TRUE); - return 0; - } - - return 0; -} _____ Modified: trunk/rosapps/packmgr/gui/main.h --- trunk/rosapps/packmgr/gui/main.h 2005-04-16 16:04:38 UTC (rev 14636) +++ trunk/rosapps/packmgr/gui/main.h 2005-04-16 17:09:12 UTC (rev 14637) @@ -5,12 +5,10 @@ /////////////////////////////////////////////////// #include <windows.h> -#include <ntos/keyboard.h> #include <commctrl.h> -#include <iostream> -#include <fstream> +#include <stdio.h> -#include <package.hpp> +#include <package.h> #include "resource.h" /* Some Variables */

1 0

[hpoussin] 14636: Implement FSCTL_IS_VOLUME_DIRTY and FSCTL_MARK_VOLUME_DIRTY
by hpoussin＠svn.reactos.com 16 Apr '05

16 Apr '05

Implement FSCTL_IS_VOLUME_DIRTY and FSCTL_MARK_VOLUME_DIRTY Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-04-16 16:04:38 UTC (rev 14636) @@ -373,6 +373,7 @@ UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); ULONG HashTableSize; + ULONG eocMark; FATINFO FatInfo; DPRINT("VfatMount(IrpContext %x)\n", IrpContext); @@ -460,6 +461,7 @@ DeviceExt->GetNextCluster = FAT12GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT12FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT12WriteCluster; + DeviceExt->CleanShutBitMask = 0; break; case FAT16: @@ -467,6 +469,7 @@ DeviceExt->GetNextCluster = FAT16GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT16FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT16WriteCluster; + DeviceExt->CleanShutBitMask = 0x8000; break; case FAT32: @@ -474,6 +477,7 @@ DeviceExt->GetNextCluster = FAT32GetNextCluster; DeviceExt->FindAndMarkAvailableCluster = FAT32FindAndMarkAvailableCluster; DeviceExt->WriteCluster = FAT32WriteCluster; + DeviceExt->CleanShutBitMask = 0x80000000; break; } @@ -576,6 +580,20 @@ /* read volume label */ ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); + + /* read clean shutdown bit status */ + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + if (eocMark & DeviceExt->CleanShutBitMask) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + WriteCluster(DeviceExt, 1, eocMark); + VolumeFcb->Flags |= VCB_CLEAR_DIRTY; + } + } + VolumeFcb->Flags |= VCB_IS_DIRTY; Status = STATUS_SUCCESS; ByeBye: @@ -787,6 +805,56 @@ } #endif +static NTSTATUS +VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +{ + PULONG Flags; + + DPRINT("VfatIsVolumeDirty(IrpContext %x)\n", IrpContext); + + if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) + return STATUS_INVALID_BUFFER_SIZE; + else if (!IrpContext->Irp->AssociatedIrp.SystemBuffer) + return STATUS_INVALID_USER_BUFFER; + + Flags = (PULONG)IrpContext->Irp->AssociatedIrp.SystemBuffer; + *Flags = 0; + + if (IrpContext->DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY + && !(IrpContext->DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY)) + { + *Flags |= VOLUME_IS_DIRTY; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS +VfatMarkVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +{ + ULONG eocMark; + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("VfatMarkVolumeDirty(IrpContext %x)\n", IrpContext); + DeviceExt = IrpContext->DeviceExt; + + if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) + { + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + Status = WriteCluster(DeviceExt, 1, eocMark); + } + } + + DeviceExt->VolumeFcb->Flags &= ~VCB_CLEAR_DIRTY; + + return Status; +} + NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: File system control @@ -822,6 +890,12 @@ Status = VfatRosQueryLcnMapping(IrpContext); break; #endif + case FSCTL_IS_VOLUME_DIRTY: + Status = VfatIsVolumeDirty(IrpContext); + break; + case FSCTL_MARK_VOLUME_DIRTY: + Status = VfatMarkVolumeDirty(IrpContext); + break; default: Status = STATUS_INVALID_DEVICE_REQUEST; } _____ Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-04-16 16:04:38 UTC (rev 14636) @@ -48,6 +48,7 @@ NTSTATUS Status; PLIST_ENTRY ListEntry; PDEVICE_EXTENSION DeviceExt; + ULONG eocMark; DPRINT("VfatShutdown(DeviceObject %x, Irp %x)\n",DeviceObject, Irp); @@ -64,6 +65,17 @@ ListEntry = ListEntry->Flink; ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + if (DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY) + { + /* set clean shutdown bit */ + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + eocMark |= DeviceExt->CleanShutBitMask; + if (NT_SUCCESS(WriteCluster(DeviceExt, 1, eocMark))) + DeviceExt->VolumeFcb->Flags &= ~VCB_IS_DIRTY; + } + } Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); if (NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-16 12:50:33 UTC (rev 14635) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-04-16 16:04:38 UTC (rev 14636) @@ -13,6 +13,7 @@ NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); #undef DeleteFile /* FIXME */ +#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */ #endif #ifdef USE_ROS_CC_AND_FS @@ -193,6 +194,8 @@ #define VCB_VOLUME_LOCKED 0x0001 #define VCB_DISMOUNT_PENDING 0x0002 #define VCB_IS_FATX 0x0004 +#define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ +#define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */ typedef struct { @@ -257,6 +260,7 @@ PGET_NEXT_CLUSTER GetNextCluster; PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; PWRITE_CLUSTER WriteCluster; + ULONG CleanShutBitMask; /* Pointers to functions for manipulating directory entries. */ PGET_NEXT_DIR_ENTRY GetNextDirEntry;

1 0

[ekohl] 14635: ADVAPI32.DLL:
by ekohl＠svn.reactos.com 16 Apr '05

16 Apr '05

ADVAPI32.DLL: - Implement LockServiceDatabase and UnlockServiceDatabase. SERVICES.EXE: - Add stubs: ScmrLockServiceDatabase, ScmrUnlockDerviceDatabase, SamrNotifyBootConfigStatus, and ScmrCreateServiceW. - Store and check access rights. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-16 12:50:33 UTC (rev 14635) @@ -8,8 +8,10 @@ #define DWORD unsigned long #define BOOL unsigned long #define SC_HANDLE unsigned int +#define SC_LOCK unsigned int #define LPCSTR char* #define LPCWSTR wchar_t* +#define LPDWORD unsigned long* [ uuid(367abb81-9844-35f1-ad32-98f038001003), @@ -32,41 +34,90 @@ } SERVICE_STATUS, *LPSERVICE_STATUS; cpp_quote("#endif"); - /* Service 0 */ + /* Function 0 */ DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle, [in] SC_HANDLE hSCObject); - /* Service 1 */ + /* Function 1 */ // BOOL ScmrControlService([in] handle_t BindingHandle, // [in] SC_HANDLE hService, // [in] DWORD dwControl, // [out] LPSERVICE_STATUS lpServiceStatus); - /* Service 2 */ + /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, [in] SC_HANDLE hService); - DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, - [in, string, unique] LPCSTR lpMachineName, - [in, string, unique] LPCSTR lpDatabaseName, + /* Function 3 */ + DWORD ScmrLockServiceDatabase([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [out] SC_LOCK *hLock); + + /* Function 4 */ +// DWORD ScmrQueryServiceObjectSecurity(); + + /* Function 5 */ +// DWORD ScmrSetServiceObjectSecurity(); + + /* Function 6 */ +// DWORD ScmrQueryServiceStatus(); + + /* Function 7 */ +// DWORD ScmrSetServiceStatus(); + + /* Function 8 */ + DWORD ScmrUnlockServiceDatabase([in] handle_t BindingHandle, + [in] SC_LOCK hLock); + + /* Function 9 */ + DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle, + [in] BOOL BootAcceptable); + + + /* Function 12 */ + DWORD ScmrCreateServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string, ref] LPCWSTR lpServiceName, + [in, string, ref] LPCWSTR lpDisplayName, [in] DWORD dwDesiredAccess, - [out] SC_HANDLE *hScm); + [in] DWORD dwServiceType, + [in] DWORD dwStartType, + [in] DWORD dwErrorControl, + [in, string, ref] LPCWSTR lpBinaryPathName, + [in, string, unique] LPCWSTR lpLoadOrderGroup, + [out, unique] LPDWORD lpdwTagId, + [in, string, unique] LPCWSTR lpDependencies, + [in, string, unique] LPCWSTR lpServiceStartName, + [in, string, unique] LPCWSTR lpPassword); + + /* Function 15 */ DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle, [in, string, unique] LPCWSTR lpMachineName, [in, string, unique] LPCWSTR lpDatabaseName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); - SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, + /* Function 16 */ + SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [in, string] LPCSTR lpServiceName, + [in, string] LPCWSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); - SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, + + /* Function 27 */ + DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, + [in, string, unique] LPCSTR lpMachineName, + [in, string, unique] LPCSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + /* Function 28 */ + SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, [in] SC_HANDLE hSCManager, - [in, string] LPCWSTR lpServiceName, + [in, string] LPCSTR lpServiceName, [in] DWORD dwDesiredAccess, [out] SC_HANDLE *hScm); + } _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-16 12:50:33 UTC (rev 14635) @@ -253,7 +253,7 @@ /********************************************************************** * DeleteService * - * @unimplemented + * @implemented */ BOOL STDCALL DeleteService(SC_HANDLE hService) @@ -516,15 +516,32 @@ /********************************************************************** * LockServiceDatabase * - * @unimplemented + * @implemented */ -SC_LOCK -STDCALL +SC_LOCK STDCALL LockServiceDatabase(SC_HANDLE hSCManager) { - DPRINT1("LockServiceDatabase is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SC_LOCK hLock; + DWORD dwError; + + DPRINT("LockServiceDatabase(%x)\n", hSCManager); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrLockServiceDatabase(BindingHandle, + (unsigned int)hSCManager, + (unsigned int *)&hLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); return NULL; + } + + DPRINT("hLock = %p\n", hLock); + + return hLock; } @@ -533,7 +550,7 @@ { HANDLE hEvent; - DPRINT1("WaitForSCManager() called\n"); + DPRINT("WaitForSCManager() called\n"); /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, @@ -564,7 +581,7 @@ WaitForSingleObject(hEvent, 180000); CloseHandle(hEvent); - DPRINT1("ScmWaitForSCManager() done\n"); + DPRINT("ScmWaitForSCManager() done\n"); } @@ -581,7 +598,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT1("OpenSCManagerA(%s, %s, %lx)\n", + DPRINT("OpenSCManagerA(%s, %s, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -594,13 +611,15 @@ (LPSTR)lpDatabaseName, dwDesiredAccess, (unsigned int*)&hScm); - DPRINT1("hScm = %p\n", hScm); if (dwError) { + DPRINT("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } + DPRINT("hScm = %p\n", hScm); + return hScm; } @@ -608,7 +627,7 @@ /********************************************************************** * OpenSCManagerW * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR lpMachineName, @@ -618,7 +637,7 @@ SC_HANDLE hScm = NULL; DWORD dwError; - DPRINT1("OpenSCManagerW(%S, %S, %lx)\n", + DPRINT("OpenSCManagerW(%S, %S, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); WaitForSCManager(); @@ -638,7 +657,7 @@ return NULL; } - DPRINT1("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); return hScm; } @@ -651,14 +670,14 @@ */ SC_HANDLE STDCALL OpenServiceA(SC_HANDLE hSCManager, - LPCSTR lpServiceName, - DWORD dwDesiredAccess) + LPCSTR lpServiceName, + DWORD dwDesiredAccess) { SC_HANDLE hService = NULL; DWORD dwError; - DPRINT1("OpenServiceA(%p, %s, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -675,7 +694,7 @@ return NULL; } - DPRINT1("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); return hService; } @@ -694,8 +713,8 @@ SC_HANDLE hService = NULL; DWORD dwError; - DPRINT1("OpenServiceW(%p, %S, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); HandleBind(); @@ -712,7 +731,7 @@ return NULL; } - DPRINT1("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); return hService; } @@ -891,15 +910,28 @@ /********************************************************************** * UnlockServiceDatabase * - * @unimplemented + * @implemented */ -BOOL -STDCALL -UnlockServiceDatabase(SC_LOCK ScLock) +BOOL STDCALL +UnlockServiceDatabase(SC_LOCK ScLock) { - DPRINT1("UnlockServiceDatabase is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD dwError; + + DPRINT("UnlockServiceDatabase(%x)\n", hSCManager); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrUnlockServiceDatabase(BindingHandle, + (unsigned int)ScLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); return FALSE; + } + + return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-16 11:48:26 UTC (rev 14634) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-16 12:50:33 UTC (rev 14635) @@ -51,6 +51,58 @@ } SERVICE_HANDLE, *PSERVICE_HANDLE; +#define SC_MANAGER_READ \ + (STANDARD_RIGHTS_READ | \ + SC_MANAGER_QUERY_LOCK_STATUS | \ + SC_MANAGER_ENUMERATE_SERVICE) + +#define SC_MANAGER_WRITE \ + (STANDARD_RIGHTS_WRITE | \ + SC_MANAGER_MODIFY_BOOT_CONFIG | \ + SC_MANAGER_CREATE_SERVICE) + +#define SC_MANAGER_EXECUTE \ + (STANDARD_RIGHTS_EXECUTE | \ + SC_MANAGER_LOCK | \ + SC_MANAGER_ENUMERATE_SERVICE | \ + SC_MANAGER_CONNECT | \ + SC_MANAGER_CREATE_SERVICE) + + +#define SERVICE_READ \ + (STANDARD_RIGHTS_READ | \ + SERVICE_INTERROGATE | \ + SERVICE_ENUMERATE_DEPENDENTS | \ + SERVICE_QUERY_STATUS | \ + SERVICE_QUERY_CONFIG) + +#define SERVICE_WRITE \ + (STANDARD_RIGHTS_WRITE | \ + SERVICE_CHANGE_CONFIG) + +#define SERVICE_EXECUTE \ + (STANDARD_RIGHTS_EXECUTE | \ + SERVICE_USER_DEFINED_CONTROL | \ + SERVICE_PAUSE_CONTINUE | \ + SERVICE_STOP | \ + SERVICE_START) + + +/* VARIABLES ***************************************************************/ + +static GENERIC_MAPPING +ScmManagerMapping = {SC_MANAGER_READ, + SC_MANAGER_WRITE, + SC_MANAGER_EXECUTE, + SC_MANAGER_ALL_ACCESS}; + +static GENERIC_MAPPING +ScmServiceMapping = {SERVICE_READ, + SERVICE_WRITE, + SERVICE_EXECUTE, + SC_MANAGER_ALL_ACCESS}; + + /* FUNCTIONS ***************************************************************/ VOID @@ -92,8 +144,7 @@ static DWORD ScmCreateManagerHandle(LPWSTR lpDatabaseName, - SC_HANDLE *Handle, - DWORD dwDesiredAccess) + SC_HANDLE *Handle) { PMANAGER_HANDLE Ptr; @@ -104,7 +155,6 @@ Ptr->Handle.Tag = MANAGER_TAG; Ptr->Handle.RefCount = 1; - Ptr->Handle.DesiredAccess = dwDesiredAccess; /* FIXME: initialize more data here */ @@ -118,8 +168,7 @@ static DWORD ScmCreateServiceHandle(LPVOID lpDatabaseEntry, - SC_HANDLE *Handle, - DWORD dwDesiredAccess) + SC_HANDLE *Handle) { PMANAGER_HANDLE Ptr; @@ -130,7 +179,6 @@ Ptr->Handle.Tag = SERVICE_TAG; Ptr->Handle.RefCount = 1; - Ptr->Handle.DesiredAccess = dwDesiredAccess; /* FIXME: initialize more data here */ // Ptr->DatabaseEntry = lpDatabaseEntry; @@ -141,7 +189,37 @@ } -/* Service 0 */ +static DWORD +ScmCheckAccess(SC_HANDLE Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE hMgr; + + hMgr = (PMANAGER_HANDLE)Handle; + if (hMgr->Handle.Tag == MANAGER_TAG) + { + RtlMapGenericMask(&dwDesiredAccess, + &ScmManagerMapping); + + hMgr->Handle.DesiredAccess = dwDesiredAccess; + + return ERROR_SUCCESS; + } + else if (hMgr->Handle.Tag == SERVICE_TAG) + { + RtlMapGenericMask(&dwDesiredAccess, + &ScmServiceMapping); + + hMgr->Handle.DesiredAccess = dwDesiredAccess; + + return ERROR_SUCCESS; + } + + return ERROR_INVALID_HANDLE; +} + + +/* Function 0 */ unsigned long ScmrCloseServiceHandle(handle_t BindingHandle, unsigned int hScObject) @@ -193,7 +271,7 @@ } -/* Service 1 */ +/* Function 1 */ #if 0 unsigned long ScmrControlService(handle_t BindingHandle, @@ -201,7 +279,7 @@ unsigned long dwControl, LPSERVICE_STATUS lpServiceStatus) { - DPRINT("ScmrControlService() called\n"); + DPRINT1("ScmrControlService() called\n"); #if 0 lpServiceStatus->dwServiceType = 0x12345678; @@ -218,28 +296,104 @@ #endif -/* Service 2 */ +/* Function 2 */ unsigned long ScmrDeleteService(handle_t BindingHandle, unsigned int hService) { - DPRINT("ScmrDeleteService() called\n"); + PSERVICE_HANDLE hSvc; + + DPRINT1("ScmrDeleteService() called\n"); + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + return ERROR_INVALID_HANDLE; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + STANDARD_RIGHTS_REQUIRED)) + return ERROR_ACCESS_DENIED; + + /* FIXME: Delete the service */ + return ERROR_SUCCESS; } +/* Function 3 */ unsigned long -ScmrOpenSCManagerA(handle_t BindingHandle, - char *lpMachineName, - char *lpDatabaseName, +ScmrLockServiceDatabase(handle_t BindingHandle, + unsigned int hSCManager, + unsigned int *hLock) +{ + PMANAGER_HANDLE hMgr; + + DPRINT("ScmrLockServiceDatabase() called\n"); + + *hLock = 0; + + hMgr = (PMANAGER_HANDLE)hSCManager; + if (hMgr->Handle.Tag != MANAGER_TAG) + return ERROR_INVALID_HANDLE; + + if (!RtlAreAllAccessesGranted(hMgr->Handle.DesiredAccess, + SC_MANAGER_LOCK)) + return ERROR_ACCESS_DENIED; + + /* FIXME: Lock the database */ + *hLock = 0x12345678; /* Dummy! */ + + return ERROR_SUCCESS; +} + + + +/* Function 8 */ +unsigned long +ScmrUnlockServiceDatabase(handle_t BindingHandle, + unsigned int hLock) +{ + DPRINT1("ScmrUnlockServiceDatabase() called\n"); + return ERROR_SUCCESS; +} + + +/* Function 9 */ +unsigned long +ScmrNotifyBootConfigStatus(handle_t BindingHandle, + unsigned long BootAcceptable) +{ + DPRINT1("ScmrNotifyBootConfigStatus() called\n"); + return ERROR_SUCCESS; +} + + + +/* Function 12 */ +unsigned long +ScmrCreateServiceW(handle_t BindingHandle, + unsigned int hSCManager, + wchar_t *lpServiceName, + wchar_t *lpDisplayName, unsigned long dwDesiredAccess, - unsigned int *hScm) + unsigned long dwServiceType, + unsigned long dwStartType, + unsigned long dwErrorControl, + wchar_t *lpBinaryPathName, + wchar_t *lpLoadOrderGroup, + unsigned long *lpdwTagId, + wchar_t *lpDependencies, + wchar_t *lpServiceStartName, + wchar_t *lpPassword) { - DPRINT("ScmrOpenSCManagerA() called\n"); + DPRINT1("ScmrCreateServiceW() called\n"); + if (lpdwTagId != NULL) + *lpdwTagId = 0; return ERROR_SUCCESS; } + +/* Function 15 */ unsigned long ScmrOpenSCManagerW(handle_t BindingHandle, wchar_t *lpMachineName, @@ -258,14 +412,23 @@ DPRINT("dwDesiredAccess = %x\n", dwDesiredAccess); dwError = ScmCreateManagerHandle(lpDatabaseName, - &hHandle, - dwDesiredAccess); + &hHandle); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmCreateManagerHandle() failed (Error %lu)\n", dwError); return dwError; } + /* Check the desired access */ + dwError = ScmCheckAccess(hHandle, + dwDesiredAccess | SC_MANAGER_CONNECT); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + GlobalFree(hHandle); + return dwError; + } + *hScm = (unsigned int)hHandle; DPRINT("*hScm = %x\n", *hScm); @@ -275,19 +438,8 @@ } +/* Function 16 */ unsigned int -ScmrOpenServiceA(handle_t BindingHandle, - unsigned int hSCManager, - char *lpServiceName, - unsigned long dwDesiredAccess, - unsigned int *hService) -{ - DPRINT("ScmrOpenServiceA() called\n"); - return 0; -} - - -unsigned int ScmrOpenServiceW(handle_t BindingHandle, unsigned int hSCManager, wchar_t *lpServiceName, @@ -317,14 +469,23 @@ /* Create a service handle */ dwError = ScmCreateServiceHandle(NULL, - &hHandle, - dwDesiredAccess); + &hHandle); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmCreateServiceHandle() failed (Error %lu)\n", dwError); return dwError; } + /* Check the desired access */ + dwError = ScmCheckAccess(hHandle, + dwDesiredAccess); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmCheckAccess() failed (Error %lu)\n", dwError); + GlobalFree(hHandle); + return dwError; + } + *hService = (unsigned int)hHandle; DPRINT("*hService = %x\n", *hService); @@ -335,6 +496,33 @@ +/* Function 27 */ +unsigned long +ScmrOpenSCManagerA(handle_t BindingHandle, + char *lpMachineName, + char *lpDatabaseName, + unsigned long dwDesiredAccess, + unsigned int *hScm) +{ + DPRINT("ScmrOpenSCManagerA() called\n"); + return ERROR_SUCCESS; +} + + +/* Function 28 */ +unsigned int +ScmrOpenServiceA(handle_t BindingHandle, + unsigned int hSCManager, + char *lpServiceName, + unsigned long dwDesiredAccess, + unsigned int *hService) +{ + DPRINT("ScmrOpenServiceA() called\n"); + return 0; +} + + + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return GlobalAlloc(GPTR, len);

1 0

[mbosma] 14634: PackageManager: Little fix
by mbosma＠svn.reactos.com 16 Apr '05

16 Apr '05

PackageManager: Little fix Modified: trunk/rosapps/packmgr/cmd-line/main.c _____ Modified: trunk/rosapps/packmgr/cmd-line/main.c --- trunk/rosapps/packmgr/cmd-line/main.c 2005-04-16 11:42:44 UTC (rev 14633) +++ trunk/rosapps/packmgr/cmd-line/main.c 2005-04-16 11:48:26 UTC (rev 14634) @@ -22,43 +22,42 @@ if(argc<2) return Help(); - // install a package - if (argv[1] == "install") + if (!strcmp(argv[1], "install")) Install(); // install a package from source - else if (argv[1] == "src-inst") + else if (!strcmp(argv[1], "src-inst")) { wprintf(L"Sorry but I can't do that yet. \n"); } // update a package - else if (argv[1] == "update") + else if (!strcmp(argv[1], "update")) { wprintf(L"Sorry but I can't do that yet. \n"); } // update everything - else if (argv[1] == "dist-upgrade") + else if (!strcmp(argv[1], "dist-upgrade")) { wprintf(L"Sorry but I can't do that yet. \n"); } // remove a package - else if (argv[1] == "remove") + else if (!strcmp(argv[1], "remove")) { wprintf(L"Sorry but I can't do that yet. \n"); } // search for a package - else if (argv[1] == "show") + else if (!strcmp(argv[1], "show")) { Show(); } // search for a package - else if (argv[1] == "search") + else if (!strcmp(argv[1], "search")) { wprintf(L"Sorry but I can't do that yet. \n"); }

1 0

[mbosma] 14633: PackageManager: Changed download server to my own webspace. Because http://svn.reactos.com is still offline.
by mbosma＠svn.reactos.com 16 Apr '05

16 Apr '05

PackageManager: Changed download server to my own webspace. Because http://svn.reactos.com is still offline. Modified: trunk/rosapps/packmgr/lib/download.cpp _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-16 11:11:52 UTC (rev 14632) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-16 11:42:44 UTC (rev 14633) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; +const char* tree_server = "http://maarten-online.de/xml/"; //"http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/ "; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller,

1 0

[hpoussin] 14631: Allow interrupts indicating an empty buffer only if some bytes are pending
by hpoussin＠svn.reactos.com 15 Apr '05

15 Apr '05

Allow interrupts indicating an empty buffer only if some bytes are pending This should correct the boot in Qemu Modified: trunk/reactos/drivers/dd/serial/misc.c _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 22:02:37 UTC (rev 14630) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 22:14:13 UTC (rev 14631) @@ -130,11 +130,13 @@ DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; } + if (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer)) + { + /* allow new interrupts */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); + } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); - - /* allow new interrupts */ - IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); - WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); } BOOLEAN STDCALL

1 0

[ekohl] 14630: Use RPC for making calls to the Service Control Manager.
by ekohl＠svn.reactos.com 15 Apr '05

15 Apr '05

Use RPC for making calls to the Service Control Manager. Added: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/makefile Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/makefile Added: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.c Modified: trunk/reactos/subsys/system/services/services.h _____ Added: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-15 22:02:37 UTC (rev 14630) @@ -0,0 +1,72 @@ +/* + * Service Control Manager (SCM) interface definition + */ + +//#include <windef.h> +//#include <winsvc.h> + +#define DWORD unsigned long +#define BOOL unsigned long +#define SC_HANDLE unsigned int +#define LPCSTR char* +#define LPCWSTR wchar_t* + +[ + uuid(367abb81-9844-35f1-ad32-98f038001003), + version(2.0), + pointer_default(unique), + explicit_handle +] +interface svcctl +{ +cpp_quote("#if 0"); + typedef struct _SERVICE_STATUS + { + DWORD dwServiceType; + DWORD dwCurrentState; + DWORD dwControlsAccepted; + DWORD dwWin32ExitCode; + DWORD dwServiceSpecificExitCode; + DWORD dwCheckPoint; + DWORD dwWaitHint; + } SERVICE_STATUS, *LPSERVICE_STATUS; +cpp_quote("#endif"); + + /* Service 0 */ + DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle, + [in] SC_HANDLE hSCObject); + + /* Service 1 */ +// BOOL ScmrControlService([in] handle_t BindingHandle, +// [in] SC_HANDLE hService, +// [in] DWORD dwControl, +// [out] LPSERVICE_STATUS lpServiceStatus); + + /* Service 2 */ + DWORD ScmrDeleteService([in] handle_t BindingHandle, + [in] SC_HANDLE hService); + + DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, + [in, string, unique] LPCSTR lpMachineName, + [in, string, unique] LPCSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle, + [in, string, unique] LPCWSTR lpMachineName, + [in, string, unique] LPCWSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCWSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); +} _____ Modified: trunk/reactos/lib/advapi32/makefile --- trunk/reactos/lib/advapi32/makefile 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/lib/advapi32/makefile 2005-04-15 22:02:37 UTC (rev 14630) @@ -16,7 +16,7 @@ TARGET_LFLAGS = -nostartfiles -nostdlib -TARGET_SDKLIBS = ntdll.a kernel32.a +TARGET_SDKLIBS = ntdll.a kernel32.a rpcrt4.a TARGET_BASE = $(TARGET_BASE_LIB_ADVAPI32) @@ -51,7 +51,8 @@ service/eventlog.o \ service/scm.o \ service/sctrl.o \ - service/undoc.o + service/undoc.o \ + service/svcctl_c.o TOKEN_OBJECTS = \ token/privilege.o \ @@ -67,8 +68,17 @@ DEP_OBJECTS = $(TARGET_OBJECTS) +TARGET_CLEAN = service/svcctl_c.c service/svcctl.h + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk include $(TOOLS_PATH)/depend.mk + +WIDL_FLAGS = -o \ + -D _X86_ -D MIDL_PASS \ + -I $(PATH_TO_TOP)/w32api/include + +service/svcctl_c.c service/svcctl.h: $(PATH_TO_TOP)/include/idl/svcctl.idl + $(WIDL) $(WIDL_FLAGS) -h -H service/svcctl.h -c -C service/svcctl_c.c $(PATH_TO_TOP)/include/idl/svcctl.idl _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-15 22:02:37 UTC (rev 14630) @@ -1,10 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/service/scm.c * PURPOSE: Service control manager functions * PROGRAMMER: Emanuele Aliberti + * Eric Kohl * UPDATE HISTORY: * 19990413 EA created * 19990515 EA @@ -13,11 +13,70 @@ /* INCLUDES ******************************************************************/ #include "advapi32.h" +#include "svcctl.h" + #define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ +handle_t BindingHandle = NULL; + +static VOID +HandleBind(VOID) +{ + LPWSTR pszStringBinding; + RPC_STATUS status; + + if (BindingHandle != NULL) + return; + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &BindingHandle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } +} + + +#if 0 +static VOID +HandleUnbind(VOID) +{ + RPC_STATUS status; + + if (BindingHandle == NULL) + return; + + status = RpcBindingFree(&BindingHandle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } +} +#endif + + /********************************************************************** * ChangeServiceConfigA * @@ -75,17 +134,27 @@ * * @implemented */ -BOOL -STDCALL +BOOL STDCALL CloseServiceHandle(SC_HANDLE hSCObject) { - DPRINT("CloseServiceHandle() - called.\n"); + DWORD dwError; - if (!CloseHandle(hSCObject)) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - return TRUE; + DPRINT1("CloseServiceHandle() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrCloseServiceHandle(BindingHandle, + (unsigned int)hSCObject); + DPRINT1("dwError %lu\n", dwError); + + if (dwError) + { + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -94,15 +163,36 @@ * * @unimplemented */ -BOOL -STDCALL +BOOL STDCALL ControlService(SC_HANDLE hService, DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { - DPRINT1("ControlService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +#if 0 + DWORD dwError; + + DPRINT1("ControlService(%x, %x, %p)\n", + hService, dwControl, lpServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrControlService(BindingHandle, + (unsigned int)hService, + dwControl, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + SetLastError(dwError); return FALSE; + } + + return TRUE; +#endif + + DPRINT1("ControlService is unimplemented\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } @@ -165,13 +255,25 @@ * * @unimplemented */ -BOOL -STDCALL +BOOL STDCALL DeleteService(SC_HANDLE hService) { - DPRINT1("DeleteService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD dwError; + + DPRINT1("DeleteService(%x)\n", hService); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrDeleteService(BindingHandle, + (unsigned int)hService); + if (dwError != ERROR_SUCCESS) + { + SetLastError(dwError); return FALSE; + } + + return TRUE; } @@ -410,6 +512,7 @@ return FALSE; } + /********************************************************************** * LockServiceDatabase * @@ -417,7 +520,7 @@ */ SC_LOCK STDCALL -LockServiceDatabase(SC_HANDLE hSCManager) +LockServiceDatabase(SC_HANDLE hSCManager) { DPRINT1("LockServiceDatabase is unimplemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -425,36 +528,80 @@ } +static VOID +WaitForSCManager(VOID) +{ + HANDLE hEvent; + + DPRINT1("WaitForSCManager() called\n"); + + /* Try to open the existing event */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + if (GetLastError() != ERROR_FILE_NOT_FOUND) + return; + + /* Try to create a new event */ + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + /* Try to open the existing event again */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + return; + } + } + + /* Wait for 3 minutes */ + WaitForSingleObject(hEvent, 180000); + CloseHandle(hEvent); + + DPRINT1("ScmWaitForSCManager() done\n"); +} + + /********************************************************************** * OpenSCManagerA * - * @unplemented + * @implemented */ SC_HANDLE STDCALL OpenSCManagerA(LPCSTR lpMachineName, - LPCSTR lpDatabaseName, - DWORD dwDesiredAccess) + LPCSTR lpDatabaseName, + DWORD dwDesiredAccess) { - SC_HANDLE Handle; - UNICODE_STRING MachineNameW; - UNICODE_STRING DatabaseNameW; - ANSI_STRING MachineNameA; - ANSI_STRING DatabaseNameA; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerA(%x, %x, %d)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT1("OpenSCManagerA(%s, %s, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - RtlInitAnsiString(&MachineNameA, (LPSTR)lpMachineName); - RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); - RtlInitAnsiString(&DatabaseNameA, (LPSTR)lpDatabaseName); - RtlAnsiStringToUnicodeString(&DatabaseNameW, &DatabaseNameA, TRUE); + WaitForSCManager(); - Handle = OpenSCManagerW(lpMachineName ? MachineNameW.Buffer : NULL, - lpDatabaseName ? DatabaseNameW.Buffer : NULL, - dwDesiredAccess); + HandleBind(); - RtlFreeHeap(GetProcessHeap(), 0, MachineNameW.Buffer); - RtlFreeHeap(GetProcessHeap(), 0, DatabaseNameW.Buffer); - return Handle; + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + DPRINT1("hScm = %p\n", hScm); + if (dwError) + { + SetLastError(dwError); + return NULL; + } + + return hScm; } @@ -463,215 +610,111 @@ * * @unimplemented */ -SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR lpMachineName, - LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess) +SC_HANDLE STDCALL +OpenSCManagerW(LPCWSTR lpMachineName, + LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess) { - HANDLE hPipe; - DWORD dwMode; - DWORD dwWait; - BOOL fSuccess; - HANDLE hStartEvent; - LPWSTR lpszPipeName = L"\\\\.\\pipe\\Ntsvcs"; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerW(%x, %x, %d)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT1("OpenSCManagerW(%S, %S, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - if (lpMachineName == NULL || wcslen(lpMachineName) == 0) - { - if (lpDatabaseName != NULL && wcscmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) - { - DPRINT("OpenSCManagerW() - Invalid parameters.\n"); - return NULL; - } + WaitForSCManager(); - DPRINT("OpenSCManagerW() - OpenEvent(\"SvcctrlStartEvent_A3725DX\")\n"); + HandleBind(); - // Only connect to scm when event "SvcctrlStartEvent_A3725DX" is signaled - hStartEvent = OpenEventW(SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); - if (hStartEvent == NULL) - { - SetLastError(ERROR_DATABASE_DOES_NOT_EXIST); - DPRINT("OpenSCManagerW() - Failed to Open Event \"SvcctrlStartEvent_A3725DX\".\n"); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("OpenSCManagerW() - Waiting forever on event handle: %x\n", hStartEvent); + DPRINT1("hScm = %p\n", hScm); -#if 1 - dwWait = WaitForSingleObject(hStartEvent, INFINITE); - if (dwWait == WAIT_FAILED) - { - DPRINT("OpenSCManagerW() - Wait For Start Event failed.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return NULL; - } -#else - { - DWORD Count; - - /* wait for event creation (by SCM) for max. 20 seconds */ - for (Count = 0; Count < 20; Count++) - { - dwWait = WaitForSingleObject(hStartEvent, 1000); - if (dwWait == WAIT_FAILED) - { - DPRINT("OpenSCManagerW() - Wait For Start Event failed.\n"); - Sleep(1000); - } - else - { - break; - } - } - - if (dwWait == WAIT_FAILED) - { - DbgPrint("WL: Failed to wait on event \"SvcctrlStartEvent_A3725DX\"\n"); - } - - } -#endif - - DPRINT("OpenSCManagerW() - Closing handle to event...\n"); - - CloseHandle(hStartEvent); - - // Try to open a named pipe; wait for it, if necessary - while (1) - { - DWORD dwLastError; - DPRINT("OpenSCManagerW() - attempting to open named pipe to SCM.\n"); - hPipe = CreateFileW(lpszPipeName, // pipe name - dwDesiredAccess, - 0, // no sharing - NULL, // no security attributes - OPEN_EXISTING, // opens existing pipe - 0, // default attributes - NULL); // no template file - - DPRINT("OpenSCManagerW() - handle to named pipe: %x\n", hPipe); - // Break if the pipe handle is valid - if (hPipe != INVALID_HANDLE_VALUE) - { - break; - } - - // Exit if an error other than ERROR_PIPE_BUSY occurs - dwLastError = GetLastError(); - if (dwLastError != ERROR_PIPE_BUSY) - { - DPRINT("OpenSCManagerW() - returning at 4, dwLastError %d\n", dwLastError); - return NULL; - } - - // All pipe instances are busy, so wait for 20 seconds - if (!WaitNamedPipeW(lpszPipeName, 20000)) - { - DPRINT("OpenSCManagerW() - Failed on WaitNamedPipeW(...).\n"); - return NULL; - } - } - - // The pipe connected; change to message-read mode - dwMode = PIPE_READMODE_MESSAGE; - fSuccess = SetNamedPipeHandleState( - hPipe, // pipe handle - &dwMode, // new pipe mode - NULL, // don't set maximum bytes - NULL); // don't set maximum time - if (!fSuccess) - { - CloseHandle(hPipe); - DPRINT("OpenSCManagerW() - Failed on SetNamedPipeHandleState(...).\n"); - return NULL; - } -#if 0 - // Send a message to the pipe server - lpvMessage = (argc > 1) ? argv[1] : "default message"; - - fSuccess = WriteFile( - hPipe, // pipe handle - lpvMessage, // message - strlen(lpvMessage) + 1, // message length - &cbWritten, // bytes written - NULL); // not overlapped - if (!fSuccess) - { - CloseHandle(hPipe); - DPRINT("OpenSCManagerW() - Failed to write to pipe.\n"); - return NULL; - } - - do - { - DPRINT("OpenSCManagerW() - in I/O loop to SCM...\n"); - // Read from the pipe - fSuccess = ReadFile( - hPipe, // pipe handle - chBuf, // buffer to receive reply - 512, // size of buffer - &cbRead, // number of bytes read - NULL); // not overlapped - - if (!fSuccess && GetLastError() != ERROR_MORE_DATA) - { - break; - } - - // Reply from the pipe is written to STDOUT. - if (!WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), chBuf, cbRead, &cbWritten, NULL)) - { - break; - } - } while(!fSuccess); // repeat loop if ERROR_MORE_DATA - - DPRINT("OpenSCManagerW() - I/O loop completed.\n"); - //CloseHandle(hPipe); -#endif - DPRINT("OpenSCManagerW() - success, returning handle to pipe %x\n", hPipe); - return hPipe; - } - else - { - /* FIXME: Connect to remote SCM */ - DPRINT("OpenSCManagerW() - FIXME: Connect to remote SCM is unimplemented.\n"); - return NULL; - } + return hScm; } /********************************************************************** * OpenServiceA * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL OpenServiceA(SC_HANDLE hSCManager, LPCSTR lpServiceName, DWORD dwDesiredAccess) { - DPRINT1("OpenServiceA is unimplemented, returning ERROR_SERVICE_DOES_NOT_EXIST for %s\n", lpServiceName); - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return NULL; + SC_HANDLE hService = NULL; + DWORD dwError; + + DPRINT1("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } + + DPRINT1("hService = %p\n", hService); + + return hService; } /********************************************************************** * OpenServiceW * - * @unimplemented + * @implemented */ -SC_HANDLE -STDCALL -OpenServiceW( - SC_HANDLE hSCManager, - LPCWSTR lpServiceName, - DWORD dwDesiredAccess - ) +SC_HANDLE STDCALL +OpenServiceW(SC_HANDLE hSCManager, + LPCWSTR lpServiceName, + DWORD dwDesiredAccess) { - DPRINT1("OpenServiceW is unimplemented, returning ERROR_SERVICE_DOES_NOT_EXIST for %S\n", lpServiceName); - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return NULL; + SC_HANDLE hService = NULL; + DWORD dwError; + + DPRINT1("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceW(BindingHandle, + (unsigned int)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } + + DPRINT1("hService = %p\n", hService); + + return hService; } @@ -860,4 +903,14 @@ } +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return GlobalAlloc(GPTR,len); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + GlobalFree(ptr); +} + /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/makefile --- trunk/reactos/subsys/system/services/makefile 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/subsys/system/services/makefile 2005-04-15 22:02:37 UTC (rev 14630) @@ -10,14 +10,29 @@ TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = ntdll.a kernel32.a user32.a +TARGET_SDKLIBS = ntdll.a kernel32.a user32.a rpcrt4.a -TARGET_OBJECTS = $(TARGET_NAME).o database.o +TARGET_OBJECTS = svcctl_s.o database.o services.o rpcserver.o -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror +TARGET_CFLAGS = -Wall -Werror -fno-builtin \ + -D__USE_W32API \ + -D_WIN32_IE=0x0500 \ + -D_WIN32_WINNT=0x501 \ + -DWINVER=0x600 \ + -DUNICODE \ + -D_UNICODE +TARGET_CLEAN = svcctl_s.c svcctl_s.h + +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk + +svcctl_s.c svcctl_s.h: $(PATH_TO_TOP)/include/idl/svcctl.idl + $(WIDL) -o -h -H svcctl_s.h -s -S svcctl_s.c $(PATH_TO_TOP)/include/idl/svcctl.idl + # EOF _____ Added: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-15 22:02:37 UTC (rev 14630) @@ -0,0 +1,349 @@ +/* + + */ + +/* INCLUDES ****************************************************************/ + +#define NTOS_MODE_USER +#include <ntos.h> +#include <stdio.h> +#include <windows.h> + +#include "services.h" +#include "svcctl_s.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS *****************************************************************/ + +#define MANAGER_TAG 0x72674D68 /* 'hMgr' */ +#define SERVICE_TAG 0x63765368 /* 'hSvc' */ + +typedef struct _SCMGR_HANDLE +{ + DWORD Tag; + DWORD RefCount; + DWORD DesiredAccess; +} SCMGR_HANDLE; + + +typedef struct _MANAGER_HANDLE +{ + SCMGR_HANDLE Handle; + + /* FIXME: Insert more data here */ + + WCHAR DatabaseName[1]; +} MANAGER_HANDLE, *PMANAGER_HANDLE; + + +typedef struct _SERVICE_HANDLE +{ + SCMGR_HANDLE Handle; + + DWORD DesiredAccess; + PVOID DatabaseEntry; /* FIXME */ + + /* FIXME: Insert more data here */ + +} SERVICE_HANDLE, *PSERVICE_HANDLE; + + +/* FUNCTIONS ***************************************************************/ + +VOID +ScmStartRpcServer(VOID) +{ + RPC_STATUS Status; + + DPRINT("ScmStartRpcServer() called"); + + Status = RpcServerUseProtseqEp(L"ncacn_np", + 10, + L"\\pipe\\ntsvcs", + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEp() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerRegisterIf(svcctl_ServerIfHandle, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return; + } + + DPRINT("ScmStartRpcServer() done"); +} + + +static DWORD +ScmCreateManagerHandle(LPWSTR lpDatabaseName, + SC_HANDLE *Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE Ptr; + + Ptr = GlobalAlloc(GPTR, + sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR)); + if (Ptr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + Ptr->Handle.Tag = MANAGER_TAG; + Ptr->Handle.RefCount = 1; + Ptr->Handle.DesiredAccess = dwDesiredAccess; + + /* FIXME: initialize more data here */ + + wcscpy(Ptr->DatabaseName, lpDatabaseName); + + *Handle = (SC_HANDLE)Ptr; + + return ERROR_SUCCESS; +} + + +static DWORD +ScmCreateServiceHandle(LPVOID lpDatabaseEntry, + SC_HANDLE *Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE Ptr; + + Ptr = GlobalAlloc(GPTR, + sizeof(SERVICE_HANDLE)); + if (Ptr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + Ptr->Handle.Tag = SERVICE_TAG; + Ptr->Handle.RefCount = 1; + Ptr->Handle.DesiredAccess = dwDesiredAccess; + + /* FIXME: initialize more data here */ + // Ptr->DatabaseEntry = lpDatabaseEntry; + + *Handle = (SC_HANDLE)Ptr; + + return ERROR_SUCCESS; +} + + +/* Service 0 */ +unsigned long +ScmrCloseServiceHandle(handle_t BindingHandle, + unsigned int hScObject) +{ + PMANAGER_HANDLE hManager; + + DPRINT("ScmrCloseServiceHandle() called\n"); + + DPRINT("hScObject = %X\n", hScObject); + + if (hScObject == 0) + return ERROR_INVALID_HANDLE; + + hManager = (PMANAGER_HANDLE)hScObject; + if (hManager->Handle.Tag == MANAGER_TAG) + { + DPRINT("Found manager handle\n"); + + hManager->Handle.RefCount--; + if (hManager->Handle.RefCount == 0) + { + /* FIXME: add cleanup code */ + + GlobalFree(hManager); + } + + DPRINT("ScmrCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + else if (hManager->Handle.Tag == SERVICE_TAG) + { + DPRINT("Found service handle\n"); + + hManager->Handle.RefCount--; + if (hManager->Handle.RefCount == 0) + { + /* FIXME: add cleanup code */ + + GlobalFree(hManager); + } + + DPRINT("ScmrCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + + DPRINT1("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); + + return ERROR_INVALID_HANDLE; +} + + +/* Service 1 */ +#if 0 +unsigned long +ScmrControlService(handle_t BindingHandle, + unsigned int hService, + unsigned long dwControl, + LPSERVICE_STATUS lpServiceStatus) +{ + DPRINT("ScmrControlService() called\n"); + +#if 0 + lpServiceStatus->dwServiceType = 0x12345678; + lpServiceStatus->dwCurrentState = 0x98765432; + lpServiceStatus->dwControlsAccepted = 0xdeadbabe; + lpServiceStatus->dwWin32ExitCode = 0xbaadf00d; + lpServiceStatus->dwServiceSpecificExitCode = 0xdeadf00d; + lpServiceStatus->dwCheckPoint = 0xbaadbabe; + lpServiceStatus->dwWaitHint = 0x2468ACE1; +#endif + + return TRUE; +} +#endif + [truncated at 1000 lines; 487 more skipped]

1 0

[arty] 14629: Removed need for separately prefixed binutils.
by arty＠svn.reactos.com 15 Apr '05

15 Apr '05

Removed need for separately prefixed binutils. Modified: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc _____ Modified: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc --- trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-04-15 17:56:40 UTC (rev 14628) +++ trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-04-15 19:33:51 UTC (rev 14629) @@ -27,8 +27,8 @@ rm freeldr.tmp ofwldr: $(OBJS) - mppcw32-ld --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf - mppcw32-objcopy $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ + $(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf + $(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ $(TOOLS)/hack-coff $@ clean:

1 0

[ekohl] 14628: Support in-pointers to structs.
by ekohl＠svn.reactos.com 15 Apr '05

15 Apr '05

Support in-pointers to structs. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/ChangeLog 2005-04-15 17:56:40 UTC (rev 14628) @@ -1,5 +1,13 @@ ChangeLog +2005-04-15 ekohl + + tools/widl/client.c + tools/widl/parser.y + tools/widl/server.c + +Support in-pointers to structs. + 2005-04-03 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/client.c 2005-04-15 17:56:40 UTC (rev 14628) @@ -75,6 +75,65 @@ } +static int get_type_size(type_t *type, int alignment) +{ + int size; + var_t *field; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + case RPC_FC_STRUCT: + field = type->fields; + size = 0; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size += get_type_size(field->type, alignment); + field = PREV_LINK(field); + } + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -113,8 +172,39 @@ print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } + else if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int size; + + if (in_attr & !out_attr) + print_client("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_client("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_client("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(client, "#ifndef _ALPHA_\n"); + print_client("0x01,\n"); + fprintf(client, "#else\n"); + print_client("0x02,\n"); + fprintf(client, "#endif\n"); + print_client("NdrFcShort(0x%x),\n", type_offset); + + size = 9; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size++; + field = PREV_LINK(field); + } + if (size % 2) + size++; + type_offset += size; + } else { + print_client("0x4d, /* FC_IN_PARAM */\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); return; @@ -122,8 +212,8 @@ } else if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { +// if (is_base_type(var->type)) +// { if (in_attr & !out_attr) print_client("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -137,14 +227,20 @@ fprintf(client, "#endif\n"); print_client("NdrFcShort(0x%x),\n", type_offset); type_offset += 4; - } - else - { - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; - } +// } +// else +// { +// error("%s:%d Unknown/unsupported type 0x%x\n", +// __FUNCTION__,__LINE__, var->type->type); +// return; +// } } + else + { + error("%s:%d Pointer level %d is not supported!\n", + __FUNCTION__,__LINE__, var->ptr_level); + return; + } var = PREV_LINK(var); } @@ -185,7 +281,7 @@ { func_t *func = iface->funcs; var_t *var; - int out_attr; + int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; @@ -195,7 +291,7 @@ print_client("0,\n"); print_client("{\n"); indent++; - print_client("NdrFcShort(0x0),\n"); + print_client("NdrFcShort(0x00),\n"); while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -206,6 +302,7 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); string_attr = is_attr(var->attrs, ATTR_STRING); @@ -216,8 +313,51 @@ return; } - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if (!is_base_type(var->type)) + { + if (var->type->type == RPC_FC_RP) + { + var_t *field; + int tsize = 9; + unsigned char flags = 0; + + if (!in_attr && out_attr) + flags |= RPC_FC_P_ONSTACK; + + print_client("0x11, 0x%02X, /* FC_RP, [flags] */\n", flags); + print_client("NdrFcShort(0x%02X),\n", 0x02); + print_client("0x%02X,\n", var->type->ref->ref->type); + print_client("0x%02X,\n", 3); /* alignment -1 */ + print_client("NdrFcShort(0x%02X),\n", get_type_size(var->type->ref->ref, 4)); + + field = var->type->ref->ref->fields; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + print_client("0x%02X,\n", get_base_type(field->type->type)); + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + { + print_client("0x5c, /* FC_PAD */\n"); + tsize++; + } + print_client("0x5b, /* FC_END */\n"); + } + else + { + + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + } + } + else if (var->ptr_level == 1) + { ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); @@ -389,6 +529,17 @@ size = 0; break; + case 0: + printf("%s\n", __FUNCTION__); + printf("ptr_level %d\n", var->ptr_level); + printf("Type %p\n", var->type); + printf("Type %x\n", var->type->type); + printf("Type name: %s\n", var->type->name); + printf("Tref %p\n", var->type->ref); + printf("Tref->name %s\n", var->type->ref->name); + printf("Tref->ref %p\n", var->type->ref->ref); + return; + default: error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); @@ -441,6 +592,12 @@ size = 0; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_FP: + size = 0; + break; + default: error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); @@ -489,10 +646,25 @@ if (in_attr) { - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 0 && + var->type->type == RPC_FC_RP) { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + print_client("NdrSimpleStructBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + nothing_printed = 1; + indent--; + } + } + else if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { if (ptr_attr) { /* FIXME: not supported yet */ @@ -523,8 +695,28 @@ } /* calculate the next type offset */ - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + local_type_offset += tsize; + } + } + else if (var->ptr_level == 1) + { local_type_offset += 4; } } @@ -545,6 +737,7 @@ int string_attr; int ptr_attr, ref_attr, unique_attr; var_t *var; + unsigned int local_type_offset = *type_offset; if (!func->args) return; @@ -670,81 +863,118 @@ } else { - alignment = 0; - switch (var->type->type) + if (is_base_type(var->type)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; - } + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } - if (size != 0) - { - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR*)_StubMsg.Buffer) = "); - if (var->ptr_level == 1) - fprintf(client, "*"); - write_name(client, var); - fprintf(client, ";\n"); - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, ");\n"); - fprintf(client, "\n"); + print_client("*(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer) = "); + if (var->ptr_level == 1) + fprintf(client, "*"); + write_name(client, var); + fprintf(client, ";\n"); + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + fprintf(client, "\n"); - last_size = size; + last_size = size; + } } + else if (var->type->type == RPC_FC_RP) + { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + print_client("NdrSimpleStructMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + *type_offset + 4); + indent--; + fprintf(client, "\n"); + } + } } } /* calculate the next type offset */ - if (var->ptr_level == 1) + if (var->ptr_level == 0) { - *type_offset += 4; + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + local_type_offset += tsize; + } } + else if (var->ptr_level == 1) + { + local_type_offset += 4; + } } } -static void unmarshall_out_arguments(func_t *func) +static void unmarshall_out_arguments(func_t *func, unsigned int *type_offset) { unsigned int alignment; unsigned int size; @@ -752,6 +982,7 @@ int out_attr; var_t *var; var_t *def; + unsigned int local_type_offset = *type_offset; def = func->def; @@ -763,80 +994,131 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); - if (!out_attr) - continue; - - if (var->ptr_level > 1) + if (out_attr) { - error("Function '%s' argument '%s': Pointer level %d not supported!\n", - func->def->name, var->name, var->ptr_level); - return; - } + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } - alignment = 0; - switch (var->type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; - alignment = 0; - break; + if (is_base_type(var->type)) + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + + if (size != 0) + { + if (var->ptr_level == 1) + { + fprintf(client, "\n"); + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); + + print_client("*"); + write_name(client, var); + fprintf(client, " = *(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + } + + last_size = size; + } + } + else if (var->type->type == RPC_FC_RP) + { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + fprintf(client, "\n"); + print_client("NdrSimpleStructUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + } + } + else + { + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } } - if (size != 0) + /* calculate the next type offset */ + if (var->ptr_level == 0) { - if (var->ptr_level == 1) + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) { - fprintf(client, "\n"); - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + var_t *field = var->type->ref->ref->fields; + int tsize = 9; - print_client("*"); - write_name(client, var); - fprintf(client, " = *(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, ");\n"); + local_type_offset += tsize; } - - last_size = size; } + else if (var->ptr_level == 1) + { + local_type_offset += 4; + } } } @@ -1102,9 +1384,44 @@ indent -= 2; /* unmarshal out arguments */ - unmarshall_out_arguments(func); + unmarshall_out_arguments(func, &type_offset); } + /* update type_offset */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + type_offset += tsize; + } + } + else if (var->ptr_level == 1) + { + type_offset += 4; + } + var = PREV_LINK(var); + } + } + /* update proc_offset */ if (func->args) { @@ -1267,7 +1584,7 @@ func_t *func; var_t *var; - /* determine the proc format string size */ + /* determine the type format string size */ func = iface->funcs; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -1279,8 +1596,26 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize ++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + size += tsize; + } + } + else if (var->ptr_level == 1) + { if (is_base_type(var->type)) size += 4; } @@ -1319,6 +1654,8 @@ case 0: if (is_base_type(var->type)) size += 2; + else if (var->type->type == RPC_FC_RP) + size += 4; break; case 1: _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/parser.y 2005-04-15 17:56:40 UTC (rev 14628) @@ -593,7 +593,8 @@ coclasshdr: attributes coclass { $$ = $2; $$->attrs = $1; - if (!parse_only && do_header) write_coclass($$); + if (!parse_only && do_header) + write_coclass($$); } ; @@ -725,6 +726,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ $$->type = get_struct_type( $4 ); + $$->name = $2->name; $$->fields = $4; $$->defined = TRUE; if(in_typelib) @@ -744,14 +746,15 @@ | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } ; -typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); +typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); $4->tname = tref->name; tref->name = NULL; $$ = type_ref(tref); $$->attrs = $2; - if (!parse_only && do_header) write_typedef($$, $4); - if (in_typelib && $$->attrs) - add_typedef($$, $4); + if (!parse_only && do_header) + write_typedef($$, $4); + if (in_typelib && $$->attrs) + add_typedef($$, $4); reg_types($$, $4, 0); } ; @@ -1114,6 +1117,7 @@ nt->t = t; nt->next = type_hash[hash]; type_hash[hash] = nt; + type->name = name; return type; } @@ -1136,7 +1140,14 @@ } t = get_attrv( type->attrs, ATTR_POINTERTYPE ); if (t) return t; - return RPC_FC_FP; + + if(is_attr( type->attrs, ATTR_PTR )) + return RPC_FC_FP; + + if(is_attr( type->attrs, ATTR_UNIQUE )) + return RPC_FC_UP; + + return RPC_FC_RP; } static type_t *reg_types(type_t *type, var_t *names, int t) _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/server.c 2005-04-15 17:56:40 UTC (rev 14628) @@ -80,6 +80,65 @@ } +static int get_type_size(type_t *type, int alignment) +{ + int size; + var_t *field; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + case RPC_FC_STRUCT: + field = type->fields; + size = 0; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size += get_type_size(field->type, alignment); + field = PREV_LINK(field); + } + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -118,6 +177,35 @@ print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } + else if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int size; + + if (in_attr & !out_attr) + print_server("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_server("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_server("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(server, "#ifndef _ALPHA_\n"); + print_server("0x01,\n"); + fprintf(server, "#else\n"); + print_server("0x02,\n"); + fprintf(server, "#endif\n"); + print_server("NdrFcShort(0x%x),\n", type_offset); + + size = 9; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size++; + field = PREV_LINK(field); + } + if (size % 2) + size++; + type_offset += size; + } else { error("%s:%d Unknown/unsupported type 0x%x\n", @@ -127,8 +215,8 @@ } else if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { +// if (is_base_type(var->type)) +// { if (in_attr & !out_attr) print_server("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -142,13 +230,13 @@ fprintf(server, "#endif\n"); print_server("NdrFcShort(0x%x),\n", type_offset); type_offset += 4; - } - else - { - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); [truncated at 1000 lines; 1132 more skipped]

1 0

[hpoussin] 14627: Add ASSERTs
by hpoussin＠svn.reactos.com 15 Apr '05

15 Apr '05

Add ASSERTs Correct a bug when processing IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation (serenum) Don't breakpoint if NDEBUG is defined (serenum) Allow to write more than 16 bytes in one IRP_MJ_WRITE (serial) Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -199,7 +199,7 @@ KTIMER Timer; LARGE_INTEGER DueTime; - DueTime.QuadPart = -milliseconds * 10; + DueTime.QuadPart = milliseconds * -10; KeInitializeTimer(&Timer); KeSetTimer(&Timer, DueTime, NULL); return KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, NULL); _____ Modified: trunk/reactos/drivers/bus/serenum/misc.c --- trunk/reactos/drivers/bus/serenum/misc.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/misc.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -14,10 +14,12 @@ NTSTATUS SerenumDuplicateUnicodeString( - OUT PUNICODE_STRING Destination, - IN PUNICODE_STRING Source, - IN POOL_TYPE PoolType) + OUT PUNICODE_STRING Destination, + IN PUNICODE_STRING Source, + IN POOL_TYPE PoolType) { + ASSERT(Destination); + if (Source == NULL) { RtlInitUnicodeString(Destination, NULL); @@ -52,6 +54,8 @@ ULONG DestinationSize = 0; NTSTATUS Status = STATUS_SUCCESS; + ASSERT(Destination); + /* Calculate length needed for destination unicode string */ va_start(args, Destination); Source = va_arg(args, PCSZ); @@ -133,6 +137,8 @@ ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) ; LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -162,6 +168,7 @@ ASSERT(DeviceExtension->Common.IsFDO); LowerDevice = DeviceExtension->LowerDevice; + ASSERT(LowerDevice); DPRINT("Serenum: calling lower device 0x%p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); @@ -180,6 +187,7 @@ ASSERT(!DeviceExtension->Common.IsFDO); Fdo = DeviceExtension->AttachedFdo; + ASSERT(Fdo); DPRINT("Serenum: calling attached Fdo 0x%p [%wZ]\n", Fdo, &Fdo->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); @@ -195,6 +203,7 @@ ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) ; LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); _____ Modified: trunk/reactos/drivers/bus/serenum/pdo.c --- trunk/reactos/drivers/bus/serenum/pdo.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/pdo.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -99,6 +99,7 @@ return STATUS_INSUFFICIENT_RESOURCES; ObReferenceObject(DeviceObject); + DeviceRelations->Count = 1; DeviceRelations->Objects[0] = DeviceObject; *pDeviceRelations = DeviceRelations; _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.c --- trunk/reactos/drivers/bus/serenum/serenum.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/serenum.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -52,7 +52,9 @@ { DPRINT1("Serenum: FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); +#ifndef NDEBUG DbgBreakPoint(); +#endif Status = Irp->IoStatus.Status; } } @@ -73,7 +75,9 @@ { DPRINT1("Serenum: PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); +#ifndef NDEBUG DbgBreakPoint(); +#endif Status = Irp->IoStatus.Status; } } @@ -100,12 +104,6 @@ for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; - /*DriverObject->MajorFunction[IRP_MJ_CREATE] = SerialCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = SerialClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = SerialCleanup; - DriverObject->MajorFunction[IRP_MJ_READ] = SerialRead; - DriverObject->MajorFunction[IRP_MJ_WRITE] = SerialWrite;*/ - //DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = Serenum; //DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation; DriverObject->MajorFunction[IRP_MJ_PNP] = SerenumPnp; //DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower; _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -17,6 +17,7 @@ IN ULONG BufferSize) { DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + ASSERT(pBuffer); pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -30,6 +31,7 @@ IN PCIRCULAR_BUFFER pBuffer) { DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); return STATUS_SUCCESS; } @@ -39,6 +41,7 @@ IN PCIRCULAR_BUFFER pBuffer) { DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); } @@ -49,6 +52,7 @@ { ULONG NextPosition; DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + ASSERT(pBuffer); ASSERT(pBuffer->Length); NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; if (NextPosition == pBuffer->ReadPosition) @@ -64,6 +68,7 @@ OUT PUCHAR Entry) { DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) return STATUS_ARRAY_BOUNDS_EXCEEDED; @@ -80,6 +85,7 @@ PUCHAR NewBuffer; DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + ASSERT(pBuffer); ASSERT(pBuffer->Length); if (pBuffer->Length > NewBufferSize) return STATUS_INVALID_PARAMETER; _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/create.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -26,6 +26,8 @@ FileObject = Stack->FileObject; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FileObject); + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) { CHECKPOINT; _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -20,10 +20,10 @@ OUT PVOID* BufferIn, OUT PVOID* BufferOut) { - ASSERT(Irp); - ASSERT(BufferIn); - ASSERT(BufferOut); - + ASSERT(Irp); + ASSERT(BufferIn); + ASSERT(BufferOut); + switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) { case METHOD_BUFFERED: @@ -118,6 +118,9 @@ UCHAR Lcr = 0; NTSTATUS Status; + ASSERT(DeviceExtension); + ASSERT(NewSettings); + DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); @@ -184,6 +187,8 @@ SerialClearPerfStats( IN PSERIAL_DEVICE_EXTENSION DeviceExtension) { + ASSERT(DeviceExtension); + RtlZeroMemory(&DeviceExtension->SerialPerfStats, sizeof(SERIALPERF_STATS)); DeviceExtension->BreakInterruptErrorCount = 0; return TRUE; @@ -195,6 +200,7 @@ PSERIAL_DEVICE_EXTENSION pDeviceExtension; pDeviceExtension = (PSERIAL_DEVICE_EXTENSION) IoGetCurrentIrpStackLocation(pIrp)->DeviceObject->DeviceExtension; + ASSERT(DeviceExtension); /* * we assume buffer is big enough to hold SerialPerfStats structure * caller must verify this @@ -212,6 +218,8 @@ OUT PSERIAL_COMMPROP pCommProp, IN PSERIAL_DEVICE_EXTENSION DeviceExtension) { + ASSERT(pCommProp); + RtlZeroMemory(pCommProp, sizeof(SERIAL_COMMPROP)); pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); @@ -257,6 +265,7 @@ { KIRQL Irql; + ASSERT(pSerialStatus); RtlZeroMemory(pSerialStatus, sizeof(SERIAL_STATUS)); pSerialStatus->Errors = 0; _____ Modified: trunk/reactos/drivers/dd/serial/info.c --- trunk/reactos/drivers/dd/serial/info.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/info.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -37,12 +37,13 @@ DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; - else + else if (!StandardInfo) + Status = STATUS_INVALID_PARAMETER; { StandardInfo->AllocationSize.QuadPart = 0; StandardInfo->EndOfFile.QuadPart = 0; - StandardInfo->Directory = FALSE; - StandardInfo->NumberOfLinks = 0; + StandardInfo->Directory = FALSE; + StandardInfo->NumberOfLinks = 0; StandardInfo->DeletePending = FALSE; /* FIXME: should be TRUE sometimes */ Status = STATUS_SUCCESS; } @@ -52,9 +53,13 @@ { PFILE_POSITION_INFORMATION PositionInfo = (PFILE_POSITION_INFORMATION)SystemBuffer; + ASSERT(PositionInfo); + DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; + else if (!PositionInfo) + Status = STATUS_INVALID_PARAMETER; else { PositionInfo->CurrentByteOffset.QuadPart = 0; _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -32,6 +32,8 @@ KEVENT Event; NTSTATUS Status; + ASSERT(LowerDevice); + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -56,6 +58,8 @@ { PDEVICE_OBJECT LowerDevice = ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -31,6 +31,9 @@ static ULONG ComPortNumber = 1; DPRINT("Serial: SerialAddDeviceInternal called\n"); + + ASSERT(DeviceObject); + ASSERT(Pdo); /* Create new device object */ swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); @@ -125,12 +128,10 @@ if (Pdo == NULL) return STATUS_SUCCESS; - /* We have here a PDO that does not correspond to a legacy - * serial port. So call the internal AddDevice function. + /* We have here a PDO not null. It represents a real serial + * port. So call the internal AddDevice function. */ return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL, NULL); - - } NTSTATUS STDCALL @@ -160,6 +161,8 @@ DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(ResourceList); + ASSERT(DeviceExtension); ASSERT(DeviceExtension->PnpState == dsStopped); DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -37,6 +37,9 @@ ULONG_PTR Information = 0; NTSTATUS Status; + ASSERT(DeviceObject); + ASSERT(WorkItemData); + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; @@ -285,9 +288,19 @@ Status = PushCircularBufferEntry(&DeviceExtension->OutputBuffer, Buffer[Information]); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); - DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; - break; + if (Status == STATUS_BUFFER_TOO_SMALL) + { + KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); + SerialSendByte(NULL, DeviceExtension, NULL, NULL); + KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); + continue; + } + else + { + DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); + DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; + break; + } } Information++; }

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