Index: base/applications/devmgr/devmgr.c =================================================================== --- base/applications/devmgr/devmgr.c (revision 21221) +++ base/applications/devmgr/devmgr.c (working copy) @@ -97,7 +97,7 @@ SendMessage(hwndListView, WM_SETREDRAW, FALSE, 0); - ListView_DeleteAllItems(hwndListView); + (void)ListView_DeleteAllItems(hwndListView); while (1) { CONFIGRET res; @@ -267,7 +267,7 @@ { CONFIGRET cr; DEVINST root; - ListView_DeleteAllItems(hwndListView); + (void)ListView_DeleteAllItems(hwndListView); cr = CM_Locate_DevNode(&root, NULL, 0); @@ -292,7 +292,7 @@ DWORD i; SP_DEVICE_INTERFACE_DATA DeviceInterfaceData; - ListView_DeleteAllItems(hwndListView); + (void)ListView_DeleteAllItems(hwndListView); DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)Buffer; DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); @@ -585,7 +585,7 @@ hdLayout.prc = &rc; hdLayout.pwpos = &wpos; - Header_Layout(hwndHeader, &hdLayout); + (void)Header_Layout(hwndHeader, &hdLayout); SetWindowPos( hwndHeader, wpos.hwndInsertAfter, @@ -595,7 +595,7 @@ wpos.cy, wpos.flags | SWP_SHOWWINDOW); - ListView_EnsureVisible(hwndListView, 0, FALSE); + (void)ListView_EnsureVisible(hwndListView, 0, FALSE); } } @@ -606,7 +606,7 @@ TCHAR szString[3][20] = {TEXT("#"), TEXT("Name"), TEXT("Intern name")}; //empty the list -ListView_DeleteAllItems(hwndListView); +(void)ListView_DeleteAllItems(hwndListView); //initialize the columns lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; @@ -614,15 +614,15 @@ i=0; lvColumn.cx = 20; lvColumn.pszText = szString[i]; -ListView_InsertColumn(hwndListView, i, &lvColumn); +(void)ListView_InsertColumn(hwndListView, i, &lvColumn); i=1; lvColumn.cx = 400; lvColumn.pszText = szString[i]; -ListView_InsertColumn(hwndListView, i, &lvColumn); +(void)ListView_InsertColumn(hwndListView, i, &lvColumn); i=2; lvColumn.cx = 150; lvColumn.pszText = szString[i]; -ListView_InsertColumn(hwndListView, i, &lvColumn); +(void)ListView_InsertColumn(hwndListView, i, &lvColumn); return TRUE; Index: base/applications/msconfig/msconfig.c =================================================================== --- base/applications/msconfig/msconfig.c (revision 21221) +++ base/applications/msconfig/msconfig.c (working copy) @@ -28,37 +28,37 @@ memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 0, &item); + (void)TabCtrl_InsertItem(hTabWnd, 0, &item); LoadString(hInst, IDS_TAB_SYSTEM, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 1, &item); + (void)TabCtrl_InsertItem(hTabWnd, 1, &item); LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 2, &item); + (void)TabCtrl_InsertItem(hTabWnd, 2, &item); LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 3, &item); + (void)TabCtrl_InsertItem(hTabWnd, 3, &item); LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 4, &item); + (void)TabCtrl_InsertItem(hTabWnd, 4, &item); LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 5, &item); + (void)TabCtrl_InsertItem(hTabWnd, 5, &item); MsConfig_OnTabWndSelChange(); Index: base/applications/msconfig/srvpage.c =================================================================== --- base/applications/msconfig/srvpage.c (revision 21221) +++ base/applications/msconfig/srvpage.c (working copy) @@ -31,25 +31,25 @@ LoadString(hInst, IDS_SERVICES_COLUMN_SERVICE, szTemp, 256); column.pszText = szTemp; column.cx = 200; - ListView_InsertColumn(hServicesListCtrl, 0, &column); + (void)ListView_InsertColumn(hServicesListCtrl, 0, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_SERVICES_COLUMN_REQ, szTemp, 256); column.pszText = szTemp; column.cx = 70; - ListView_InsertColumn(hServicesListCtrl, 1, &column); + (void)ListView_InsertColumn(hServicesListCtrl, 1, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_SERVICES_COLUMN_VENDOR, szTemp, 256); column.pszText = szTemp; column.cx = 200; - ListView_InsertColumn(hServicesListCtrl, 2, &column); + (void)ListView_InsertColumn(hServicesListCtrl, 2, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 70; - ListView_InsertColumn(hServicesListCtrl, 3, &column); + (void)ListView_InsertColumn(hServicesListCtrl, 3, &column); GetServices(); return TRUE; Index: base/applications/msconfig/startuppage.c =================================================================== --- base/applications/msconfig/startuppage.c (revision 21221) +++ base/applications/msconfig/startuppage.c (working copy) @@ -31,19 +31,19 @@ LoadString(hInst, IDS_STARTUP_COLUMN_ELEMENT, szTemp, 256); column.pszText = szTemp; column.cx = 150; - ListView_InsertColumn(hStartupListCtrl, 0, &column); + (void)ListView_InsertColumn(hStartupListCtrl, 0, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_STARTUP_COLUMN_CMD, szTemp, 256); column.pszText = szTemp; column.cx = 150; - ListView_InsertColumn(hStartupListCtrl, 1, &column); + (void)ListView_InsertColumn(hStartupListCtrl, 1, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_STARTUP_COLUMN_PATH, szTemp, 256); column.pszText = szTemp; column.cx = 250; - ListView_InsertColumn(hStartupListCtrl, 2, &column); + (void)ListView_InsertColumn(hStartupListCtrl, 2, &column); GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); @@ -87,7 +87,7 @@ item.pszText = lpValueName; item.iItem = ListView_GetItemCount(hStartupListCtrl); item.lParam = 0; - ListView_InsertItem(hStartupListCtrl, &item); + (void)ListView_InsertItem(hStartupListCtrl, &item); if (dwType == REG_SZ) { Index: base/applications/msconfig/toolspage.c =================================================================== --- base/applications/msconfig/toolspage.c (revision 21221) +++ base/applications/msconfig/toolspage.c (working copy) @@ -21,7 +21,7 @@ item.pszText = szTemp; item.iItem = ListView_GetItemCount(hToolsListCtrl); item.lParam = 0; - ListView_InsertItem(hToolsListCtrl, &item); + (void)ListView_InsertItem(hToolsListCtrl, &item); ListItems_Cmds[item.iItem] = cmd_id; ListItems_Params[item.iItem] = param_id; @@ -67,13 +67,13 @@ LoadString(hInst, IDS_TOOLS_COLUMN_NAME, szTemp, 256); column.pszText = szTemp; column.cx = 150; - ListView_InsertColumn(hToolsListCtrl, 0, &column); + (void)ListView_InsertColumn(hToolsListCtrl, 0, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; LoadString(hInst, IDS_TOOLS_COLUMN_DESCR, szTemp, 256); column.pszText = szTemp; column.cx = 500; - ListView_InsertColumn(hToolsListCtrl, 1, &column); + (void)ListView_InsertColumn(hToolsListCtrl, 1, &column); FillListView(); return TRUE; Index: base/applications/network/netstat/netstat.c =================================================================== --- base/applications/network/netstat/netstat.c (revision 21221) +++ base/applications/network/netstat/netstat.c (working copy) @@ -130,7 +130,7 @@ Usage(); return EXIT_FAILURE; } - (--argv)[i]; /* move pointer back down to previous argv */ + --i; /* move pointer back down to previous argv */ break; case 'r' : bDoShowRouteTable = TRUE; Index: base/applications/regedit/childwnd.c =================================================================== --- base/applications/regedit/childwnd.c (revision 21221) +++ base/applications/regedit/childwnd.c (working copy) @@ -112,14 +112,14 @@ /* TODO */ break; case ID_TREE_EXPANDBRANCH: - TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND); + (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND); break; case ID_TREE_COLLAPSEBRANCH: - TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE); + (void)TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE); break; case ID_TREE_RENAME: SetFocus(pChildWnd->hTreeWnd); - TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + (void)TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); break; case ID_TREE_DELETE: hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); @@ -528,17 +528,17 @@ hti.pt.x = pt.x; hti.pt.y = pt.y; ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); - TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); if ((hti.flags & TVHT_ONITEM) != 0) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); - TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); + (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); memset(&item, 0, sizeof(item)); item.mask = TVIF_STATE | TVIF_CHILDREN; item.hItem = hti.hItem; - TreeView_GetItem(pChildWnd->hTreeWnd, &item); + (void)TreeView_GetItem(pChildWnd->hTreeWnd, &item); /* Set the Expand/Collapse menu item appropriately */ LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); Index: base/applications/regedit/framewnd.c =================================================================== --- base/applications/regedit/framewnd.c (revision 21221) +++ base/applications/regedit/framewnd.c (working copy) @@ -633,7 +633,7 @@ lvfi.psz = szNewValue; iIndex = ListView_FindItem(g_pChildWnd->hListWnd, -1, &lvfi); if (iIndex >= 0) - ListView_EditLabel(g_pChildWnd->hListWnd, iIndex); + (void)ListView_EditLabel(g_pChildWnd->hListWnd, iIndex); return TRUE; } @@ -886,7 +886,7 @@ item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); if(item > -1) { - ListView_EditLabel(g_pChildWnd->hListWnd, item); + (void)ListView_EditLabel(g_pChildWnd->hListWnd, item); } } break; Index: base/applications/regedit/listview.c =================================================================== --- base/applications/regedit/listview.c (revision 21221) +++ base/applications/regedit/listview.c (working copy) @@ -281,7 +281,7 @@ } /* Associate the image list with the tree view control. */ - ListView_SetImageList(hwndLV, himl, LVSIL_SMALL); + (void)ListView_SetImageList(hwndLV, himl, LVSIL_SMALL); return TRUE; } @@ -386,7 +386,7 @@ g_invertSort = FALSE; } - ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd); + (void)ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd); return TRUE; case NM_DBLCLK: case NM_RETURN: @@ -500,7 +500,7 @@ for (i = 0; i < count; i++) { item.mask = LVIF_PARAM; item.iItem = i; - ListView_GetItem(hwndLV, &item); + (void)ListView_GetItem(hwndLV, &item); free(((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); } @@ -521,19 +521,19 @@ if (!hwndLV) return FALSE; - ListView_EditLabel(hwndLV, -1); + (void)ListView_EditLabel(hwndLV, -1); SendMessage(hwndLV, WM_SETREDRAW, FALSE, 0); count = ListView_GetItemCount(hwndLV); for (i = 0; i < count; i++) { item.mask = LVIF_PARAM; item.iItem = i; - ListView_GetItem(hwndLV, &item); + (void)ListView_GetItem(hwndLV, &item); free(((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); } g_columnToSort = ~0UL; - ListView_DeleteAllItems(hwndLV); + (void)ListView_DeleteAllItems(hwndLV); if(!hKey) return FALSE; @@ -575,7 +575,7 @@ { AddEntryToList(hwndLV, _T(""), REG_SZ, NULL, 0, 0, FALSE); } - ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); + (void)ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV); RegCloseKey(hNewKey); SendMessage(hwndLV, WM_SETREDRAW, TRUE, 0); Index: base/applications/regedit/treeview.c =================================================================== --- base/applications/regedit/treeview.c (revision 21221) +++ base/applications/regedit/treeview.c (working copy) @@ -262,7 +262,7 @@ while (childItem) { HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - TreeView_DeleteItem(hwndTV, childItem); + (void)TreeView_DeleteItem(hwndTV, childItem); } childItem = nextItem; } @@ -296,7 +296,7 @@ SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */ - TreeView_SelectItem(hwndTV, hSelectedItem); + (void)TreeView_SelectItem(hwndTV, hSelectedItem); return TRUE; } @@ -334,7 +334,7 @@ return FALSE; } - TreeView_Expand(hwndTV, hItem, TVE_EXPAND); + (void)TreeView_Expand(hwndTV, hItem, TVE_EXPAND); if (!hNewItem) { for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) @@ -347,7 +347,7 @@ if (lstrcmp(name, item.pszText) == 0) break; } } - if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); + if (hNewItem) (void)TreeView_SelectItem(hwndTV, hNewItem); return hNewItem; } @@ -395,8 +395,8 @@ } /* expand and select host name */ - TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); - TreeView_Select(hwndTV, hRoot, TVGN_CARET); + (void)TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); + (void)TreeView_Select(hwndTV, hRoot, TVGN_CARET); return TRUE; } @@ -434,7 +434,7 @@ } /* Associate the image list with the tree view control. */ - TreeView_SetImageList(hwndTV, himl, TVSIL_NORMAL); + (void)TreeView_SetImageList(hwndTV, himl, TVSIL_NORMAL); return TRUE; } @@ -541,7 +541,7 @@ goto done; /* The new key's name is probably not appropriate yet */ - TreeView_EditLabel(hwndTV, hNewItem); + (void)TreeView_EditLabel(hwndTV, hNewItem); bSuccess = TRUE; @@ -630,7 +630,7 @@ tvi.pszText = szBuffer; tvi.cchTextMax = sizeof(szBuffer) / sizeof(szBuffer[0]); - TreeView_GetItem(hwndTV, &tvi); + (void)TreeView_GetItem(hwndTV, &tvi); if (!_tcscmp(szBuffer, szPathPart)) break; @@ -649,8 +649,8 @@ hItem = hChildItem; } - TreeView_SelectItem(hwndTV, hItem); - TreeView_EnsureVisible(hwndTV, hItem); + (void)TreeView_SelectItem(hwndTV, hItem); + (void)TreeView_EnsureVisible(hwndTV, hItem); return TRUE; } Index: base/applications/servman/delete.c =================================================================== --- base/applications/servman/delete.c (revision 21221) +++ base/applications/servman/delete.c (working copy) @@ -93,7 +93,7 @@ { case IDOK: if (DoDeleteService(hDlg)) - ListView_DeleteItem(hListView, GetSelectedItem()); + (void)ListView_DeleteItem(hListView, GetSelectedItem()); DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); Index: base/applications/servman/query.c =================================================================== --- base/applications/servman/query.c (revision 21221) +++ base/applications/servman/query.c (working copy) @@ -230,8 +230,8 @@ ImageList_AddIcon(hLarge, hLgIconItem); /* assign the image to the list view */ - ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); - ListView_SetImageList(hListView, hLarge, LVSIL_NORMAL); + (void)ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); + (void)ListView_SetImageList(hListView, hLarge, LVSIL_NORMAL); } @@ -247,7 +247,7 @@ DWORD Index; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - ListView_DeleteAllItems(hListView); + (void)ListView_DeleteAllItems(hListView); InitListViewImage(); Index: base/applications/servman/servman.c =================================================================== --- base/applications/servman/servman.c (revision 21221) +++ base/applications/servman/servman.c (working copy) @@ -220,7 +220,7 @@ if (hListView == NULL) MessageBox(hwnd, _T("Could not create List View."), _T("Error"), MB_OK | MB_ICONERROR); - ListView_SetExtendedListViewStyle(hListView, LVS_EX_FULLROWSELECT | + (void)ListView_SetExtendedListViewStyle(hListView, LVS_EX_FULLROWSELECT | /*LVS_EX_GRIDLINES |*/ LVS_EX_HEADERDRAGDROP); lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; @@ -234,7 +234,7 @@ LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(hListView, 0, &lvc); + (void)ListView_InsertColumn(hListView, 0, &lvc); /* description */ lvc.iSubItem = 1; @@ -242,7 +242,7 @@ LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(hListView, 1, &lvc); + (void)ListView_InsertColumn(hListView, 1, &lvc); /* status */ lvc.iSubItem = 2; @@ -250,7 +250,7 @@ LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(hListView, 2, &lvc); + (void)ListView_InsertColumn(hListView, 2, &lvc); /* startup type */ lvc.iSubItem = 3; @@ -258,7 +258,7 @@ LoadString(hInstance, IDS_FOURTHCOLUMN, szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(hListView, 3, &lvc); + (void)ListView_InsertColumn(hListView, 3, &lvc); /* logon as */ lvc.iSubItem = 4; @@ -266,7 +266,7 @@ LoadString(hInstance, IDS_FITHCOLUMN, szTemp, sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; - ListView_InsertColumn(hListView, 4, &lvc); + (void)ListView_InsertColumn(hListView, 4, &lvc); Index: base/applications/taskmgr/affinity.c =================================================================== --- base/applications/taskmgr/affinity.c (revision 21221) +++ base/applications/taskmgr/affinity.c (working copy) @@ -41,7 +41,7 @@ lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; } Index: base/applications/taskmgr/applpage.c =================================================================== --- base/applications/taskmgr/applpage.c (revision 21221) +++ base/applications/taskmgr/applpage.c (working copy) @@ -92,15 +92,15 @@ LoadString(hInst, IDS_TAB_TASK, szTemp, 256); column.pszText = szTemp; column.cx = 250; - ListView_InsertColumn(hApplicationPageListCtrl, 0, &column); /* Add the "Task" column */ + (void)ListView_InsertColumn(hApplicationPageListCtrl, 0, &column); /* Add the "Task" column */ column.mask = LVCF_TEXT|LVCF_WIDTH; LoadString(hInst, IDS_TAB_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 95; - ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ + (void)ListView_InsertColumn(hApplicationPageListCtrl, 1, &column); /* Add the "Status" column */ - ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_SMALL); - ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_NORMAL); + (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(16, 16, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_SMALL); + (void)ListView_SetImageList(hApplicationPageListCtrl, ImageList_Create(32, 32, ILC_COLOR8|ILC_MASK, 0, 1), LVSIL_NORMAL); UpdateApplicationListControlViewSetting(); @@ -326,7 +326,7 @@ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_IMAGE|LVIF_PARAM; item.iItem = i; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI->hWnd == hWnd) @@ -354,7 +354,7 @@ ImageList_ReplaceIcon(hImageListSmall, item.iItem, hIcon); /* Update the list view */ - ListView_RedrawItems(hApplicationPageListCtrl, 0, ListView_GetItemCount(hApplicationPageListCtrl)); + (void)ListView_RedrawItems(hApplicationPageListCtrl, 0, ListView_GetItemCount(hApplicationPageListCtrl)); /* UpdateWindow(hApplicationPageListCtrl); */ InvalidateRect(hApplicationPageListCtrl, NULL, 0); } @@ -377,7 +377,7 @@ item.pszText = LPSTR_TEXTCALLBACK; item.iItem = ListView_GetItemCount(hApplicationPageListCtrl); item.lParam = (LPARAM)pAPLI; - ListView_InsertItem(hApplicationPageListCtrl, &item); + (void)ListView_InsertItem(hApplicationPageListCtrl, &item); } @@ -387,7 +387,7 @@ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_IMAGE|LVIF_PARAM; item.iItem = i; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (!IsWindow(pAPLI->hWnd)|| @@ -400,7 +400,7 @@ ImageList_Remove(hImageListLarge, item.iItem); ImageList_Remove(hImageListSmall, item.iItem); - ListView_DeleteItem(hApplicationPageListCtrl, item.iItem); + (void)ListView_DeleteItem(hApplicationPageListCtrl, item.iItem); HeapFree(GetProcessHeap(), 0, pAPLI); bItemRemoved = TRUE; } @@ -419,7 +419,7 @@ item.mask = LVIF_IMAGE; item.iItem = i; item.iImage = i; - ListView_SetItem(hApplicationPageListCtrl, &item); + (void)ListView_SetItem(hApplicationPageListCtrl, &item); } } @@ -569,7 +569,7 @@ case HDN_ITEMCLICK: - ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, 0); + (void)ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, 0); bSortAscending = !bSortAscending; break; @@ -711,7 +711,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -742,7 +742,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -768,7 +768,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -789,7 +789,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -815,7 +815,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -839,7 +839,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; break; @@ -863,7 +863,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; @@ -900,7 +900,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; if (pAPLI) { @@ -922,7 +922,7 @@ item.mask = LVIF_STATE|LVIF_PARAM; item.iItem = i; item.stateMask = (UINT)-1; - ListView_GetItem(hApplicationPageListCtrl, &item); + (void)ListView_GetItem(hApplicationPageListCtrl, &item); if (item.state & LVIS_SELECTED) { pAPLI = (LPAPPLICATION_PAGE_LIST_ITEM)item.lParam; break; @@ -946,9 +946,9 @@ i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); - ListView_EnsureVisible(hProcessPageListCtrl, - i, - FALSE); + (void)ListView_EnsureVisible(hProcessPageListCtrl, + i, + FALSE); } } } Index: base/applications/taskmgr/column.c =================================================================== --- base/applications/taskmgr/column.c (revision 21221) +++ base/applications/taskmgr/column.c (working copy) @@ -444,7 +444,7 @@ { for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--) { - ListView_DeleteColumn(hProcessPageListCtrl, i); + (void)ListView_DeleteColumn(hProcessPageListCtrl, i); } for (i=0; i<25; i++) Index: base/applications/taskmgr/dbgchnl.c =================================================================== --- base/applications/taskmgr/dbgchnl.c (revision 21221) +++ base/applications/taskmgr/dbgchnl.c (working copy) @@ -56,7 +56,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -288,7 +288,7 @@ { HANDLE hProcess; - ListView_DeleteAllItems(hChannelLV); + (void)ListView_DeleteAllItems(hChannelLV); hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ @@ -307,31 +307,31 @@ lvc.fmt = LVCFMT_LEFT; lvc.pszText = _T("Debug Channel"); lvc.cx = 100; - ListView_InsertColumn(hLV, 0, &lvc); + (void)ListView_InsertColumn(hLV, 0, &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Fixme"); lvc.cx = 55; - ListView_InsertColumn(hLV, 1, &lvc); + (void)ListView_InsertColumn(hLV, 1, &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Err"); lvc.cx = 55; - ListView_InsertColumn(hLV, 2, &lvc); + (void)ListView_InsertColumn(hLV, 2, &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Warn"); lvc.cx = 55; - ListView_InsertColumn(hLV, 3, &lvc); + (void)ListView_InsertColumn(hLV, 3, &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; lvc.pszText = _T("Trace"); lvc.cx = 55; - ListView_InsertColumn(hLV, 4, &lvc); + (void)ListView_InsertColumn(hLV, 4, &lvc); DebugChannels_FillList(hLV); } Index: base/applications/taskmgr/debug.c =================================================================== --- base/applications/taskmgr/debug.c (revision 21221) +++ base/applications/taskmgr/debug.c (working copy) @@ -48,7 +48,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; Index: base/applications/taskmgr/endproc.c =================================================================== --- base/applications/taskmgr/endproc.c (revision 21221) +++ base/applications/taskmgr/endproc.c (working copy) @@ -42,7 +42,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -94,7 +94,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; Index: base/applications/taskmgr/priority.c =================================================================== --- base/applications/taskmgr/priority.c (revision 21221) +++ base/applications/taskmgr/priority.c (working copy) @@ -42,7 +42,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -94,7 +94,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -146,7 +146,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -198,7 +198,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -250,7 +250,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; @@ -302,7 +302,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; Index: base/applications/taskmgr/proclist.c =================================================================== --- base/applications/taskmgr/proclist.c (revision 21221) +++ base/applications/taskmgr/proclist.c (working copy) @@ -72,10 +72,10 @@ * subtract it from our clip rect because we don't * use icons in this list control. */ - ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); - ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); + (void)ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS); + (void)ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS); rcClip.bottom = rcItem.bottom; - ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); + (void)ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON); rcClip.left = rcItem.right; /* Index: base/applications/taskmgr/procpage.c =================================================================== --- base/applications/taskmgr/procpage.c (revision 21221) +++ base/applications/taskmgr/procpage.c (working copy) @@ -72,7 +72,7 @@ */ SendMessage(hProcessPageListCtrl, WM_SETFONT, SendMessage(hProcessPage, WM_GETFONT, 0, 0), TRUE); SetWindowText(hProcessPageListCtrl, _T("Processes")); - ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); + (void)ListView_SetExtendedListViewStyle(hProcessPageListCtrl, ListView_GetExtendedListViewStyle(hProcessPageListCtrl) | LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP); AddColumns(); @@ -339,7 +339,7 @@ lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; - ListView_GetItem(hProcessPageListCtrl, &lvitem); + (void)ListView_GetItem(hProcessPageListCtrl, &lvitem); if (lvitem.state & LVIS_SELECTED) break; Index: base/applications/taskmgr/taskmgr.c =================================================================== --- base/applications/taskmgr/taskmgr.c (revision 21221) +++ base/applications/taskmgr/taskmgr.c (working copy) @@ -463,17 +463,17 @@ memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 0, &item); + (void)TabCtrl_InsertItem(hTabWnd, 0, &item); LoadString(hInst, IDS_TAB_PROCESSES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 1, &item); + (void)TabCtrl_InsertItem(hTabWnd, 1, &item); LoadString(hInst, IDS_TAB_PERFORMANCE, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; - TabCtrl_InsertItem(hTabWnd, 2, &item); + (void)TabCtrl_InsertItem(hTabWnd, 2, &item); /* Size everything correctly */ GetClientRect(hWnd, &rc); Index: base/applications/winefile/winefile.c =================================================================== --- base/applications/winefile/winefile.c (revision 21221) +++ base/applications/winefile/winefile.c (working copy) @@ -1670,11 +1670,11 @@ UnhookWindowsHookEx(hcbthook); - ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + (void)ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + (void)ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); - ListBox_SetCurSel(child->left.hwnd, idx); + (void)ListBox_SetCurSel(child->left.hwnd, idx); return child->hwnd; } @@ -1894,12 +1894,12 @@ /* Retrieve file description for language and code page */ if (VerQueryValue(dlg->pVersionData, subblock, (PVOID)&pTxt, &nValLen)) { int idx = ListBox_AddString(hlbox, infoStr); - ListBox_SetItemData(hlbox, idx, pTxt); + (void)ListBox_SetItemData(hlbox, idx, pTxt); } } } - ListBox_SetCurSel(hlbox, 0); + (void)ListBox_SetCurSel(hlbox, 0); PropDlg_DisplayValue(hlbox, GetDlgItem(hwnd,IDC_LIST_PROP_VERSION_VALUES)); } @@ -2038,7 +2038,7 @@ GetWindowRect(hwnd, &g_fullscreen.orgPos); g_fullscreen.wasZoomed = IsZoomed(hwnd); - Frame_CalcFrameClient(hwnd, &rt); + (void)Frame_CalcFrameClient(hwnd, &rt); ClientToScreen(hwnd, (LPPOINT)&rt.left); ClientToScreen(hwnd, (LPPOINT)&rt.right); @@ -2065,7 +2065,7 @@ RECT rt, pos; GetWindowRect(hwnd, &pos); - Frame_CalcFrameClient(hwnd, &rt); + (void)Frame_CalcFrameClient(hwnd, &rt); ClientToScreen(hwnd, (LPPOINT)&rt.left); ClientToScreen(hwnd, (LPPOINT)&rt.right); @@ -2278,13 +2278,13 @@ ChildWnd* child = (ChildWnd*) GetWindowLongPtr(childWnd, GWLP_USERDATA); SetWindowFont(child->left.hwnd, Globals.hfont, TRUE); SetWindowFont(child->right.hwnd, Globals.hfont, TRUE); - ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + (void)ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + (void)ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); InvalidateRect(child->left.hwnd, NULL, TRUE); InvalidateRect(child->right.hwnd, NULL, TRUE); } - SelectFont(hdc, hFontOld); + (void)SelectFont(hdc, hFontOld); } else if (CommDlgExtendedError()) { LoadString(Globals.hInstance, IDS_FONT_SEL_DLG_NAME, dlg_name, BUFFER_LEN); @@ -2504,7 +2504,7 @@ hdl.prc = &rt; hdl.pwpos = ℘ - Header_Layout(child->left.hwndHeader, &hdl); + (void)Header_Layout(child->left.hwndHeader, &hdl); DeferWindowPos(hdwp, child->left.hwndHeader, wp.hwndInsertAfter, wp.x-1, wp.y, child->split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags); @@ -2540,7 +2540,7 @@ hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; - Header_InsertItem(hwnd, idx, &hdi); + (void)Header_InsertItem(hwnd, idx, &hdi); } return hwnd; @@ -2564,7 +2564,7 @@ old_font = SelectFont(hdc, Globals.hfont); GetTextExtentPoint32(hdc, sSpace, 1, &Globals.spaceSize); - SelectFont(hdc, old_font); + (void)SelectFont(hdc, old_font); ReleaseDC(hwnd, hdc); } @@ -2829,7 +2829,7 @@ if (idx != -1) idx++; - ListBox_InsertItemData(pane->hwnd, idx, entry); + (void)ListBox_InsertItemData(pane->hwnd, idx, entry); if (pane->treePane && entry->expanded) idx = insert_entries(pane, entry->down, pattern, filter_flags, idx); @@ -3507,18 +3507,18 @@ for(; x+pane->widths[i]widths[i]; - Header_SetItem(pane->hwndHeader, i, &item); + (void)Header_SetItem(pane->hwndHeader, i, &item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; - Header_SetItem(pane->hwndHeader, i++, &item); + (void)Header_SetItem(pane->hwndHeader, i++, &item); for(; iwidths[i]; x += pane->widths[i]; - Header_SetItem(pane->hwndHeader, i, &item); + (void)Header_SetItem(pane->hwndHeader, i, &item); } } } @@ -3537,7 +3537,7 @@ GetClientRect(pane->hwnd, &clnt); /* move immediate to simulate HDS_FULLDRAG (for now [04/2000] not really needed with WINELIB) */ - Header_SetItem(pane->hwndHeader, idx, phdn->pitem); + (void)Header_SetItem(pane->hwndHeader, idx, phdn->pitem); pane->widths[idx] += dx; @@ -3586,7 +3586,7 @@ item.mask = HDI_WIDTH; item.cxy = pane->widths[phdn->iItem]; - Header_SetItem(pane->hwndHeader, phdn->iItem, &item); + (void)Header_SetItem(pane->hwndHeader, phdn->iItem, &item); InvalidateRect(pane->hwnd, 0, TRUE); break;} } @@ -3610,11 +3610,11 @@ if (res==LB_ERR || !sub || sub->level<=entry->level) break; - ListBox_DeleteString(child->left.hwnd, idx+1); + (void)ListBox_DeleteString(child->left.hwnd, idx+1); } /* empty right pane */ - ListBox_ResetContent(child->right.hwnd); + (void)ListBox_ResetContent(child->right.hwnd); /* release memory */ free_entries(entry); @@ -3704,7 +3704,7 @@ if (res==LB_ERR || !sub || sub->level<=dir->level) break; - ListBox_DeleteString(pane->hwnd, idx+1); + (void)ListBox_DeleteString(pane->hwnd, idx+1); } dir->expanded = FALSE; @@ -3715,7 +3715,7 @@ static void refresh_right_pane(ChildWnd* child) { - ListBox_ResetContent(child->right.hwnd); + (void)ListBox_ResetContent(child->right.hwnd); insert_entries(&child->right, child->right.root, child->filter_pattern, child->filter_flags, -1); calc_widths(&child->right, FALSE); @@ -3783,7 +3783,7 @@ set_curdir(child, entry, 0, child->hwnd); idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); - ListBox_SetCurSel(child->left.hwnd, idx); + (void)ListBox_SetCurSel(child->left.hwnd, idx); } @@ -3951,7 +3951,7 @@ if (!pane->treePane) focus_entry: { int idx = ListBox_FindItemData(child->left.hwnd, ListBox_GetCurSel(child->left.hwnd), entry); - ListBox_SetCurSel(child->left.hwnd, idx); + (void)ListBox_SetCurSel(child->left.hwnd, idx); set_curdir(child, entry, idx, hwnd); } } @@ -4587,7 +4587,7 @@ case WM_SETFOCUS: child->focus_pane = pane==&child->right? 1: 0; - ListBox_SetSel(hwnd, TRUE, 1); + (void)ListBox_SetSel(hwnd, TRUE, 1); /*TODO: check menu items */ break; @@ -4821,7 +4821,7 @@ if (lstrcmp(entry->data.cFileName,fullname)==0 || lstrcmp(entry->data.cAlternateFileName,fullname)==0) { - ListBox_SetCurSel(child->right.hwnd, index); + (void)ListBox_SetCurSel(child->right.hwnd, index); SetFocus(child->right.hwnd); break; } Index: base/setup/usetup/fslist.c =================================================================== --- base/setup/usetup/fslist.c (revision 21221) +++ base/setup/usetup/fslist.c (working copy) @@ -138,7 +138,7 @@ { if ((ULONG) List->CurrentFileSystem < List->FileSystemCount - 1) { - (ULONG) List->CurrentFileSystem++; + List->CurrentFileSystem++; DrawFileSystemList (List); } } @@ -149,7 +149,7 @@ { if ((ULONG) List->CurrentFileSystem > 0) { - (ULONG) List->CurrentFileSystem--; + List->CurrentFileSystem--; DrawFileSystemList (List); } } Index: boot/freeldr/freeldr/arch/i386/portio.c =================================================================== --- boot/freeldr/freeldr/arch/i386/portio.c (revision 21221) +++ boot/freeldr/freeldr/arch/i386/portio.c (working copy) @@ -52,8 +52,9 @@ #endif #undef READ_PORT_BUFFER_UCHAR +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -64,8 +65,9 @@ } #undef READ_PORT_BUFFER_USHORT +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Buffer, ULONG Count) @@ -76,8 +78,9 @@ } #undef READ_PORT_BUFFER_ULONG +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Buffer, ULONG Count) @@ -88,8 +91,9 @@ } #undef READ_PORT_UCHAR +NTHALAPI UCHAR -STDCALL +DDKAPI READ_PORT_UCHAR (PUCHAR Port) { UCHAR Value; @@ -102,8 +106,9 @@ } #undef READ_PORT_USHORT +NTHALAPI USHORT -STDCALL +DDKAPI READ_PORT_USHORT (USHORT* Port) { USHORT Value; @@ -116,8 +121,9 @@ } #undef READ_PORT_ULONG +NTHALAPI ULONG -STDCALL +DDKAPI READ_PORT_ULONG (ULONG* Port) { ULONG Value; @@ -130,8 +136,9 @@ } #undef WRITE_PORT_BUFFER_UCHAR +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -142,8 +149,9 @@ } #undef WRITE_PORT_BUFFER_USHORT +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Buffer, ULONG Count) @@ -154,8 +162,9 @@ } #undef WRITE_PORT_BUFFER_ULONG +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Buffer, ULONG Count) @@ -166,8 +175,9 @@ } #undef WRITE_PORT_UCHAR +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value) { @@ -179,8 +189,9 @@ } #undef WRITE_PORT_USHORT +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_USHORT (USHORT* Port, USHORT Value) { @@ -192,8 +203,9 @@ } #undef WRITE_PORT_ULONG +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_ULONG (ULONG* Port, ULONG Value) { Index: boot/freeldr/freeldr/freeldr_arch.rbuild =================================================================== --- boot/freeldr/freeldr/freeldr_arch.rbuild (revision 21221) +++ boot/freeldr/freeldr/freeldr_arch.rbuild (working copy) @@ -8,7 +8,8 @@ +--> + -ffreestanding -fno-builtin -fno-inline @@ -53,7 +54,8 @@ +--> + -ffreestanding -fno-builtin -fno-inline Index: boot/freeldr/freeldr/freeldr_base.rbuild =================================================================== --- boot/freeldr/freeldr/freeldr_base.rbuild (revision 21221) +++ boot/freeldr/freeldr/freeldr_base.rbuild (working copy) @@ -5,7 +5,8 @@ +--> + -ffreestanding -fno-builtin -fno-inline Index: boot/freeldr/freeldr/freeldr_base64k.rbuild =================================================================== --- boot/freeldr/freeldr/freeldr_base64k.rbuild (revision 21221) +++ boot/freeldr/freeldr/freeldr_base64k.rbuild (working copy) @@ -4,7 +4,8 @@ +--> + -ffreestanding -fno-builtin -fno-inline Index: boot/freeldr/freeldr/freeldr_main.rbuild =================================================================== --- boot/freeldr/freeldr/freeldr_main.rbuild (revision 21221) +++ boot/freeldr/freeldr/freeldr_main.rbuild (working copy) @@ -4,7 +4,8 @@ +--> + -ffreestanding -fno-builtin -fno-inline Index: boot/freeldr/freeldr/include/portio.h =================================================================== --- boot/freeldr/freeldr/include/portio.h (revision 21221) +++ boot/freeldr/freeldr/include/portio.h (working copy) @@ -26,52 +26,64 @@ * Port I/O functions */ +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Value, ULONG Count); +NTHALAPI VOID -STDCALL +DDKAPI READ_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Value, ULONG Count); +NTHALAPI UCHAR -STDCALL +DDKAPI READ_PORT_UCHAR (PUCHAR Port); +NTHALAPI ULONG -STDCALL +DDKAPI READ_PORT_ULONG (ULONG* Port); +NTHALAPI USHORT -STDCALL +DDKAPI READ_PORT_USHORT (USHORT* Port); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Value, ULONG Count); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Value, ULONG Count); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_ULONG (ULONG* Port, ULONG Value); +NTHALAPI VOID -STDCALL +DDKAPI WRITE_PORT_USHORT (USHORT* Port, USHORT Value); Index: dll/cpl/control/control.c =================================================================== --- dll/cpl/control/control.c (revision 21221) +++ dll/cpl/control/control.c (working copy) @@ -175,8 +175,8 @@ hFind = INVALID_HANDLE_VALUE; } - ListView_SetImageList(hLisCtrl,hImgListSmall,LVSIL_SMALL); - ListView_SetImageList(hLisCtrl,hImgListLarge,LVSIL_NORMAL); + (void)ListView_SetImageList(hLisCtrl,hImgListSmall,LVSIL_SMALL); + (void)ListView_SetImageList(hLisCtrl,hImgListLarge,LVSIL_NORMAL); } LRESULT CALLBACK MyWindowProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) @@ -198,14 +198,14 @@ column.cx = (rect.right - rect.left) / 3; column.iSubItem = 0; column.pszText = _T("Name"); - ListView_InsertColumn(hListView,0,&column); + (void)ListView_InsertColumn(hListView,0,&column); column.cx = (rect.right - rect.left) - ((rect.right - rect.left) / 3) - 1; column.iSubItem = 1; column.pszText = _T("Comment"); - ListView_InsertColumn(hListView,1,&column); + (void)ListView_InsertColumn(hListView,1,&column); PopulateCPLList(hListView); - ListView_SetColumnWidth(hListView,2,LVSCW_AUTOSIZE_USEHEADER); - ListView_Update(hListView,0); + (void)ListView_SetColumnWidth(hListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hListView,0); SetFocus(hListView); } @@ -250,7 +250,7 @@ memset(&lvi,0x00,sizeof(lvi)); lvi.iItem = nSelect; lvi.mask = LVIF_PARAM; - ListView_GetItem(hListView,&lvi); + (void)ListView_GetItem(hListView,&lvi); pEntry = (PCPLLISTENTRY)lvi.lParam; CTL_DEBUG((_T("Listview DblClk Entry %08X\r\n"),pEntry)); if (pEntry) Index: dll/cpl/desk/background.c =================================================================== --- dll/cpl/desk/background.c (revision 21221) +++ dll/cpl/desk/background.c (working copy) @@ -72,7 +72,7 @@ dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(g_hBackgroundList, 0, &dummy); + (void)ListView_InsertColumn(g_hBackgroundList, 0, &dummy); /* Add the "None" item */ @@ -93,7 +93,7 @@ listItem.iItem = g_listViewItemCount; listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hBackgroundList, &listItem); + (void)ListView_InsertItem(g_hBackgroundList, &listItem); ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); g_listViewItemCount++; @@ -118,7 +118,7 @@ if(i++ == 0) { g_hShellImageList = himl; - ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); } backgroundItem = &g_backgroundItems[g_listViewItemCount]; @@ -136,7 +136,7 @@ listItem.iItem = g_listViewItemCount; listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hBackgroundList, &listItem); + (void)ListView_InsertItem(g_hBackgroundList, &listItem); ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); g_listViewItemCount++; @@ -185,7 +185,7 @@ if(i++ == 0) { g_hShellImageList = himl; - ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); } backgroundItem = &g_backgroundItems[g_listViewItemCount]; @@ -203,7 +203,7 @@ listItem.iItem = g_listViewItemCount; listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hBackgroundList, &listItem); + (void)ListView_InsertItem(g_hBackgroundList, &listItem); g_listViewItemCount++; } @@ -351,7 +351,7 @@ listItem.iItem = g_listViewItemCount; listItem.lParam = g_listViewItemCount; - ListView_InsertItem(g_hBackgroundList, &listItem); + (void)ListView_InsertItem(g_hBackgroundList, &listItem); g_listViewItemCount++; } Index: dll/cpl/desk/screensaver.c =================================================================== --- dll/cpl/desk/screensaver.c (revision 21221) +++ dll/cpl/desk/screensaver.c (working copy) @@ -172,7 +172,7 @@ dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(g_hScreengroundList, 0, &dummy); + (void)ListView_InsertColumn(g_hScreengroundList, 0, &dummy); /* Add the "None" item */ ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount]; @@ -192,7 +192,7 @@ listItem.iItem = g_ScreenlistViewItemCount; listItem.lParam = g_ScreenlistViewItemCount; - ListView_InsertItem(g_hScreengroundList, &listItem); + (void)ListView_InsertItem(g_hScreengroundList, &listItem); ListView_SetItemState(g_hScreengroundList, g_ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED); g_ScreenlistViewItemCount++; @@ -216,7 +216,7 @@ if(i++ == 0) { g_hScreenShellImageList = himl; - ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); } ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount]; @@ -234,7 +234,7 @@ listItem.iItem = g_ScreenlistViewItemCount; listItem.lParam = g_ScreenlistViewItemCount; - ListView_InsertItem(g_hScreengroundList, &listItem); + (void)ListView_InsertItem(g_hScreengroundList, &listItem); ListView_SetItemState(g_hScreengroundList, g_ScreenlistViewItemCount, LVIS_SELECTED, LVIS_SELECTED); g_ScreenlistViewItemCount++; @@ -276,7 +276,7 @@ if(i++ == 0) { g_hScreenShellImageList = himl; - ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); } ScreenSaverItem = &g_ScreenSaverItems[g_ScreenlistViewItemCount]; @@ -294,7 +294,7 @@ listItem.iItem = g_ScreenlistViewItemCount; listItem.lParam = g_ScreenlistViewItemCount; - ListView_InsertItem(g_hScreengroundList, &listItem); + (void)ListView_InsertItem(g_hScreengroundList, &listItem); g_ScreenlistViewItemCount++; } Index: dll/cpl/sysdm/environment.c =================================================================== --- dll/cpl/sysdm/environment.c (revision 21221) +++ dll/cpl/sysdm/environment.c (working copy) @@ -269,12 +269,12 @@ column.cx = (rect.right - rect.left) / 3; column.iSubItem = 0; column.pszText = _T("Variable"); - ListView_InsertColumn(hwndListView, 0, &column); + (void)ListView_InsertColumn(hwndListView, 0, &column); column.cx = (rect.right - rect.left) - ((rect.right - rect.left) / 3) - 1; column.iSubItem = 1; column.pszText = _T("Value"); - ListView_InsertColumn(hwndListView, 1, &column); + (void)ListView_InsertColumn(hwndListView, 1, &column); } @@ -292,8 +292,8 @@ HKEY_CURRENT_USER, _T("Environment")); - ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - ListView_Update(hwndListView,0); + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); /* Set system environment variables */ @@ -305,8 +305,8 @@ HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); - ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - ListView_Update(hwndListView,0); + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); } @@ -427,7 +427,7 @@ } } - ListView_DeleteItem(hwndListView, iItem); + (void)ListView_DeleteItem(hwndListView, iItem); } } Index: dll/win32/aclui/aclui.c =================================================================== --- dll/win32/aclui/aclui.c (revision 21221) +++ dll/win32/aclui/aclui.c (working copy) @@ -478,13 +478,13 @@ /* don't change the list item state */ li.mask &= ~(LVIF_STATE | LVIF_PARAM); - ListView_SetItem(sp->hWndPrincipalsList, - &li); + (void)ListView_SetItem(sp->hWndPrincipalsList, + &li); /* sort the principals list view again */ - ListView_SortItems(sp->hWndPrincipalsList, - PrincipalCompare, - (LPARAM)sp); + (void)ListView_SortItems(sp->hWndPrincipalsList, + PrincipalCompare, + (LPARAM)sp); } static VOID @@ -1025,9 +1025,9 @@ &rcControl); lvc.mask = LVCF_WIDTH; lvc.cx = rcControl.right; - ListView_SetColumn(sp->hWndPrincipalsList, - 0, - &lvc); + (void)ListView_SetColumn(sp->hWndPrincipalsList, + 0, + &lvc); /* calculate the columns of the allow/deny checkboxes */ SetAceCheckListColumns(sp->hAceCheckList, @@ -1263,9 +1263,9 @@ DWL_USER, (DWORD_PTR)sp); - ListView_SetExtendedListViewStyleEx(sp->hWndPrincipalsList, - LVS_EX_FULLROWSELECT, - LVS_EX_FULLROWSELECT); + (void)ListView_SetExtendedListViewStyleEx(sp->hWndPrincipalsList, + LVS_EX_FULLROWSELECT, + LVS_EX_FULLROWSELECT); sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance, MAKEINTRESOURCE(IDB_USRGRPIMAGES), @@ -1278,9 +1278,9 @@ /* setup the listview control */ if (sp->hiPrincipals != NULL) { - ListView_SetImageList(sp->hWndPrincipalsList, - sp->hiPrincipals, - LVSIL_SMALL); + (void)ListView_SetImageList(sp->hWndPrincipalsList, + sp->hiPrincipals, + LVSIL_SMALL); } GetClientRect(sp->hWndPrincipalsList, @@ -1290,9 +1290,9 @@ lvc.mask = LVCF_FMT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; lvc.cx = rcLvClient.right; - ListView_InsertColumn(sp->hWndPrincipalsList, - 0, - &lvc); + (void)ListView_InsertColumn(sp->hWndPrincipalsList, + 0, + &lvc); ReloadPrincipalsList(sp); Index: dll/win32/avifil32/avifil32.rbuild =================================================================== --- dll/win32/avifil32/avifil32.rbuild (revision 21221) +++ dll/win32/avifil32/avifil32.rbuild (working copy) @@ -1,4 +1,4 @@ - + . Index: dll/win32/crtdll/crtdll.rbuild =================================================================== --- dll/win32/crtdll/crtdll.rbuild (revision 21221) +++ dll/win32/crtdll/crtdll.rbuild (working copy) @@ -11,6 +11,11 @@ + + + "extern __attribute__ ((dllexport))" + crt string kernel32 Index: dll/win32/devmgr/advprop.c =================================================================== --- dll/win32/devmgr/advprop.c (revision 21221) +++ dll/win32/devmgr/advprop.c (working copy) @@ -101,8 +101,8 @@ li.state = (li.iItem == 0 ? LVIS_SELECTED : 0); li.stateMask = LVIS_SELECTED; li.pszText = (LPWSTR)Param1; - ListView_InsertItem(EnumDriverFilesContext->hDriversListView, - &li); + (void)ListView_InsertItem(EnumDriverFilesContext->hDriversListView, + &li); return NO_ERROR; } @@ -144,7 +144,7 @@ EnumDriverFilesContext.hDriversListView = hDriversListView; EnumDriverFilesContext.nCount = 0; - ListView_DeleteAllItems(EnumDriverFilesContext.hDriversListView); + (void)ListView_DeleteAllItems(EnumDriverFilesContext.hDriversListView); DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); if (FindCurrentDriver(DeviceInfoSet, DeviceInfoData, @@ -191,9 +191,9 @@ &rcClient); lvc.mask = LVCF_WIDTH; lvc.cx = rcClient.right; - ListView_SetColumn(hDriversListView, - 0, - &lvc); + (void)ListView_SetColumn(hDriversListView, + 0, + &lvc); } } @@ -260,9 +260,9 @@ lvc.mask = LVCF_FMT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; lvc.cx = 0; - ListView_InsertColumn(hDriversListView, - 0, - &lvc); + (void)ListView_InsertColumn(hDriversListView, + 0, + &lvc); UpdateDriverDetailsDlg(hwndDlg, hDriversListView, Index: dll/win32/devmgr/hwpage.c =================================================================== --- dll/win32/devmgr/hwpage.c (revision 21221) +++ dll/win32/devmgr/hwpage.c (working copy) @@ -75,15 +75,15 @@ int iCol = 0; /* set the list view style */ - ListView_SetExtendedListViewStyle(hpd->hWndDevList, - LVS_EX_FULLROWSELECT); + (void)ListView_SetExtendedListViewStyle(hpd->hWndDevList, + LVS_EX_FULLROWSELECT); /* set the list view image list */ if (hpd->ClassImageListData.ImageList != NULL) { - ListView_SetImageList(hpd->hWndDevList, - hpd->ClassImageListData.ImageList, - LVSIL_SMALL); + (void)ListView_SetImageList(hpd->hWndDevList, + hpd->ClassImageListData.ImageList, + LVSIL_SMALL); } GetClientRect(hpd->hWndDevList, @@ -101,9 +101,9 @@ { lvc.cx = rcClient.right - CX_TYPECOLUMN_WIDTH - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(hpd->hWndDevList, - iCol++, - &lvc); + (void)ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); } if (LoadString(hDllInstance, IDS_TYPE, @@ -111,9 +111,9 @@ sizeof(szColName) / sizeof(szColName[0]))) { lvc.cx = CX_TYPECOLUMN_WIDTH; - ListView_InsertColumn(hpd->hWndDevList, - iCol++, - &lvc); + (void)ListView_InsertColumn(hpd->hWndDevList, + iCol++, + &lvc); } } @@ -459,8 +459,8 @@ li.iItem = iItem; li.iSubItem = 1; - ListView_SetItem(hpd->hWndDevList, - &li); + (void)ListView_SetItem(hpd->hWndDevList, + &li); } } } @@ -517,7 +517,7 @@ } /* clear the devices list view control */ - ListView_DeleteAllItems(hpd->hWndDevList); + (void)ListView_DeleteAllItems(hpd->hWndDevList); /* free the device list */ FreeDevicesList(hpd); Index: dll/win32/iphlpapi/resinfo_reactos.c =================================================================== --- dll/win32/iphlpapi/resinfo_reactos.c (revision 21221) +++ dll/win32/iphlpapi/resinfo_reactos.c (working copy) @@ -53,23 +53,27 @@ PIP_ADDRESS_STRING AddrString; } NAME_SERVER_LIST_PRIVATE, *PNAME_SERVER_LIST_PRIVATE; -PVOID STDCALL +NTSYSAPI +PVOID +NTAPI RtlAllocateHeap ( HANDLE Heap, ULONG Flags, ULONG Size ); +NTSYSAPI BOOLEAN -STDCALL +NTAPI RtlFreeHeap ( HANDLE Heap, ULONG Flags, PVOID Address ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI RtlUnicodeToMultiByteN ( PCHAR MbString, ULONG MbSize, Index: dll/win32/kernel32/include/kernel32.h =================================================================== --- dll/win32/kernel32/include/kernel32.h (revision 21221) +++ dll/win32/kernel32/include/kernel32.h (working copy) @@ -151,9 +151,9 @@ Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString, IN LPCSTR String); -typedef NTSTATUS (STDCALL *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, - IN PCANSI_STRING AnsiString, - IN BOOLEAN AllocateMemory); +typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, + IN PANSI_STRING AnsiString, + IN BOOLEAN AllocateMemory); extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; Index: dll/win32/kernel32/misc/dllmain.c =================================================================== --- dll/win32/kernel32/misc/dllmain.c (revision 21221) +++ dll/win32/kernel32/misc/dllmain.c (working copy) @@ -252,6 +252,8 @@ DPRINT("DllMain(hInst %lx, dwReason %lu)\n", hDll, dwReason); + Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; + /* Cache the PEB and Session ID */ Peb = NtCurrentPeb(); SessionId = Peb->SessionId; Index: dll/win32/kernel32/misc/utils.c =================================================================== --- dll/win32/kernel32/misc/utils.c (revision 21221) +++ dll/win32/kernel32/misc/utils.c (working copy) @@ -15,17 +15,8 @@ /* GLOBALS ******************************************************************/ -/* GCC s^H can't handle static initializers to APIs, so we have to hack this */ -NTSTATUS -NTAPI -RtlAnsiStringToUnicodeString( - PUNICODE_STRING DestinationString, - PCANSI_STRING SourceString, - BOOLEAN AllocateDestinationString -); +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; -PRTL_CONVERT_STRING Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; - /* FUNCTIONS ****************************************************************/ /* Index: dll/win32/msvcrt/msvcrt.rbuild =================================================================== --- dll/win32/msvcrt/msvcrt.rbuild (revision 21221) +++ dll/win32/msvcrt/msvcrt.rbuild (working copy) @@ -14,6 +14,11 @@ + + + "extern __attribute__ ((dllexport))" + crt string kernel32 Index: dll/win32/msvideo/msvfw32.rbuild =================================================================== --- dll/win32/msvideo/msvfw32.rbuild (revision 21221) +++ dll/win32/msvideo/msvfw32.rbuild (working copy) @@ -1,4 +1,4 @@ - + include/reactos/wine Index: dll/win32/setupapi/cfgmgr.c =================================================================== --- dll/win32/setupapi/cfgmgr.c (revision 21221) +++ dll/win32/setupapi/cfgmgr.c (working copy) @@ -1063,7 +1063,7 @@ { PVOID BufferW; ULONG LengthW; - ULONG RegDataType; + ULONG RegDataType = REG_NONE; CONFIGRET ret; TRACE("%lx %lu %p %p %p %lx %lx\n", Index: dll/win32/syssetup/wizard.c =================================================================== --- dll/win32/syssetup/wizard.c (revision 21221) +++ dll/win32/syssetup/wizard.c (working copy) @@ -330,7 +330,7 @@ { *End = L'\0'; } - ListBox_AddString(GetDlgItem(hwndDlg, IDC_PROJECTS), CurrentProject); + (void)ListBox_AddString(GetDlgItem(hwndDlg, IDC_PROJECTS), CurrentProject); if (NULL != End) { CurrentProject = End + 1; Index: dll/win32/user32/windows/defwnd.c =================================================================== --- dll/win32/user32/windows/defwnd.c (revision 21221) +++ dll/win32/user32/windows/defwnd.c (working copy) @@ -53,9 +53,9 @@ if(SysBrushes[0] == NULL) { /* only initialize once */ - NtUserGetSysColors(SysColors, NUM_SYSCOLORS); - NtUserGetSysColorPens(SysPens, NUM_SYSCOLORS); - NtUserGetSysColorBrushes(SysBrushes, NUM_SYSCOLORS); + (void)NtUserGetSysColors(SysColors, NUM_SYSCOLORS); + (void)NtUserGetSysColorPens(SysPens, NUM_SYSCOLORS); + (void)NtUserGetSysColorBrushes(SysBrushes, NUM_SYSCOLORS); } } @@ -130,7 +130,7 @@ if(Ret) { /* FIXME - just change it in the usermode structure, too, instead of asking win32k again */ - NtUserGetSysColors(SysColors, NUM_SYSCOLORS); + (void)NtUserGetSysColors(SysColors, NUM_SYSCOLORS); } } else @@ -528,7 +528,7 @@ } SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); - NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd); if (GetCapture() != hwnd) SetCapture( hwnd ); if (Style & WS_CHILD) @@ -675,7 +675,7 @@ DeleteObject(DesktopRgn); } } - NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); Index: dll/win32/user32/windows/menu.c =================================================================== --- dll/win32/user32/windows/menu.c (revision 21221) +++ dll/win32/user32/windows/menu.c (working copy) @@ -2765,7 +2765,7 @@ { Mt->OwnerWnd = NewWnd; SetCapture(Mt->OwnerWnd); - NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); } Mt->TopMenu = Mt->CurrentMenu = NewMenu; /* all subpopups are hidden */ @@ -3128,7 +3128,7 @@ } SetCapture(Mt.OwnerWnd); - NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); while (! fEndMenu) { @@ -3418,7 +3418,7 @@ } } - NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); + (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); SetCapture(NULL); /* release the capture */ /* If dropdown is still painted and the close box is clicked on Index: drivers/bus/serenum/serenum.h =================================================================== --- drivers/bus/serenum/serenum.h (revision 21221) +++ drivers/bus/serenum/serenum.h (working copy) @@ -27,13 +27,6 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -/* FIXME: I don't know why it is not defined anywhere... */ -NTSTATUS STDCALL -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - typedef enum { dsStopped, Index: drivers/filesystems/np/create.c =================================================================== --- drivers/filesystems/np/create.c (revision 21221) +++ drivers/filesystems/np/create.c (working copy) @@ -61,7 +61,7 @@ IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { - IoSetCancelRoutine(Irp, NULL); + (void)IoSetCancelRoutine(Irp, NULL); IoReleaseCancelSpinLock(oldIrql); return Waiter->Fcb; } @@ -646,7 +646,7 @@ IoAcquireCancelSpinLock(&oldIrql); if (!tmpIrp->Cancel) { - IoSetCancelRoutine(tmpIrp, NULL); + (void)IoSetCancelRoutine(tmpIrp, NULL); Complete = TRUE; } IoReleaseCancelSpinLock(oldIrql); Index: drivers/filesystems/np/fsctrl.c =================================================================== --- drivers/filesystems/np/fsctrl.c (revision 21221) +++ drivers/filesystems/np/fsctrl.c (working copy) @@ -59,7 +59,7 @@ IoAcquireCancelSpinLock(&oldIrql); if (!Irp->Cancel) { - IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); + (void)IoSetCancelRoutine(Irp, NpfsListeningCancelRoutine); IoReleaseCancelSpinLock(oldIrql); KeUnlockMutex(&Fcb->Pipe->FcbListLock); return STATUS_PENDING; Index: drivers/filesystems/np/rw.c =================================================================== --- drivers/filesystems/np/rw.c (revision 21221) +++ drivers/filesystems/np/rw.c (working copy) @@ -274,7 +274,7 @@ } else { - IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); + (void)IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); IoReleaseCancelSpinLock(oldIrql); ThreadContext->WaitObjectArray[ThreadContext->Count] = Context->WaitEvent; ThreadContext->WaitIrpArray[ThreadContext->Count] = Irp; @@ -371,7 +371,7 @@ Status = STATUS_CANCELLED; goto done; } - IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); + (void)IoSetCancelRoutine(Irp, NpfsReadWriteCancelRoutine); IoReleaseCancelSpinLock(oldIrql); ExReleaseFastMutex(&Fcb->DataListLock); IoMarkIrpPending(Irp); Index: drivers/filesystems/ntfs/attrib.c =================================================================== --- drivers/filesystems/ntfs/attrib.c (revision 21221) +++ drivers/filesystems/ntfs/attrib.c (working copy) @@ -170,8 +170,8 @@ PNONRESIDENT_ATTRIBUTE NresAttr; UNICODE_STRING Name; - ULONGLONG lcn; - ULONGLONG runcount; + ULONGLONG lcn = 0; + ULONGLONG runcount = 0; switch (Attribute->AttributeType) { Index: drivers/input/sermouse/sermouse.h =================================================================== --- drivers/input/sermouse/sermouse.h (revision 21221) +++ drivers/input/sermouse/sermouse.h (working copy) @@ -5,13 +5,6 @@ #if defined(__GNUC__) #include - - /* FIXME: these prototypes MUST NOT be here! */ - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); #elif defined(_MSC_VER) NTSTATUS NTAPI IoAttachDeviceToDeviceStackSafe( Index: drivers/network/tcpip/tcpip.rbuild =================================================================== --- drivers/network/tcpip/tcpip.rbuild (revision 21221) +++ drivers/network/tcpip/tcpip.rbuild (working copy) @@ -5,6 +5,7 @@ + ip oskittcp ndis Index: drivers/network/tcpip/tcpip/dispatch.c =================================================================== --- drivers/network/tcpip/tcpip/dispatch.c (revision 21221) +++ drivers/network/tcpip/tcpip/dispatch.c (working copy) @@ -34,7 +34,7 @@ if (!Irp->Cancel) { IoMarkIrpPending(Irp); - IoSetCancelRoutine(Irp, CancelRoutine); + (void)IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql); TI_DbgPrint(DEBUG_IRP, ("Leaving (IRP at 0x%X can now be cancelled).\n", Irp)); @@ -108,7 +108,7 @@ IoAcquireCancelSpinLock(&OldIrql); - IoSetCancelRoutine(Irp, NULL); + (void)IoSetCancelRoutine(Irp, NULL); if (Irp->Cancel || TranContext->CancelIrps) { /* The IRP has been cancelled */ @@ -1485,7 +1485,7 @@ if (Status != STATUS_PENDING) { IoAcquireCancelSpinLock(&OldIrql); - IoSetCancelRoutine(Irp, NULL); + (void)IoSetCancelRoutine(Irp, NULL); IoReleaseCancelSpinLock(OldIrql); } } Index: drivers/network/tcpip/tcpip/irp.c =================================================================== --- drivers/network/tcpip/tcpip/irp.c (revision 21221) +++ drivers/network/tcpip/tcpip/irp.c (working copy) @@ -24,7 +24,7 @@ UntrackFL( __FILE__, __LINE__, Irp ); #endif - IoSetCancelRoutine( Irp, NULL ); + (void)IoSetCancelRoutine( Irp, NULL ); if( Status == STATUS_PENDING ) IoMarkIrpPending( Irp ); Index: drivers/storage/pciidex/pciidex.h =================================================================== --- drivers/storage/pciidex/pciidex.h (revision 21221) +++ drivers/storage/pciidex/pciidex.h (working copy) @@ -4,13 +4,6 @@ #include #include -/* FIXME: I don't know why it is not defined anywhere... */ -NTSTATUS STDCALL -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - typedef struct _PCIIDEX_DRIVER_EXTENSION { PCONTROLLER_PROPERTIES HwGetControllerProperties; Index: drivers/storage/scsiport/scsiport.c =================================================================== --- drivers/storage/scsiport/scsiport.c (revision 21221) +++ drivers/storage/scsiport/scsiport.c (working copy) @@ -2902,18 +2902,18 @@ InterlockedDecrement((PLONG)&DeviceExtension->ActiveIrpCount); if (PrevIrp) { - InterlockedExchangePointer(&PrevIrp->Tail.Overlay.DriverContext[0], - Irp->Tail.Overlay.DriverContext[0]); + (void)InterlockedExchangePointer(&PrevIrp->Tail.Overlay.DriverContext[0], + Irp->Tail.Overlay.DriverContext[0]); } else { - InterlockedExchangePointer(&DeviceExtension->NextIrp, - Irp->Tail.Overlay.DriverContext[0]); + (void)InterlockedExchangePointer(&DeviceExtension->NextIrp, + Irp->Tail.Overlay.DriverContext[0]); } if (LunExtension->NextIrp == Irp) { - InterlockedExchangePointer(&LunExtension->NextIrp, - Irp->Tail.Overlay.DriverContext[1]); + (void)InterlockedExchangePointer(&LunExtension->NextIrp, + Irp->Tail.Overlay.DriverContext[1]); return; } else @@ -2923,8 +2923,8 @@ { if (CurrentIrp->Tail.Overlay.DriverContext[1] == Irp) { - InterlockedExchangePointer(&CurrentIrp->Tail.Overlay.DriverContext[1], - Irp->Tail.Overlay.DriverContext[1]); + (void)InterlockedExchangePointer(&CurrentIrp->Tail.Overlay.DriverContext[1], + Irp->Tail.Overlay.DriverContext[1]); return; } CurrentIrp = CurrentIrp->Tail.Overlay.DriverContext[1]; @@ -2942,9 +2942,9 @@ LunExtension = Irp->Tail.Overlay.DriverContext[2]; Srb = Irp->Tail.Overlay.DriverContext[3]; Irp->Tail.Overlay.DriverContext[0] = (PVOID)DeviceExtension->NextIrp; - InterlockedExchangePointer(&DeviceExtension->NextIrp, Irp); + (void)InterlockedExchangePointer(&DeviceExtension->NextIrp, Irp); Irp->Tail.Overlay.DriverContext[1] = (PVOID)LunExtension->NextIrp; - InterlockedExchangePointer(&LunExtension->NextIrp, Irp); + (void)InterlockedExchangePointer(&LunExtension->NextIrp, Irp); } static VOID Index: drivers/usb/usbhub/usbhub.h =================================================================== --- drivers/usb/usbhub/usbhub.h (revision 21221) +++ drivers/usb/usbhub/usbhub.h (working copy) @@ -8,12 +8,6 @@ #define USB_HUB_TAG TAG('u','s','b','h') -NTSTATUS STDCALL -IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); - typedef struct _HUB_DEVICE_EXTENSION { BOOLEAN IsFDO; Index: drivers/video/videoprt/dispatch.c =================================================================== --- drivers/video/videoprt/dispatch.c (revision 21221) +++ drivers/video/videoprt/dispatch.c (working copy) @@ -24,9 +24,6 @@ /* EXTERNAL FUNCTIONS *********************************************************/ -VOID NTAPI HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); -VOID NTAPI HalReleaseDisplayOwnership(); - /* GLOBAL VARIABLES ***********************************************************/ PVIDEO_PORT_DEVICE_EXTENSION ResetDisplayParametersDeviceExtension = NULL; Index: drivers/video/videoprt/videoprt.h =================================================================== --- drivers/video/videoprt/videoprt.h (revision 21221) +++ drivers/video/videoprt/videoprt.h (working copy) @@ -195,16 +195,6 @@ extern ULONG CsrssInitialized; extern PKPROCESS Csrss; -VP_STATUS NTAPI -VideoPortEnumerateChildren( - IN PVOID HwDeviceExtension, - IN PVOID Reserved); - -PVOID NTAPI -VideoPortGetProcAddress( - IN PVOID HwDeviceExtension, - IN PUCHAR FunctionName); - VOID FASTCALL IntAttachToCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState); @@ -260,9 +250,4 @@ IN PVOID Context, IN OUT PINT10_BIOS_ARGUMENTS BiosArguments); -VP_STATUS NTAPI -VideoPortInt10( - IN PVOID HwDeviceExtension, - IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments); - #endif /* VIDEOPRT_H */ Index: drivers/video/videoprt/videoprt.rbuild =================================================================== --- drivers/video/videoprt/videoprt.rbuild (revision 21221) +++ drivers/video/videoprt/videoprt.rbuild (working copy) @@ -3,9 +3,10 @@ . include + ntoskrnl hal - videoprt.h + videoprt.h agp.c ddc.c dispatch.c Index: hal/halx86/generic/dma.c =================================================================== --- hal/halx86/generic/dma.c (revision 21221) +++ hal/halx86/generic/dma.c (working copy) @@ -97,11 +97,11 @@ (PPUT_DMA_ADAPTER)HalPutDmaAdapter, (PALLOCATE_COMMON_BUFFER)HalAllocateCommonBuffer, (PFREE_COMMON_BUFFER)HalFreeCommonBuffer, - (PALLOCATE_ADAPTER_CHANNEL)IoAllocateAdapterChannel, - (PFLUSH_ADAPTER_BUFFERS)IoFlushAdapterBuffers, - (PFREE_ADAPTER_CHANNEL)IoFreeAdapterChannel, - (PFREE_MAP_REGISTERS)IoFreeMapRegisters, - (PMAP_TRANSFER)IoMapTransfer, + NULL, /* Initialized in HalpInitDma() */ + NULL, /* Initialized in HalpInitDma() */ + NULL, /* Initialized in HalpInitDma() */ + NULL, /* Initialized in HalpInitDma() */ + NULL, /* Initialized in HalpInitDma() */ (PGET_DMA_ALIGNMENT)HalpDmaGetDmaAlignment, (PREAD_DMA_COUNTER)HalReadDmaCounter, /* FIXME: Implement the S/G funtions. */ @@ -122,6 +122,15 @@ HalpInitDma(VOID) { /* + * Initialize the DMA Operation table + */ + HalpDmaOperations.AllocateAdapterChannel = (PALLOCATE_ADAPTER_CHANNEL)IoAllocateAdapterChannel; + HalpDmaOperations.FlushAdapterBuffers = (PFLUSH_ADAPTER_BUFFERS)IoFlushAdapterBuffers; + HalpDmaOperations.FreeAdapterChannel = (PFREE_ADAPTER_CHANNEL)IoFreeAdapterChannel; + HalpDmaOperations.FreeMapRegisters = (PFREE_MAP_REGISTERS)IoFreeMapRegisters; + HalpDmaOperations.MapTransfer = (PMAP_TRANSFER)IoMapTransfer; + + /* * Check if Extended DMA is available. We're just going to do a random * read and write. */ Index: hal/halx86/generic/generic.rbuild =================================================================== --- hal/halx86/generic/generic.rbuild (revision 21221) +++ hal/halx86/generic/generic.rbuild (working copy) @@ -34,7 +34,7 @@ irql.c processor.c resource.c - spinlock.c + spinlock.c ../include Index: hal/halx86/include/haldma.h =================================================================== --- hal/halx86/include/haldma.h (revision 21221) +++ hal/halx86/include/haldma.h (working copy) @@ -1,396 +1,383 @@ -#ifndef HALDMA_H -#define HALDMA_H - -/* - * DMA Page Register Structure - * 080 DMA RESERVED - * 081 DMA Page Register (channel 2) - * 082 DMA Page Register (channel 3) - * 083 DMA Page Register (channel 1) - * 084 DMA RESERVED - * 085 DMA RESERVED - * 086 DMA RESERVED - * 087 DMA Page Register (channel 0) - * 088 DMA RESERVED - * 089 PS/2-DMA Page Register (channel 6) - * 08A PS/2-DMA Page Register (channel 7) - * 08B PS/2-DMA Page Register (channel 5) - * 08C PS/2-DMA RESERVED - * 08D PS/2-DMA RESERVED - * 08E PS/2-DMA RESERVED - * 08F PS/2-DMA Page Register (channel 4) - */ - -typedef struct _DMA_PAGE -{ - UCHAR Reserved1; - UCHAR Channel2; - UCHAR Channel3; - UCHAR Channel1; - UCHAR Reserved2[3]; - UCHAR Channel0; - UCHAR Reserved3; - UCHAR Channel6; - UCHAR Channel7; - UCHAR Channel5; - UCHAR Reserved4[3]; - UCHAR Channel4; -} DMA_PAGE, *PDMA_PAGE; - -/* - * DMA Channel Mask Register Structure - * - * MSB LSB - * x x x x x x x x - * ------------------- - ----- - * | | | 00 - Select channel 0 mask bit - * | | \---- 01 - Select channel 1 mask bit - * | | 10 - Select channel 2 mask bit - * | | 11 - Select channel 3 mask bit - * | | - * | \---------- 0 - Clear mask bit - * | 1 - Set mask bit - * | - * \----------------------- xx - Reserved - */ - -typedef struct _DMA_CHANNEL_MASK -{ - UCHAR Channel: 2; - UCHAR SetMask: 1; - UCHAR Reserved: 5; -} DMA_CHANNEL_MASK, *PDMA_CHANNEL_MASK; - -/* - * DMA Mask Register Structure - * - * MSB LSB - * x x x x x x x x - * \---/ - - ----- ----- - * | | | | | 00 - Channel 0 select - * | | | | \---- 01 - Channel 1 select - * | | | | 10 - Channel 2 select - * | | | | 11 - Channel 3 select - * | | | | - * | | | | 00 - Verify transfer - * | | | \------------ 01 - Write transfer - * | | | 10 - Read transfer - * | | | - * | | \-------------------- 0 - Autoinitialized - * | | 1 - Non-autoinitialized - * | | - * | \------------------------ 0 - Address increment select - * | - * | 00 - Demand mode - * \------------------------------ 01 - Single mode - * 10 - Block mode - * 11 - Cascade mode - */ - -typedef union _DMA_MODE -{ - struct - { - UCHAR Channel: 2; - UCHAR TransferType: 2; - UCHAR AutoInitialize: 1; - UCHAR AddressDecrement: 1; - UCHAR RequestMode: 2; - }; - UCHAR Byte; -} DMA_MODE, *PDMA_MODE; - -/* - * DMA Extended Mode Register Structure - * - * MSB LSB - * x x x x x x x x - * - - ----- ----- ----- - * | | | | | 00 - Channel 0 select - * | | | | \---- 01 - Channel 1 select - * | | | | 10 - Channel 2 select - * | | | | 11 - Channel 3 select - * | | | | - * | | | | 00 - 8-bit I/O, by bytes - * | | | \------------ 01 - 16-bit I/O, by words, address shifted - * | | | 10 - 32-bit I/O, by bytes - * | | | 11 - 16-bit I/O, by bytes - * | | | - * | | \---------------------- 00 - Compatible - * | | 01 - Type A - * | | 10 - Type B - * | | 11 - Burst - * | | - * | \---------------------------- 0 - Terminal Count is Output - * | - * \---------------------------------0 - Disable Stop Register - * 1 - Enable Stop Register - */ - -typedef union _DMA_EXTENDED_MODE -{ - struct - { - UCHAR ChannelNumber: 2; - UCHAR TransferSize: 2; - UCHAR TimingMode: 2; - UCHAR TerminalCountIsOutput: 1; - UCHAR EnableStopRegister: 1; - }; - UCHAR Byte; -} DMA_EXTENDED_MODE, *PDMA_EXTENDED_MODE; - -/* DMA Extended Mode Register Transfer Sizes */ -#define B_8BITS 0 -#define W_16BITS 1 -#define B_32BITS 2 -#define B_16BITS 3 - -/* DMA Extended Mode Register Timing */ -#define COMPATIBLE_TIMING 0 -#define TYPE_A_TIMING 1 -#define TYPE_B_TIMING 2 -#define BURST_TIMING 3 - -/* Channel Stop Registers for each Channel */ -typedef struct _DMA_CHANNEL_STOP -{ - UCHAR ChannelLow; - UCHAR ChannelMid; - UCHAR ChannelHigh; - UCHAR Reserved; -} DMA_CHANNEL_STOP, *PDMA_CHANNEL_STOP; - -/* Transfer Types */ -#define VERIFY_TRANSFER 0x00 -#define READ_TRANSFER 0x01 -#define WRITE_TRANSFER 0x02 - -/* Request Modes */ -#define DEMAND_REQUEST_MODE 0x00 -#define SINGLE_REQUEST_MODE 0x01 -#define BLOCK_REQUEST_MODE 0x02 -#define CASCADE_REQUEST_MODE 0x03 - -#define DMA_SETMASK 4 -#define DMA_CLEARMASK 0 -#define DMA_READ 4 -#define DMA_WRITE 8 -#define DMA_SINGLE_TRANSFER 0x40 -#define DMA_AUTO_INIT 0x10 - -typedef struct _DMA1_ADDRESS_COUNT -{ - UCHAR DmaBaseAddress; - UCHAR DmaBaseCount; -} DMA1_ADDRESS_COUNT, *PDMA1_ADDRESS_COUNT; - -typedef struct _DMA2_ADDRESS_COUNT -{ - UCHAR DmaBaseAddress; - UCHAR Reserved1; - UCHAR DmaBaseCount; - UCHAR Reserved2; -} DMA2_ADDRESS_COUNT, *PDMA2_ADDRESS_COUNT; - -typedef struct _DMA1_CONTROL -{ - DMA1_ADDRESS_COUNT DmaAddressCount[4]; - UCHAR DmaStatus; - UCHAR DmaRequest; - UCHAR SingleMask; - UCHAR Mode; - UCHAR ClearBytePointer; - UCHAR MasterClear; - UCHAR ClearMask; - UCHAR AllMask; -} DMA1_CONTROL, *PDMA1_CONTROL; - -typedef struct _DMA2_CONTROL -{ - DMA2_ADDRESS_COUNT DmaAddressCount[4]; - UCHAR DmaStatus; - UCHAR Reserved1; - UCHAR DmaRequest; - UCHAR Reserved2; - UCHAR SingleMask; - UCHAR Reserved3; - UCHAR Mode; - UCHAR Reserved4; - UCHAR ClearBytePointer; - UCHAR Reserved5; - UCHAR MasterClear; - UCHAR Reserved6; - UCHAR ClearMask; - UCHAR Reserved7; - UCHAR AllMask; - UCHAR Reserved8; -} DMA2_CONTROL, *PDMA2_CONTROL; - -/* This structure defines the I/O Map of the 82537 controller. */ -typedef struct _EISA_CONTROL -{ - /* DMA Controller 1 */ - DMA1_CONTROL DmaController1; /* 00h-0Fh */ - UCHAR Reserved1[16]; /* 0Fh-1Fh */ - - /* Interrupt Controller 1 (PIC) */ - UCHAR Pic1Operation; /* 20h */ - UCHAR Pic1Interrupt; /* 21h */ - UCHAR Reserved2[30]; /* 22h-3Fh */ - - /* Timer */ - UCHAR TimerCounter; /* 40h */ - UCHAR TimerMemoryRefresh; /* 41h */ - UCHAR Speaker; /* 42h */ - UCHAR TimerOperation; /* 43h */ - UCHAR TimerMisc; /* 44h */ - UCHAR Reserved3[2]; /* 45-46h */ - UCHAR TimerCounterControl; /* 47h */ - UCHAR TimerFailSafeCounter; /* 48h */ - UCHAR Reserved4; /* 49h */ - UCHAR TimerCounter2; /* 4Ah */ - UCHAR TimerOperation2; /* 4Bh */ - UCHAR Reserved5[20]; /* 4Ch-5Fh */ - - /* NMI / Keyboard / RTC */ - UCHAR Keyboard; /* 60h */ - UCHAR NmiStatus; /* 61h */ - UCHAR Reserved6[14]; /* 62h-6Fh */ - UCHAR NmiEnable; /* 70h */ - UCHAR Reserved7[15]; /* 71h-7Fh */ - - /* DMA Page Registers Controller 1 */ - DMA_PAGE DmaController1Pages; /* 80h-8Fh */ - UCHAR Reserved8[16]; /* 90h-9Fh */ - - /* Interrupt Controller 2 (PIC) */ - UCHAR Pic2Operation; /* 0A0h */ - UCHAR Pic2Interrupt; /* 0A1h */ - UCHAR Reserved9[30]; /* 0A2h-0BFh */ - - /* DMA Controller 2 */ - DMA1_CONTROL DmaController2; /* 0C0h-0CFh */ - - /* System Reserved Ports */ - UCHAR SystemReserved[816]; /* 0D0h-3FFh */ - - /* Extended DMA Registers, Controller 1 */ - UCHAR DmaHighByteCount1[8]; /* 400h-407h */ - UCHAR Reserved10[2]; /* 408h-409h */ - UCHAR DmaChainMode1; /* 40Ah */ - UCHAR DmaExtendedMode1; /* 40Bh */ - UCHAR DmaBufferControl; /* 40Ch */ - UCHAR Reserved11[84]; /* 40Dh-460h */ - UCHAR ExtendedNmiControl; /* 461h */ - UCHAR NmiCommand; /* 462h */ - UCHAR Reserved12; /* 463h */ - UCHAR BusMaster; /* 464h */ - UCHAR Reserved13[27]; /* 465h-47Fh */ - - /* DMA Page Registers Controller 2 */ - DMA_PAGE DmaController2Pages; /* 480h-48Fh */ - UCHAR Reserved14[48]; /* 490h-4BFh */ - - /* Extended DMA Registers, Controller 2 */ - UCHAR DmaHighByteCount2[16]; /* 4C0h-4CFh */ - - /* Edge/Level Control Registers */ - UCHAR Pic1EdgeLevel; /* 4D0h */ - UCHAR Pic2EdgeLevel; /* 4D1h */ - UCHAR Reserved15[2]; /* 4D2h-4D3h */ - - /* Extended DMA Registers, Controller 2 */ - UCHAR DmaChainMode2; /* 4D4h */ - UCHAR Reserved16; /* 4D5h */ - UCHAR DmaExtendedMode2; /* 4D6h */ - UCHAR Reserved17[9]; /* 4D7h-4DFh */ - - /* DMA Stop Registers */ - DMA_CHANNEL_STOP DmaChannelStop[8]; /* 4E0h-4FFh */ -} EISA_CONTROL, *PEISA_CONTROL; - -typedef struct _ROS_MAP_REGISTER_ENTRY -{ - PVOID VirtualAddress; - PHYSICAL_ADDRESS PhysicalAddress; - ULONG Counter; -} ROS_MAP_REGISTER_ENTRY, *PROS_MAP_REGISTER_ENTRY; - -struct _ADAPTER_OBJECT { - /* - * New style DMA object definition. The fact that it is at the beginning - * of the ADAPTER_OBJECT structure allows us to easily implement the - * fallback implementation of IoGetDmaAdapter. - */ - DMA_ADAPTER DmaHeader; - - /* - * For normal adapter objects pointer to master adapter that takes care - * of channel allocation. For master adapter set to NULL. - */ - struct _ADAPTER_OBJECT *MasterAdapter; - - ULONG MapRegistersPerChannel; - PVOID AdapterBaseVa; - PROS_MAP_REGISTER_ENTRY MapRegisterBase; - - ULONG NumberOfMapRegisters; - ULONG CommittedMapRegisters; - - PWAIT_CONTEXT_BLOCK CurrentWcb; - KDEVICE_QUEUE ChannelWaitQueue; - PKDEVICE_QUEUE RegisterWaitQueue; - LIST_ENTRY AdapterQueue; - KSPIN_LOCK SpinLock; - PRTL_BITMAP MapRegisters; - PUCHAR PagePort; - UCHAR ChannelNumber; - UCHAR AdapterNumber; - USHORT DmaPortAddress; - DMA_MODE AdapterMode; - BOOLEAN NeedsMapRegisters; - BOOLEAN MasterDevice; - BOOLEAN Width16Bits; - BOOLEAN ScatterGather; - BOOLEAN IgnoreCount; - BOOLEAN Dma32BitAddresses; - BOOLEAN Dma64BitAddresses; - LIST_ENTRY AdapterList; -} ADAPTER_OBJECT; - -typedef struct _GROW_WORK_ITEM { - WORK_QUEUE_ITEM WorkQueueItem; - PADAPTER_OBJECT AdapterObject; - ULONG NumberOfMapRegisters; -} GROW_WORK_ITEM, *PGROW_WORK_ITEM; - -#define MAP_BASE_SW_SG 1 - -PADAPTER_OBJECT STDCALL -HalpDmaAllocateMasterAdapter(VOID); - -PDMA_ADAPTER STDCALL -HalpGetDmaAdapter( - IN PVOID Context, - IN PDEVICE_DESCRIPTION DeviceDescription, - OUT PULONG NumberOfMapRegisters); - -/* FIXME: I added the definition to winddk.h but gcc wants it -HERE-. WHY?? */ -#ifndef _MSC_VER -NTSTATUS -NTAPI -IoAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context -); -#endif - -ULONG STDCALL -HalpDmaGetDmaAlignment( - PADAPTER_OBJECT AdapterObject); - -#endif /* HALDMA_H */ +#ifndef HALDMA_H +#define HALDMA_H + +/* + * DMA Page Register Structure + * 080 DMA RESERVED + * 081 DMA Page Register (channel 2) + * 082 DMA Page Register (channel 3) + * 083 DMA Page Register (channel 1) + * 084 DMA RESERVED + * 085 DMA RESERVED + * 086 DMA RESERVED + * 087 DMA Page Register (channel 0) + * 088 DMA RESERVED + * 089 PS/2-DMA Page Register (channel 6) + * 08A PS/2-DMA Page Register (channel 7) + * 08B PS/2-DMA Page Register (channel 5) + * 08C PS/2-DMA RESERVED + * 08D PS/2-DMA RESERVED + * 08E PS/2-DMA RESERVED + * 08F PS/2-DMA Page Register (channel 4) + */ + +typedef struct _DMA_PAGE +{ + UCHAR Reserved1; + UCHAR Channel2; + UCHAR Channel3; + UCHAR Channel1; + UCHAR Reserved2[3]; + UCHAR Channel0; + UCHAR Reserved3; + UCHAR Channel6; + UCHAR Channel7; + UCHAR Channel5; + UCHAR Reserved4[3]; + UCHAR Channel4; +} DMA_PAGE, *PDMA_PAGE; + +/* + * DMA Channel Mask Register Structure + * + * MSB LSB + * x x x x x x x x + * ------------------- - ----- + * | | | 00 - Select channel 0 mask bit + * | | \---- 01 - Select channel 1 mask bit + * | | 10 - Select channel 2 mask bit + * | | 11 - Select channel 3 mask bit + * | | + * | \---------- 0 - Clear mask bit + * | 1 - Set mask bit + * | + * \----------------------- xx - Reserved + */ + +typedef struct _DMA_CHANNEL_MASK +{ + UCHAR Channel: 2; + UCHAR SetMask: 1; + UCHAR Reserved: 5; +} DMA_CHANNEL_MASK, *PDMA_CHANNEL_MASK; + +/* + * DMA Mask Register Structure + * + * MSB LSB + * x x x x x x x x + * \---/ - - ----- ----- + * | | | | | 00 - Channel 0 select + * | | | | \---- 01 - Channel 1 select + * | | | | 10 - Channel 2 select + * | | | | 11 - Channel 3 select + * | | | | + * | | | | 00 - Verify transfer + * | | | \------------ 01 - Write transfer + * | | | 10 - Read transfer + * | | | + * | | \-------------------- 0 - Autoinitialized + * | | 1 - Non-autoinitialized + * | | + * | \------------------------ 0 - Address increment select + * | + * | 00 - Demand mode + * \------------------------------ 01 - Single mode + * 10 - Block mode + * 11 - Cascade mode + */ + +typedef union _DMA_MODE +{ + struct + { + UCHAR Channel: 2; + UCHAR TransferType: 2; + UCHAR AutoInitialize: 1; + UCHAR AddressDecrement: 1; + UCHAR RequestMode: 2; + }; + UCHAR Byte; +} DMA_MODE, *PDMA_MODE; + +/* + * DMA Extended Mode Register Structure + * + * MSB LSB + * x x x x x x x x + * - - ----- ----- ----- + * | | | | | 00 - Channel 0 select + * | | | | \---- 01 - Channel 1 select + * | | | | 10 - Channel 2 select + * | | | | 11 - Channel 3 select + * | | | | + * | | | | 00 - 8-bit I/O, by bytes + * | | | \------------ 01 - 16-bit I/O, by words, address shifted + * | | | 10 - 32-bit I/O, by bytes + * | | | 11 - 16-bit I/O, by bytes + * | | | + * | | \---------------------- 00 - Compatible + * | | 01 - Type A + * | | 10 - Type B + * | | 11 - Burst + * | | + * | \---------------------------- 0 - Terminal Count is Output + * | + * \---------------------------------0 - Disable Stop Register + * 1 - Enable Stop Register + */ + +typedef union _DMA_EXTENDED_MODE +{ + struct + { + UCHAR ChannelNumber: 2; + UCHAR TransferSize: 2; + UCHAR TimingMode: 2; + UCHAR TerminalCountIsOutput: 1; + UCHAR EnableStopRegister: 1; + }; + UCHAR Byte; +} DMA_EXTENDED_MODE, *PDMA_EXTENDED_MODE; + +/* DMA Extended Mode Register Transfer Sizes */ +#define B_8BITS 0 +#define W_16BITS 1 +#define B_32BITS 2 +#define B_16BITS 3 + +/* DMA Extended Mode Register Timing */ +#define COMPATIBLE_TIMING 0 +#define TYPE_A_TIMING 1 +#define TYPE_B_TIMING 2 +#define BURST_TIMING 3 + +/* Channel Stop Registers for each Channel */ +typedef struct _DMA_CHANNEL_STOP +{ + UCHAR ChannelLow; + UCHAR ChannelMid; + UCHAR ChannelHigh; + UCHAR Reserved; +} DMA_CHANNEL_STOP, *PDMA_CHANNEL_STOP; + +/* Transfer Types */ +#define VERIFY_TRANSFER 0x00 +#define READ_TRANSFER 0x01 +#define WRITE_TRANSFER 0x02 + +/* Request Modes */ +#define DEMAND_REQUEST_MODE 0x00 +#define SINGLE_REQUEST_MODE 0x01 +#define BLOCK_REQUEST_MODE 0x02 +#define CASCADE_REQUEST_MODE 0x03 + +#define DMA_SETMASK 4 +#define DMA_CLEARMASK 0 +#define DMA_READ 4 +#define DMA_WRITE 8 +#define DMA_SINGLE_TRANSFER 0x40 +#define DMA_AUTO_INIT 0x10 + +typedef struct _DMA1_ADDRESS_COUNT +{ + UCHAR DmaBaseAddress; + UCHAR DmaBaseCount; +} DMA1_ADDRESS_COUNT, *PDMA1_ADDRESS_COUNT; + +typedef struct _DMA2_ADDRESS_COUNT +{ + UCHAR DmaBaseAddress; + UCHAR Reserved1; + UCHAR DmaBaseCount; + UCHAR Reserved2; +} DMA2_ADDRESS_COUNT, *PDMA2_ADDRESS_COUNT; + +typedef struct _DMA1_CONTROL +{ + DMA1_ADDRESS_COUNT DmaAddressCount[4]; + UCHAR DmaStatus; + UCHAR DmaRequest; + UCHAR SingleMask; + UCHAR Mode; + UCHAR ClearBytePointer; + UCHAR MasterClear; + UCHAR ClearMask; + UCHAR AllMask; +} DMA1_CONTROL, *PDMA1_CONTROL; + +typedef struct _DMA2_CONTROL +{ + DMA2_ADDRESS_COUNT DmaAddressCount[4]; + UCHAR DmaStatus; + UCHAR Reserved1; + UCHAR DmaRequest; + UCHAR Reserved2; + UCHAR SingleMask; + UCHAR Reserved3; + UCHAR Mode; + UCHAR Reserved4; + UCHAR ClearBytePointer; + UCHAR Reserved5; + UCHAR MasterClear; + UCHAR Reserved6; + UCHAR ClearMask; + UCHAR Reserved7; + UCHAR AllMask; + UCHAR Reserved8; +} DMA2_CONTROL, *PDMA2_CONTROL; + +/* This structure defines the I/O Map of the 82537 controller. */ +typedef struct _EISA_CONTROL +{ + /* DMA Controller 1 */ + DMA1_CONTROL DmaController1; /* 00h-0Fh */ + UCHAR Reserved1[16]; /* 0Fh-1Fh */ + + /* Interrupt Controller 1 (PIC) */ + UCHAR Pic1Operation; /* 20h */ + UCHAR Pic1Interrupt; /* 21h */ + UCHAR Reserved2[30]; /* 22h-3Fh */ + + /* Timer */ + UCHAR TimerCounter; /* 40h */ + UCHAR TimerMemoryRefresh; /* 41h */ + UCHAR Speaker; /* 42h */ + UCHAR TimerOperation; /* 43h */ + UCHAR TimerMisc; /* 44h */ + UCHAR Reserved3[2]; /* 45-46h */ + UCHAR TimerCounterControl; /* 47h */ + UCHAR TimerFailSafeCounter; /* 48h */ + UCHAR Reserved4; /* 49h */ + UCHAR TimerCounter2; /* 4Ah */ + UCHAR TimerOperation2; /* 4Bh */ + UCHAR Reserved5[20]; /* 4Ch-5Fh */ + + /* NMI / Keyboard / RTC */ + UCHAR Keyboard; /* 60h */ + UCHAR NmiStatus; /* 61h */ + UCHAR Reserved6[14]; /* 62h-6Fh */ + UCHAR NmiEnable; /* 70h */ + UCHAR Reserved7[15]; /* 71h-7Fh */ + + /* DMA Page Registers Controller 1 */ + DMA_PAGE DmaController1Pages; /* 80h-8Fh */ + UCHAR Reserved8[16]; /* 90h-9Fh */ + + /* Interrupt Controller 2 (PIC) */ + UCHAR Pic2Operation; /* 0A0h */ + UCHAR Pic2Interrupt; /* 0A1h */ + UCHAR Reserved9[30]; /* 0A2h-0BFh */ + + /* DMA Controller 2 */ + DMA1_CONTROL DmaController2; /* 0C0h-0CFh */ + + /* System Reserved Ports */ + UCHAR SystemReserved[816]; /* 0D0h-3FFh */ + + /* Extended DMA Registers, Controller 1 */ + UCHAR DmaHighByteCount1[8]; /* 400h-407h */ + UCHAR Reserved10[2]; /* 408h-409h */ + UCHAR DmaChainMode1; /* 40Ah */ + UCHAR DmaExtendedMode1; /* 40Bh */ + UCHAR DmaBufferControl; /* 40Ch */ + UCHAR Reserved11[84]; /* 40Dh-460h */ + UCHAR ExtendedNmiControl; /* 461h */ + UCHAR NmiCommand; /* 462h */ + UCHAR Reserved12; /* 463h */ + UCHAR BusMaster; /* 464h */ + UCHAR Reserved13[27]; /* 465h-47Fh */ + + /* DMA Page Registers Controller 2 */ + DMA_PAGE DmaController2Pages; /* 480h-48Fh */ + UCHAR Reserved14[48]; /* 490h-4BFh */ + + /* Extended DMA Registers, Controller 2 */ + UCHAR DmaHighByteCount2[16]; /* 4C0h-4CFh */ + + /* Edge/Level Control Registers */ + UCHAR Pic1EdgeLevel; /* 4D0h */ + UCHAR Pic2EdgeLevel; /* 4D1h */ + UCHAR Reserved15[2]; /* 4D2h-4D3h */ + + /* Extended DMA Registers, Controller 2 */ + UCHAR DmaChainMode2; /* 4D4h */ + UCHAR Reserved16; /* 4D5h */ + UCHAR DmaExtendedMode2; /* 4D6h */ + UCHAR Reserved17[9]; /* 4D7h-4DFh */ + + /* DMA Stop Registers */ + DMA_CHANNEL_STOP DmaChannelStop[8]; /* 4E0h-4FFh */ +} EISA_CONTROL, *PEISA_CONTROL; + +typedef struct _ROS_MAP_REGISTER_ENTRY +{ + PVOID VirtualAddress; + PHYSICAL_ADDRESS PhysicalAddress; + ULONG Counter; +} ROS_MAP_REGISTER_ENTRY, *PROS_MAP_REGISTER_ENTRY; + +struct _ADAPTER_OBJECT { + /* + * New style DMA object definition. The fact that it is at the beginning + * of the ADAPTER_OBJECT structure allows us to easily implement the + * fallback implementation of IoGetDmaAdapter. + */ + DMA_ADAPTER DmaHeader; + + /* + * For normal adapter objects pointer to master adapter that takes care + * of channel allocation. For master adapter set to NULL. + */ + struct _ADAPTER_OBJECT *MasterAdapter; + + ULONG MapRegistersPerChannel; + PVOID AdapterBaseVa; + PROS_MAP_REGISTER_ENTRY MapRegisterBase; + + ULONG NumberOfMapRegisters; + ULONG CommittedMapRegisters; + + PWAIT_CONTEXT_BLOCK CurrentWcb; + KDEVICE_QUEUE ChannelWaitQueue; + PKDEVICE_QUEUE RegisterWaitQueue; + LIST_ENTRY AdapterQueue; + KSPIN_LOCK SpinLock; + PRTL_BITMAP MapRegisters; + PUCHAR PagePort; + UCHAR ChannelNumber; + UCHAR AdapterNumber; + USHORT DmaPortAddress; + DMA_MODE AdapterMode; + BOOLEAN NeedsMapRegisters; + BOOLEAN MasterDevice; + BOOLEAN Width16Bits; + BOOLEAN ScatterGather; + BOOLEAN IgnoreCount; + BOOLEAN Dma32BitAddresses; + BOOLEAN Dma64BitAddresses; + LIST_ENTRY AdapterList; +} ADAPTER_OBJECT; + +typedef struct _GROW_WORK_ITEM { + WORK_QUEUE_ITEM WorkQueueItem; + PADAPTER_OBJECT AdapterObject; + ULONG NumberOfMapRegisters; +} GROW_WORK_ITEM, *PGROW_WORK_ITEM; + +#define MAP_BASE_SW_SG 1 + +PADAPTER_OBJECT STDCALL +HalpDmaAllocateMasterAdapter(VOID); + +PDMA_ADAPTER STDCALL +HalpGetDmaAdapter( + IN PVOID Context, + IN PDEVICE_DESCRIPTION DeviceDescription, + OUT PULONG NumberOfMapRegisters); + +ULONG STDCALL +HalpDmaGetDmaAlignment( + PADAPTER_OBJECT AdapterObject); + +#endif /* HALDMA_H */ Property changes on: hal\halx86\include\haldma.h ___________________________________________________________________ Name: svn:executable + * Index: include/ddk/csq.h =================================================================== --- include/ddk/csq.h (revision 21221) +++ include/ddk/csq.h (working copy) @@ -237,6 +237,7 @@ * As long as the Csq struct and the functions you pass in are resident, * there are no IRQL restrictions. */ +NTKERNELAPI NTSTATUS NTAPI IoCsqInitialize(PIO_CSQ Csq, PIO_CSQ_INSERT_IRP CsqInsertIrp, PIO_CSQ_REMOVE_IRP CsqRemoveIrp, @@ -250,6 +251,7 @@ * CsqInsertIrp. This eventually allows you to supply extra tracking * information for use with the queue. */ +NTKERNELAPI NTSTATUS NTAPI IoCsqInitializeEx(PIO_CSQ Csq, PIO_CSQ_INSERT_IRP_EX CsqInsertIrpEx, PIO_CSQ_REMOVE_IRP CsqRemoveIrp, @@ -261,6 +263,7 @@ /* * Insert an IRP into the queue */ +NTKERNELAPI VOID NTAPI IoCsqInsertIrp(PIO_CSQ Csq, PIRP Irp, PIO_CSQ_IRP_CONTEXT Context); @@ -269,6 +272,7 @@ * Insert an IRP into the queue, with special context maintained that * makes it easy to find IRPs in the queue */ +NTKERNELAPI NTSTATUS NTAPI IoCsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PIO_CSQ_IRP_CONTEXT Context, @@ -277,12 +281,14 @@ /* * Remove a particular IRP from the queue */ +NTKERNELAPI PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq, PIO_CSQ_IRP_CONTEXT Context); /* * Remove the next IRP from the queue */ +NTKERNELAPI PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, PVOID PeekContext); Index: include/ddk/ntifs.h =================================================================== --- include/ddk/ntifs.h (revision 21221) +++ include/ddk/ntifs.h (working copy) @@ -29,7 +29,6 @@ #endif #include "ntddk.h" -#include "csq.h" #ifdef __cplusplus extern "C" { @@ -44,9 +43,15 @@ #endif #ifndef NTKERNELAPI +#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined (_NTIFS_) || defined(_NTHAL_) #define NTKERNELAPI DECLSPEC_IMPORT +#else +#define NTKERNELAPI #endif +#endif +#include "csq.h" + typedef struct _SE_EXPORTS *PSE_EXPORTS; #ifdef _NTOSKRNL_ @@ -2934,21 +2939,21 @@ IN OUT POPLOCK Oplock ); -NTSYSAPI +NTHALAPI VOID NTAPI HalDisplayString ( IN PCHAR String ); -NTSYSAPI +NTHALAPI VOID NTAPI HalQueryRealTimeClock ( IN OUT PTIME_FIELDS TimeFields ); -NTSYSAPI +NTHALAPI VOID NTAPI HalSetRealTimeClock ( Index: include/ddk/video.h =================================================================== --- include/ddk/video.h (revision 21221) +++ include/ddk/video.h (working copy) @@ -36,6 +36,7 @@ #else #define VPAPI DECLSPEC_IMPORT #endif +#define VIDEOPORT_API VPAPI #include "videoagp.h" #include "ntddvdeo.h" Index: include/ddk/winddi.h =================================================================== --- include/ddk/winddi.h (revision 21221) +++ include/ddk/winddi.h (working copy) @@ -42,10 +42,8 @@ #define DECL_IMPORT __attribute__((dllimport)) #endif -#if defined(_WIN32K_) -#define WIN32KAPI DECL_EXPORT -#else -#define WIN32KAPI DECL_IMPORT +#ifndef WIN32KAPI +#define WIN32KAPI DECLSPEC_ADDRSAFE #endif #define DDI_DRIVER_VERSION_NT4 0x00020000 Index: include/ddk/winddk.h =================================================================== --- include/ddk/winddk.h (revision 21221) +++ include/ddk/winddk.h (working copy) @@ -40,29 +40,27 @@ #define DDKCDECLAPI __cdecl /* FIXME: REMOVE THIS UNCOMPATIBLE CRUFT!!! */ -#if defined(_NTOSKRNL_) +#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined (_NTIFS_) || defined(_NTHAL_) +#define NTKERNELAPI DECLSPEC_IMPORT +#else +#define NTKERNELAPI +#endif #ifndef NTOSAPI -#define NTOSAPI DECL_EXPORT +#define NTOSAPI NTKERNELAPI #endif +#if defined(_NTOSKRNL_) #define DECLARE_INTERNAL_OBJECT(x) typedef struct _##x; typedef struct _##x *P##x; #define DECLARE_INTERNAL_OBJECT2(x,y) typedef struct _##x; typedef struct _##x *P##y; #else -#ifndef NTOSAPI -#define NTOSAPI DECL_IMPORT -#endif #define DECLARE_INTERNAL_OBJECT(x) struct _##x; typedef struct _##x *P##x; #define DECLARE_INTERNAL_OBJECT2(x,y) struct _##x; typedef struct _##x *P##y; #endif -#if defined(_NTHAL_) -#ifndef NTHALAPI -#define NTHALAPI DECL_EXPORT -#endif +#if !defined(_NTHAL_) +#define NTHALAPI DECLSPEC_IMPORT #else -#ifndef NTHALAPI -#define NTHALAPI DECL_IMPORT +#define NTHALAPI #endif -#endif /* Pseudo modifiers for parameters */ #define IN @@ -5157,9 +5155,9 @@ #define ROUND_TO_PAGES(Size) \ ((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))) -NTOSAPI +NTSYSAPI VOID -DDKAPI +NTAPI RtlAssert( IN PVOID FailedAssertion, IN PVOID FileName, @@ -5976,15 +5974,13 @@ IN PLARGE_INTEGER Time, IN PTIME_FIELDS TimeFields); -NTOSAPI ULONG -DDKFASTAPI +FASTCALL RtlUlongByteSwap( IN ULONG Source); -NTOSAPI ULONGLONG -DDKFASTAPI +FASTCALL RtlUlonglongByteSwap( IN ULONGLONG Source); @@ -6037,9 +6033,8 @@ IN OUT PSTRING DestinationString, IN PSTRING SourceString); -NTOSAPI USHORT -DDKFASTAPI +FASTCALL RtlUshortByteSwap( IN USHORT Source); @@ -6798,6 +6793,7 @@ PADAPTER_OBJECT AdapterObject ); +NTKERNELAPI NTSTATUS NTAPI IoAllocateAdapterChannel( @@ -10209,9 +10205,8 @@ KdEnableDebugger( VOID); -NTOSAPI VOID -DDKAPI +NTAPI DbgBreakPoint( VOID); @@ -10221,16 +10216,14 @@ DbgBreakPointWithStatus( IN ULONG Status); -NTOSAPI ULONG -DDKCDECLAPI +__cdecl DbgPrint( IN PCH Format, IN ...); -NTOSAPI ULONG -DDKCDECLAPI +__cdecl DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, Index: include/ndk/cmfuncs.h =================================================================== --- include/ndk/cmfuncs.h (revision 21221) +++ include/ndk/cmfuncs.h (working copy) @@ -27,6 +27,7 @@ // // Native calls // +NTSYSCALLAPI NTSTATUS NTAPI NtCreateKey( @@ -39,12 +40,14 @@ IN PULONG Disposition OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteKey( IN HANDLE KeyHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteValueKey( @@ -52,6 +55,7 @@ IN PUNICODE_STRING ValueName ); +NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateKey( @@ -63,6 +67,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateValueKey( @@ -74,12 +79,14 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtFlushKey( IN HANDLE KeyHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtGetPlugPlayEvent( @@ -89,12 +96,14 @@ IN ULONG BufferSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtInitializeRegistry( BOOLEAN SetUpBoot ); +NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey( @@ -102,6 +111,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtLoadKey2( @@ -110,6 +120,7 @@ IN ULONG Flags ); +NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeKey( @@ -125,6 +136,7 @@ IN BOOLEAN WatchSubtree ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenKey( @@ -133,6 +145,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtPlugPlayControl( @@ -141,6 +154,7 @@ IN ULONG BufferSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryKey( @@ -151,6 +165,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryMultipleValueKey( @@ -162,6 +177,7 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryValueKey( @@ -173,6 +189,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtReplaceKey( @@ -181,6 +198,7 @@ IN POBJECT_ATTRIBUTES ReplacedObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtRestoreKey( @@ -189,6 +207,7 @@ IN ULONG RestoreFlags ); +NTSYSCALLAPI NTSTATUS NTAPI NtSaveKey( @@ -196,6 +215,7 @@ IN HANDLE FileHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtSaveKeyEx( @@ -204,6 +224,7 @@ IN ULONG Flags ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationKey( @@ -213,6 +234,7 @@ IN ULONG KeyInformationLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetValueKey( @@ -224,6 +246,7 @@ IN ULONG DataSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtUnloadKey( @@ -231,6 +254,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwCreateKey( @@ -243,13 +267,14 @@ IN PULONG Disposition OPTIONAL ); - +NTSYSAPI NTSTATUS NTAPI ZwDeleteKey( IN HANDLE KeyHandle ); +NTSYSAPI NTSTATUS NTAPI ZwDeleteValueKey( @@ -257,6 +282,7 @@ IN PUNICODE_STRING ValueName ); +NTSYSAPI NTSTATUS NTAPI ZwEnumerateKey( @@ -268,6 +294,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwEnumerateValueKey( @@ -279,12 +306,14 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwFlushKey( IN HANDLE KeyHandle ); +NTSYSAPI NTSTATUS NTAPI ZwGetPlugPlayEvent( @@ -294,12 +323,14 @@ IN ULONG BufferSize ); +NTSYSAPI NTSTATUS NTAPI ZwInitializeRegistry( BOOLEAN SetUpBoot ); +NTSYSAPI NTSTATUS NTAPI ZwLoadKey( @@ -307,6 +338,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwLoadKey2( @@ -315,6 +347,7 @@ IN ULONG Flags ); +NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeKey( @@ -330,6 +363,7 @@ IN BOOLEAN WatchSubtree ); +NTSYSAPI NTSTATUS NTAPI ZwOpenKey( @@ -338,6 +372,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwPlugPlayControl( @@ -346,6 +381,7 @@ IN ULONG BufferSize ); +NTSYSAPI NTSTATUS NTAPI ZwQueryKey( @@ -356,6 +392,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( @@ -367,6 +404,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryValueKey( @@ -378,6 +416,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwReplaceKey( @@ -386,6 +425,7 @@ IN POBJECT_ATTRIBUTES ReplacedObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwRestoreKey( @@ -394,6 +434,7 @@ IN ULONG RestoreFlags ); +NTSYSAPI NTSTATUS NTAPI ZwSaveKey( @@ -401,6 +442,7 @@ IN HANDLE FileHandle ); +NTSYSAPI NTSTATUS NTAPI ZwSaveKeyEx( @@ -409,6 +451,7 @@ IN ULONG Flags ); +NTSYSAPI NTSTATUS NTAPI ZwSetInformationKey( @@ -418,6 +461,7 @@ IN ULONG KeyInformationLength ); +NTSYSAPI NTSTATUS NTAPI ZwSetValueKey( @@ -430,6 +474,7 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwUnloadKey( Index: include/ndk/exfuncs.h =================================================================== --- include/ndk/exfuncs.h (revision 21221) +++ include/ndk/exfuncs.h (working copy) @@ -98,6 +98,7 @@ // // Native Calls // +NTSYSCALLAPI NTSTATUS NTAPI NtAddAtom( @@ -106,6 +107,7 @@ IN OUT PRTL_ATOM Atom ); +NTSYSCALLAPI NTSTATUS NTAPI NtCancelTimer( @@ -113,12 +115,14 @@ OUT PBOOLEAN CurrentState OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtClearEvent( IN HANDLE EventHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateEvent( @@ -129,6 +133,7 @@ IN BOOLEAN InitialState ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateEventPair( @@ -137,6 +142,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateMutant( @@ -146,6 +152,7 @@ IN BOOLEAN InitialOwner ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateSemaphore( @@ -156,6 +163,7 @@ IN LONG MaximumCount ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateTimer( @@ -165,18 +173,21 @@ IN TIMER_TYPE TimerType ); +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteAtom( IN RTL_ATOM Atom ); +NTSYSCALLAPI NTSTATUS NTAPI NtDisplayString( IN PUNICODE_STRING DisplayString ); +NTSYSCALLAPI NTSTATUS NTAPI NtFindAtom( @@ -185,6 +196,7 @@ OUT PRTL_ATOM Atom OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenEvent( @@ -193,6 +205,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenEventPair( @@ -201,6 +214,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenMutant( @@ -209,6 +223,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenSemaphore( @@ -217,6 +232,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenTimer( @@ -225,6 +241,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtPulseEvent( @@ -232,6 +249,7 @@ IN PLONG PulseCount OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryDefaultLocale( @@ -239,12 +257,14 @@ OUT PLCID DefaultLocaleId ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryDefaultUILanguage( PLANGID LanguageId ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryEvent( @@ -255,6 +275,7 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationAtom( @@ -265,12 +286,14 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryInstallUILanguage( PLANGID LanguageId ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryMutant( @@ -281,6 +304,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySemaphore( @@ -291,6 +315,7 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemEnvironmentValue( @@ -300,6 +325,7 @@ PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformation( @@ -309,6 +335,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimer( @@ -319,6 +346,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtRaiseHardError( @@ -330,6 +358,7 @@ OUT PULONG Response ); +NTSYSCALLAPI NTSTATUS NTAPI NtReleaseMutant( @@ -337,6 +366,7 @@ IN PLONG ReleaseCount OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtReleaseSemaphore( @@ -345,6 +375,7 @@ OUT PLONG PreviousCount ); +NTSYSCALLAPI NTSTATUS NTAPI NtResetEvent( @@ -352,6 +383,7 @@ OUT PLONG NumberOfWaitingThreads OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultLocale( @@ -359,18 +391,21 @@ IN LCID DefaultLocaleId ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultUILanguage( LANGID LanguageId ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetDefaultHardErrorPort( IN HANDLE PortHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetEvent( @@ -378,30 +413,35 @@ OUT PLONG PreviousState OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetHighEventPair( IN HANDLE EventPairHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetHighWaitLowEventPair( IN HANDLE EventPairHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetLowEventPair( HANDLE EventPair ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetLowWaitHighEventPair( HANDLE EventPair ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemEnvironmentValue( @@ -409,6 +449,7 @@ IN PUNICODE_STRING Value ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemInformation( @@ -417,6 +458,7 @@ IN ULONG SystemInformationLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetTimer( @@ -429,30 +471,35 @@ OUT PBOOLEAN PreviousState OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetUuidSeed( IN PUCHAR UuidSeed ); +NTSYSCALLAPI NTSTATUS NTAPI NtShutdownSystem( IN SHUTDOWN_ACTION Action ); +NTSYSCALLAPI NTSTATUS NTAPI NtWaitHighEventPair( IN HANDLE EventPairHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtWaitLowEventPair( IN HANDLE EventPairHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtTraceEvent( @@ -462,6 +509,7 @@ IN PEVENT_TRACE_HEADER TraceHeader ); +NTSYSAPI NTSTATUS NTAPI ZwAddAtom( @@ -471,6 +519,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwCancelTimer( @@ -479,6 +528,7 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwClearEvent( @@ -486,6 +536,7 @@ ); NTSYSAPI +NTSYSAPI NTSTATUS NTAPI ZwCreateEvent( @@ -496,6 +547,7 @@ IN BOOLEAN InitialState ); +NTSYSAPI NTSTATUS NTAPI ZwCreateEventPair( @@ -504,6 +556,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwCreateMutant( @@ -513,6 +566,7 @@ IN BOOLEAN InitialOwner ); +NTSYSAPI NTSTATUS NTAPI ZwCreateSemaphore( @@ -524,6 +578,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwCreateTimer( @@ -534,18 +589,21 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwDeleteAtom( IN RTL_ATOM Atom ); +NTSYSAPI NTSTATUS NTAPI ZwDisplayString( IN PUNICODE_STRING DisplayString ); +NTSYSAPI NTSTATUS NTAPI ZwFindAtom( @@ -554,6 +612,7 @@ OUT PRTL_ATOM Atom OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwOpenEvent( @@ -562,6 +621,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenEventPair( @@ -570,6 +630,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenMutant( @@ -578,6 +639,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenSemaphore( @@ -587,6 +649,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwOpenTimer( @@ -596,6 +659,7 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwPulseEvent( @@ -603,6 +667,7 @@ IN PLONG PulseCount OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultLocale( @@ -610,12 +675,14 @@ OUT PLCID DefaultLocaleId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultUILanguage( PLANGID LanguageId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryEvent( @@ -626,6 +693,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationAtom( @@ -636,12 +704,14 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInstallUILanguage( PLANGID LanguageId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryMutant( @@ -652,6 +722,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySemaphore( @@ -662,6 +733,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemEnvironmentValue( @@ -671,6 +743,7 @@ PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemInformation( @@ -680,6 +753,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryTimer( @@ -690,6 +764,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwRaiseHardError( @@ -701,6 +776,7 @@ OUT PULONG Response ); +NTSYSAPI NTSTATUS NTAPI ZwReleaseMutant( @@ -708,6 +784,7 @@ IN PLONG ReleaseCount OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwReleaseSemaphore( @@ -716,6 +793,7 @@ OUT PLONG PreviousCount ); +NTSYSAPI NTSTATUS NTAPI ZwResetEvent( @@ -723,6 +801,7 @@ OUT PLONG NumberOfWaitingThreads OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwSetDefaultLocale( @@ -730,12 +809,14 @@ IN LCID DefaultLocaleId ); +NTSYSAPI NTSTATUS NTAPI ZwSetDefaultUILanguage( LANGID LanguageId ); +NTSYSAPI NTSTATUS NTAPI ZwSetDefaultHardErrorPort( @@ -750,30 +831,35 @@ OUT PLONG PreviousState OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwSetHighEventPair( IN HANDLE EventPairHandle ); +NTSYSAPI NTSTATUS NTAPI ZwSetHighWaitLowEventPair( IN HANDLE EventPairHandle ); +NTSYSAPI NTSTATUS NTAPI ZwSetLowEventPair( HANDLE EventPair ); +NTSYSAPI NTSTATUS NTAPI ZwSetLowWaitHighEventPair( HANDLE EventPair ); +NTSYSAPI NTSTATUS NTAPI ZwSetSystemEnvironmentValue( @@ -781,6 +867,7 @@ IN PUNICODE_STRING Value ); +NTSYSAPI NTSTATUS NTAPI ZwSetSystemInformation( @@ -790,6 +877,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwSetTimer( @@ -803,30 +891,35 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwSetUuidSeed( IN PUCHAR UuidSeed ); +NTSYSAPI NTSTATUS NTAPI ZwShutdownSystem( IN SHUTDOWN_ACTION Action ); +NTSYSAPI NTSTATUS NTAPI ZwWaitHighEventPair( IN HANDLE EventPairHandle ); +NTSYSAPI NTSTATUS NTAPI ZwWaitLowEventPair( IN HANDLE EventPairHandle ); +NTSYSAPI NTSTATUS NTAPI ZwTraceEvent( Index: include/ndk/haltypes.h =================================================================== --- include/ndk/haltypes.h (revision 21221) +++ include/ndk/haltypes.h (working copy) @@ -238,11 +238,11 @@ // Kernel Exports // #ifdef __NTOSKRNL__ -extern HAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; +extern HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #else -extern PHAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; +extern PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #endif -extern ULONG NTSYSAPI KdComPortInUse; +extern ULONG KdComPortInUse; #endif #endif Index: include/ndk/iofuncs.h =================================================================== --- include/ndk/iofuncs.h (revision 21221) +++ include/ndk/iofuncs.h (working copy) @@ -28,6 +28,7 @@ // // Native calls // +NTSYSCALLAPI NTSTATUS NTAPI NtAddBootEntry( @@ -35,6 +36,7 @@ IN PUNICODE_STRING EntryValue ); +NTSYSCALLAPI NTSTATUS NTAPI NtCancelIoFile( @@ -59,6 +61,7 @@ IN ULONG EaLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateIoCompletion( @@ -68,6 +71,7 @@ IN ULONG NumberOfConcurrentThreads ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateMailslotFile( @@ -81,6 +85,7 @@ IN PLARGE_INTEGER TimeOut ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateNamedPipeFile( @@ -100,6 +105,7 @@ IN PLARGE_INTEGER DefaultTimeOut ); +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteBootEntry( @@ -107,6 +113,7 @@ IN PUNICODE_STRING EntryValue ); +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteFile( @@ -129,6 +136,7 @@ IN ULONG OutputBufferSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtEnumerateBootEntries( @@ -136,6 +144,7 @@ IN ULONG Unknown2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtFlushBuffersFile( @@ -143,6 +152,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); +NTSYSCALLAPI NTSTATUS NTAPI NtFlushWriteBuffer(VOID); @@ -163,6 +173,7 @@ IN ULONG OutputBufferSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtLoadDriver( @@ -185,6 +196,7 @@ IN BOOLEAN ExclusiveLock ); +NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeDirectoryFile( @@ -211,6 +223,7 @@ IN ULONG OpenOptions ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenIoCompletion( @@ -219,6 +232,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryAttributesFile( @@ -226,6 +240,7 @@ OUT PFILE_BASIC_INFORMATION FileInformation ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootEntryOrder( @@ -233,6 +248,7 @@ IN ULONG Unknown2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryBootOptions( @@ -257,6 +273,7 @@ IN BOOLEAN RestartScan ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryEaFile( @@ -271,6 +288,7 @@ IN BOOLEAN RestartScan ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryFullAttributesFile( @@ -289,6 +307,7 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryIoCompletion( @@ -340,6 +359,7 @@ IN PULONG Key OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtReadFileScatter( @@ -354,6 +374,7 @@ IN PULONG Key OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtRemoveIoCompletion( @@ -364,6 +385,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetBootEntryOrder( @@ -371,6 +393,7 @@ IN ULONG Unknown2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetBootOptions( @@ -378,6 +401,7 @@ ULONG Unknown2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetEaFile( @@ -398,6 +422,7 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetIoCompletion( @@ -429,6 +454,7 @@ IN FS_INFORMATION_CLASS FsInformationClass ); +NTSYSCALLAPI NTSTATUS NTAPI NtTranslateFilePath( @@ -437,6 +463,7 @@ ULONG Unknown3 ); +NTSYSCALLAPI NTSTATUS NTAPI NtUnloadDriver( @@ -469,6 +496,7 @@ IN PULONG Key OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtWriteFileGather( @@ -483,6 +511,7 @@ IN PULONG Key OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwAddBootEntry( @@ -490,6 +519,7 @@ IN PUNICODE_STRING EntryValue ); +NTSYSAPI NTSTATUS NTAPI ZwCancelIoFile( @@ -497,7 +527,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwCreateFile( @@ -514,6 +544,7 @@ IN ULONG EaLength ); +NTSYSAPI NTSTATUS NTAPI ZwCreateIoCompletion( @@ -523,6 +554,7 @@ IN ULONG NumberOfConcurrentThreads ); +NTSYSAPI NTSTATUS NTAPI ZwCreateMailslotFile( @@ -536,6 +568,7 @@ IN PLARGE_INTEGER TimeOut ); +NTSYSAPI NTSTATUS NTAPI ZwCreateNamedPipeFile( @@ -555,6 +588,7 @@ IN PLARGE_INTEGER DefaultTimeOut ); +NTSYSAPI NTSTATUS NTAPI ZwDeleteBootEntry( @@ -569,7 +603,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwDeviceIoControlFile( @@ -585,6 +619,7 @@ IN ULONG OutputBufferSize ); +NTSYSAPI NTSTATUS NTAPI ZwEnumerateBootEntries( @@ -602,11 +637,12 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwFlushWriteBuffer(VOID); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwFsControlFile( @@ -623,6 +659,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwLoadDriver( @@ -630,7 +667,7 @@ ); #endif -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwLockFile( @@ -646,6 +683,7 @@ IN BOOLEAN ExclusiveLock ); +NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeDirectoryFile( @@ -660,7 +698,7 @@ IN BOOLEAN WatchTree ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenFile( @@ -672,6 +710,7 @@ IN ULONG OpenOptions ); +NTSYSAPI NTSTATUS NTAPI ZwOpenIoCompletion( @@ -680,6 +719,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwQueryAttributesFile( @@ -687,6 +727,7 @@ OUT PFILE_BASIC_INFORMATION FileInformation ); +NTSYSAPI NTSTATUS NTAPI ZwQueryBootEntryOrder( @@ -694,6 +735,7 @@ IN ULONG Unknown2 ); +NTSYSAPI NTSTATUS NTAPI ZwQueryBootOptions( @@ -701,7 +743,7 @@ IN ULONG Unknown2 ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryFile( @@ -719,6 +761,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwQueryEaFile( @@ -734,6 +777,7 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwQueryFullAttributesFile( @@ -741,7 +785,7 @@ OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationFile( @@ -752,6 +796,7 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); +NTSYSAPI NTSTATUS NTAPI ZwQueryIoCompletion( @@ -762,7 +807,7 @@ OUT PULONG ResultLength OPTIONAL ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryQuotaInformationFile( @@ -777,7 +822,7 @@ IN BOOLEAN RestartScan ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryVolumeInformationFile( @@ -788,7 +833,7 @@ IN FS_INFORMATION_CLASS FsInformationClass ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwReadFile( @@ -803,6 +848,7 @@ IN PULONG Key OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwReadFileScatter( @@ -817,6 +863,7 @@ IN PULONG Key OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwRemoveIoCompletion( @@ -827,6 +874,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwSetBootEntryOrder( @@ -834,6 +882,7 @@ IN ULONG Unknown2 ); +NTSYSAPI NTSTATUS NTAPI ZwSetBootOptions( @@ -842,6 +891,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwSetEaFile( @@ -852,7 +902,7 @@ ); #endif -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetInformationFile( @@ -863,6 +913,7 @@ IN FILE_INFORMATION_CLASS FileInformationClass ); +NTSYSAPI NTSTATUS NTAPI ZwSetIoCompletion( @@ -873,7 +924,7 @@ IN ULONG CompletionInformation ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetQuotaInformationFile( @@ -883,7 +934,7 @@ ULONG BufferLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetVolumeInformationFile( @@ -894,6 +945,7 @@ IN FS_INFORMATION_CLASS FsInformationClass ); +NTSYSAPI NTSTATUS NTAPI ZwTranslateFilePath( @@ -909,7 +961,7 @@ IN PUNICODE_STRING DriverServiceName ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwUnlockFile( @@ -920,7 +972,7 @@ OUT ULONG Key OPTIONAL ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwWriteFile( @@ -935,6 +987,7 @@ IN PULONG Key OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwWriteFileGather( Index: include/ndk/kdfuncs.h =================================================================== --- include/ndk/kdfuncs.h (revision 21221) +++ include/ndk/kdfuncs.h (working copy) @@ -132,7 +132,7 @@ ULONG Level ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI NtSetDebugFilterState( @@ -141,6 +141,7 @@ BOOLEAN State ); +NTSYSCALLAPI NTSTATUS NTAPI NtSystemDebugControl( @@ -152,7 +153,7 @@ PULONG ReturnLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryDebugFilterState( @@ -169,6 +170,7 @@ BOOLEAN State ); +NTSYSAPI NTSTATUS NTAPI ZwSystemDebugControl( Index: include/ndk/kefuncs.h =================================================================== --- include/ndk/kefuncs.h (revision 21221) +++ include/ndk/kefuncs.h (working copy) @@ -254,6 +254,7 @@ // // Native Calls // +NTSYSCALLAPI NTSTATUS NTAPI NtContinue( @@ -261,6 +262,7 @@ IN BOOLEAN TestAlert ); +NTSYSCALLAPI NTSTATUS NTAPI NtCallbackReturn( @@ -269,6 +271,7 @@ NTSTATUS Status ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateProfile( @@ -283,6 +286,7 @@ IN KAFFINITY ProcessorMask ); +NTSYSCALLAPI NTSTATUS NTAPI NtDelayExecution( @@ -290,6 +294,7 @@ IN LARGE_INTEGER *Interval ); +NTSYSCALLAPI NTSTATUS NTAPI NtFlushInstructionCache( @@ -298,6 +303,7 @@ IN ULONG NumberOfBytesToFlush ); +NTSYSCALLAPI NTSTATUS NTAPI NtGetContextThread( @@ -305,12 +311,14 @@ OUT PCONTEXT Context ); +NTSYSCALLAPI ULONG NTAPI NtGetTickCount( VOID ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryIntervalProfile( @@ -318,6 +326,7 @@ OUT PULONG Interval ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryPerformanceCounter( @@ -325,12 +334,14 @@ IN PLARGE_INTEGER Frequency ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemTime( OUT PLARGE_INTEGER CurrentTime ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryTimerResolution( @@ -339,6 +350,7 @@ OUT PULONG ActualResolution ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueueApcThread( @@ -349,6 +361,7 @@ PVOID SystemArgument2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtRaiseException( @@ -357,6 +370,7 @@ IN BOOLEAN SearchFrames ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetContextThread( @@ -364,6 +378,7 @@ IN PCONTEXT Context ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetIntervalProfile( @@ -371,6 +386,7 @@ KPROFILE_SOURCE ClockSource ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetLdtEntries( @@ -380,6 +396,7 @@ LDT_ENTRY LdtEntry2 ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetSystemTime( @@ -387,6 +404,7 @@ IN PLARGE_INTEGER NewSystemTime OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetTimerResolution( @@ -395,24 +413,28 @@ OUT PULONG ActualResolution ); +NTSYSCALLAPI NTSTATUS NTAPI NtStartProfile( IN HANDLE ProfileHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtStopProfile( IN HANDLE ProfileHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtTestAlert( VOID ); +NTSYSCALLAPI NTSTATUS NTAPI NtVdmControl( @@ -420,6 +442,7 @@ PVOID ControlData ); +NTSYSCALLAPI NTSTATUS NTAPI NtW32Call( @@ -430,12 +453,14 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtYieldExecution( VOID ); +NTSYSAPI NTSTATUS NTAPI ZwContinue( @@ -443,6 +468,7 @@ IN BOOLEAN TestAlert ); +NTSYSAPI NTSTATUS NTAPI ZwCallbackReturn( @@ -451,6 +477,7 @@ NTSTATUS Status ); +NTSYSAPI NTSTATUS NTAPI ZwCreateProfile( @@ -465,6 +492,7 @@ IN KAFFINITY ProcessorMask ); +NTSYSAPI NTSTATUS NTAPI ZwDelayExecution( @@ -472,6 +500,7 @@ IN LARGE_INTEGER *Interval ); +NTSYSAPI NTSTATUS NTAPI ZwFlushInstructionCache( @@ -480,6 +509,7 @@ IN ULONG NumberOfBytesToFlush ); +NTSYSAPI NTSTATUS NTAPI ZwGetContextThread( @@ -487,12 +517,14 @@ OUT PCONTEXT Context ); +NTSYSAPI ULONG NTAPI ZwGetTickCount( VOID ); +NTSYSAPI NTSTATUS NTAPI ZwQueryIntervalProfile( @@ -500,6 +532,7 @@ OUT PULONG Interval ); +NTSYSAPI NTSTATUS NTAPI ZwQueryPerformanceCounter( @@ -507,12 +540,14 @@ IN PLARGE_INTEGER Frequency ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemTime( OUT PLARGE_INTEGER CurrentTime ); +NTSYSAPI NTSTATUS NTAPI ZwQueryTimerResolution( @@ -521,6 +556,7 @@ OUT PULONG ActualResolution ); +NTSYSAPI NTSTATUS NTAPI ZwQueueApcThread( @@ -531,6 +567,7 @@ PVOID SystemArgument2 ); +NTSYSAPI NTSTATUS NTAPI ZwRaiseException( @@ -539,6 +576,7 @@ IN BOOLEAN SearchFrames ); +NTSYSAPI NTSTATUS NTAPI ZwSetContextThread( @@ -546,6 +584,7 @@ IN PCONTEXT Context ); +NTSYSAPI NTSTATUS NTAPI ZwSetIntervalProfile( @@ -553,6 +592,7 @@ KPROFILE_SOURCE ClockSource ); +NTSYSAPI NTSTATUS NTAPI ZwSetLdtEntries( @@ -562,6 +602,7 @@ LDT_ENTRY LdtEntry2 ); +NTSYSAPI NTSTATUS NTAPI ZwSetSystemTime( @@ -569,6 +610,7 @@ IN PLARGE_INTEGER NewSystemTime OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwSetTimerResolution( @@ -577,24 +619,28 @@ OUT PULONG ActualResolution ); +NTSYSAPI NTSTATUS NTAPI ZwStartProfile( IN HANDLE ProfileHandle ); +NTSYSAPI NTSTATUS NTAPI ZwStopProfile( IN HANDLE ProfileHandle ); +NTSYSAPI NTSTATUS NTAPI ZwTestAlert( VOID ); +NTSYSAPI NTSTATUS NTAPI ZwVdmControl( @@ -602,6 +648,7 @@ PVOID ControlData ); +NTSYSAPI NTSTATUS NTAPI ZwW32Call( @@ -612,6 +659,7 @@ OUT PULONG ResultLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwYieldExecution( Index: include/ndk/mmfuncs.h =================================================================== --- include/ndk/mmfuncs.h (revision 21221) +++ include/ndk/mmfuncs.h (working copy) @@ -53,6 +53,7 @@ IN ULONG Protect ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreatePagingFile( @@ -75,6 +76,7 @@ IN HANDLE FileHandle OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtExtendSection( @@ -82,6 +84,7 @@ IN PLARGE_INTEGER NewMaximumSize ); +NTSYSCALLAPI NTSTATUS NTAPI NtFlushVirtualMemory( @@ -101,6 +104,7 @@ IN ULONG FreeType ); +NTSYSCALLAPI NTSTATUS NTAPI NtLockVirtualMemory( @@ -110,6 +114,7 @@ PULONG NumberOfBytesLocked ); +NTSYSCALLAPI NTSTATUS NTAPI NtMapViewOfSection( @@ -125,6 +130,7 @@ IN ULONG AccessProtection ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenSection( @@ -133,6 +139,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtProtectVirtualMemory( @@ -143,6 +150,7 @@ OUT PULONG OldAccessProtection ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySection( @@ -153,6 +161,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryVirtualMemory( @@ -164,6 +173,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtReadVirtualMemory( @@ -174,6 +184,7 @@ OUT PULONG NumberOfBytesRead ); +NTSYSCALLAPI NTSTATUS NTAPI NtUnlockVirtualMemory( @@ -183,6 +194,7 @@ OUT PULONG NumberOfBytesUnlocked OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtUnmapViewOfSection( @@ -190,6 +202,7 @@ IN PVOID BaseAddress ); +NTSYSCALLAPI NTSTATUS NTAPI NtWriteVirtualMemory( @@ -200,7 +213,7 @@ OUT PULONG NumberOfBytesWritten ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwAllocateVirtualMemory( @@ -212,6 +225,7 @@ IN ULONG Protect ); +NTSYSAPI NTSTATUS NTAPI ZwCreatePagingFile( @@ -221,7 +235,7 @@ IN ULONG Reserved ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwCreateSection( @@ -234,6 +248,7 @@ IN HANDLE FileHandle OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwExtendSection( @@ -241,7 +256,7 @@ IN PLARGE_INTEGER NewMaximumSize ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwFreeVirtualMemory( @@ -251,6 +266,7 @@ IN ULONG FreeType ); +NTSYSAPI NTSTATUS NTAPI ZwLockVirtualMemory( @@ -285,6 +301,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwProtectVirtualMemory( @@ -295,6 +312,7 @@ OUT PULONG OldAccessProtection ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySection( @@ -305,6 +323,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryVirtualMemory( @@ -316,6 +335,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwReadVirtualMemory( @@ -326,6 +346,7 @@ OUT PULONG NumberOfBytesRead ); +NTSYSAPI NTSTATUS NTAPI ZwUnlockVirtualMemory( @@ -343,6 +364,7 @@ IN PVOID BaseAddress ); +NTSYSAPI NTSTATUS NTAPI ZwWriteVirtualMemory( Index: include/ndk/obfuncs.h =================================================================== --- include/ndk/obfuncs.h (revision 21221) +++ include/ndk/obfuncs.h (working copy) @@ -29,6 +29,7 @@ // // Object Functions // +NTKERNELAPI NTSTATUS NTAPI ObCreateObject( @@ -43,12 +44,14 @@ OUT PVOID *Object ); +NTKERNELAPI ULONG NTAPI ObGetObjectPointerCount( IN PVOID Object ); +NTKERNELAPI NTSTATUS NTAPI ObReferenceObjectByName( @@ -62,6 +65,7 @@ OUT PVOID *Object ); +NTKERNELAPI NTSTATUS NTAPI ObFindHandleForObject( @@ -93,6 +97,7 @@ IN BOOLEAN GenerateOnClose ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateDirectoryObject( @@ -101,6 +106,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateSymbolicLinkObject( @@ -110,7 +116,7 @@ IN PUNICODE_STRING Name ); -NTSYSAPI +NTSYSCALLAPI NTSTATUS NTAPI NtDeleteObjectAuditAlarm( @@ -119,6 +125,7 @@ IN BOOLEAN GenerateOnClose ); +NTSYSCALLAPI NTSTATUS NTAPI NtDuplicateObject( @@ -131,18 +138,21 @@ IN ULONG Options ); +NTSYSCALLAPI NTSTATUS NTAPI NtMakePermanentObject( IN HANDLE Object ); +NTSYSCALLAPI NTSTATUS NTAPI NtMakeTemporaryObject( IN HANDLE Handle ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenDirectoryObject( @@ -151,6 +161,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenJobObject( @@ -159,6 +170,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenSymbolicLinkObject( @@ -167,6 +179,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryDirectoryObject( @@ -179,6 +192,7 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryObject( @@ -200,6 +214,7 @@ OUT PULONG ResultLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtQuerySymbolicLinkObject( @@ -208,6 +223,7 @@ OUT PULONG DataWritten OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationObject( @@ -226,6 +242,7 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +NTSYSCALLAPI NTSTATUS NTAPI NtSignalAndWaitForSingleObject( @@ -235,6 +252,7 @@ IN PLARGE_INTEGER Time ); +NTSYSCALLAPI NTSTATUS NTAPI NtWaitForMultipleObjects( @@ -245,6 +263,7 @@ IN PLARGE_INTEGER Time ); +NTSYSCALLAPI NTSTATUS NTAPI NtWaitForSingleObject( @@ -253,14 +272,14 @@ IN PLARGE_INTEGER Time ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwClose( IN HANDLE Handle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwCloseObjectAuditAlarm( @@ -278,6 +297,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwCreateSymbolicLinkObject( @@ -309,6 +329,7 @@ IN ULONG Options ); +NTSYSAPI NTSTATUS NTAPI ZwMakePermanentObject( @@ -331,6 +352,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenJobObject( @@ -348,6 +370,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryObject( @@ -360,6 +383,7 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryObject( @@ -370,7 +394,7 @@ OUT PULONG ResultLength OPTIONAL ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQuerySecurityObject( @@ -390,6 +414,7 @@ OUT PULONG DataWritten OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwSetInformationObject( @@ -399,7 +424,7 @@ IN ULONG Length ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetSecurityObject( @@ -408,6 +433,7 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +NTSYSAPI NTSTATUS NTAPI ZwSignalAndWaitForSingleObject( @@ -417,6 +443,7 @@ IN PLARGE_INTEGER Time ); +NTSYSAPI NTSTATUS NTAPI ZwWaitForMultipleObjects( Index: include/ndk/pofuncs.h =================================================================== --- include/ndk/pofuncs.h (revision 21221) +++ include/ndk/pofuncs.h (working copy) @@ -57,7 +57,7 @@ IN ULONG Flags ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwInitiatePowerAction( @@ -67,7 +67,7 @@ BOOLEAN Asynchronous ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwPowerInformation( @@ -78,7 +78,7 @@ ULONG OutputBufferLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetSystemPowerState( Index: include/ndk/psfuncs.h =================================================================== --- include/ndk/psfuncs.h (revision 21221) +++ include/ndk/psfuncs.h (working copy) @@ -102,6 +102,7 @@ // // Native Calls // +NTSYSCALLAPI NTSTATUS NTAPI NtAlertResumeThread( @@ -109,12 +110,14 @@ OUT PULONG SuspendCount ); +NTSYSCALLAPI NTSTATUS NTAPI NtAlertThread( IN HANDLE ThreadHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtAssignProcessToJobObject( @@ -122,6 +125,7 @@ HANDLE ProcessHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateJobObject( @@ -130,6 +134,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateProcess( @@ -143,6 +148,7 @@ IN HANDLE ExceptionPort OPTIONAL ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateThread( @@ -156,6 +162,7 @@ IN BOOLEAN CreateSuspended ); +NTSYSCALLAPI NTSTATUS NTAPI NtImpersonateThread( @@ -164,6 +171,7 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); +NTSYSCALLAPI NTSTATUS NTAPI NtIsProcessInJob( @@ -181,6 +189,7 @@ IN PCLIENT_ID ClientId ); +NTSYSCALLAPI NTSTATUS NTAPI NtOpenThread( @@ -211,6 +220,7 @@ OUT PHANDLE TokenHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationJobObject( @@ -222,6 +232,7 @@ ); #ifndef _NTDDK_ +NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationProcess( @@ -233,6 +244,7 @@ ); #endif +NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationThread( @@ -243,12 +255,14 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtRegisterThreadTerminatePort( HANDLE TerminationPort ); +NTSYSCALLAPI NTSTATUS NTAPI NtResumeThread( @@ -256,12 +270,14 @@ OUT PULONG SuspendCount ); +NTSYSCALLAPI NTSTATUS NTAPI NtResumeProcess( IN HANDLE ProcessHandle ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationJobObject( @@ -271,6 +287,7 @@ ULONG JobInformationLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationProcess( @@ -290,6 +307,7 @@ IN ULONG ThreadInformationLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtSuspendProcess( @@ -303,6 +321,7 @@ IN PULONG PreviousSuspendCount ); +NTSYSCALLAPI NTSTATUS NTAPI NtTerminateProcess( @@ -310,6 +329,7 @@ IN NTSTATUS ExitStatus ); +NTSYSCALLAPI NTSTATUS NTAPI NtTerminateThread( @@ -317,6 +337,7 @@ IN NTSTATUS ExitStatus ); +NTSYSCALLAPI NTSTATUS NTAPI NtTerminateJobObject( @@ -324,6 +345,7 @@ NTSTATUS ExitStatus ); +NTSYSAPI NTSTATUS NTAPI ZwAlertResumeThread( @@ -331,12 +353,14 @@ OUT PULONG SuspendCount ); +NTSYSAPI NTSTATUS NTAPI ZwAlertThread( IN HANDLE ThreadHandle ); +NTSYSAPI NTSTATUS NTAPI ZwAssignProcessToJobObject( @@ -344,6 +368,7 @@ HANDLE ProcessHandle ); +NTSYSAPI NTSTATUS NTAPI ZwCreateJobObject( @@ -352,6 +377,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwCreateProcess( @@ -365,6 +391,7 @@ IN HANDLE ExceptionPort OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwCreateThread( @@ -378,6 +405,7 @@ IN BOOLEAN CreateSuspended ); +NTSYSAPI NTSTATUS NTAPI ZwImpersonateThread( @@ -386,6 +414,7 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); +NTSYSAPI NTSTATUS NTAPI ZwIsProcessInJob( @@ -393,7 +422,7 @@ IN HANDLE JobHandle OPTIONAL ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenProcess( @@ -403,6 +432,7 @@ IN PCLIENT_ID ClientId ); +NTSYSAPI NTSTATUS NTAPI ZwOpenThread( @@ -412,7 +442,7 @@ IN PCLIENT_ID ClientId ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenThreadToken( @@ -422,7 +452,7 @@ OUT PHANDLE TokenHandle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenThreadTokenEx( @@ -433,6 +463,7 @@ OUT PHANDLE TokenHandle ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationJobObject( @@ -444,6 +475,7 @@ ); #ifndef _NTDDK_ +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationProcess( @@ -455,6 +487,7 @@ ); #endif +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationThread( @@ -465,12 +498,14 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwRegisterThreadTerminatePort( HANDLE TerminationPort ); +NTSYSAPI NTSTATUS NTAPI ZwResumeThread( @@ -478,12 +513,14 @@ OUT PULONG SuspendCount ); +NTSYSAPI NTSTATUS NTAPI ZwResumeProcess( IN HANDLE ProcessHandle ); +NTSYSAPI NTSTATUS NTAPI ZwSetInformationJobObject( @@ -493,6 +530,7 @@ ULONG JobInformationLength ); +NTSYSAPI NTSTATUS NTAPI ZwSetInformationProcess( @@ -502,7 +540,7 @@ IN ULONG ProcessInformationLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetInformationThread( @@ -512,12 +550,14 @@ IN ULONG ThreadInformationLength ); +NTSYSAPI NTSTATUS NTAPI ZwSuspendProcess( IN HANDLE ProcessHandle ); +NTSYSAPI NTSTATUS NTAPI ZwSuspendThread( @@ -525,6 +565,7 @@ IN PULONG PreviousSuspendCount ); +NTSYSAPI NTSTATUS NTAPI ZwTerminateProcess( @@ -532,6 +573,7 @@ IN NTSTATUS ExitStatus ); +NTSYSAPI NTSTATUS NTAPI ZwTerminateThread( @@ -539,6 +581,7 @@ IN NTSTATUS ExitStatus ); +NTSYSAPI NTSTATUS NTAPI ZwTerminateJobObject( Index: include/ndk/rtlfuncs.h =================================================================== --- include/ndk/rtlfuncs.h (revision 21221) +++ include/ndk/rtlfuncs.h (working copy) @@ -344,6 +344,7 @@ IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL ); +NTSYSAPI ULONG NTAPI RtlCompactHeap( @@ -365,6 +366,7 @@ IN PVOID P ); +NTSYSAPI ULONG NTAPI RtlGetProcessHeaps( @@ -372,6 +374,7 @@ HANDLE *HeapArray ); +NTSYSAPI PVOID NTAPI RtlReAllocateHeap( @@ -381,14 +384,17 @@ ULONG Size ); +NTSYSAPI BOOLEAN NTAPI RtlLockHeap(IN HANDLE Heap); +NTSYSAPI BOOLEAN NTAPI RtlUnlockHeap(IN HANDLE Heap); +NTSYSAPI ULONG NTAPI RtlSizeHeap( @@ -397,6 +403,7 @@ IN PVOID MemoryPointer ); +NTSYSAPI BOOLEAN NTAPI RtlValidateHeap( @@ -429,6 +436,7 @@ PSID Sid ); +NTSYSAPI NTSTATUS NTAPI RtlAddAccessAllowedAceEx( @@ -439,6 +447,7 @@ IN PSID pSid ); +NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAce( @@ -448,6 +457,7 @@ PSID Sid ); +NTSYSAPI NTSTATUS NTAPI RtlAddAccessDeniedAceEx( @@ -458,6 +468,7 @@ IN PSID Sid ); +NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAceEx( @@ -481,6 +492,7 @@ ULONG AceListLength ); +NTSYSAPI NTSTATUS NTAPI RtlAddAuditAccessAce( @@ -492,6 +504,7 @@ BOOLEAN Failure ); +NTSYSAPI NTSTATUS NTAPI RtlAdjustPrivilege( @@ -518,6 +531,7 @@ OUT PSID *Sid ); +NTSYSAPI BOOLEAN NTAPI RtlAreAllAccessesGranted( @@ -525,6 +539,7 @@ ACCESS_MASK DesiredAccess ); +NTSYSAPI BOOLEAN NTAPI RtlAreAnyAccessesGranted( @@ -540,6 +555,7 @@ IN PLUID LuidSrc ); +NTSYSAPI VOID NTAPI RtlCopyLuidAndAttributesArray( @@ -548,6 +564,7 @@ PLUID_AND_ATTRIBUTES Dest ); +NTSYSAPI NTSTATUS NTAPI RtlCopySidAndAttributesArray( @@ -560,6 +577,7 @@ PULONG RemainingSidAreaSize ); +NTSYSAPI NTSTATUS NTAPI RtlConvertSidToUnicodeString( @@ -626,6 +644,7 @@ IN PSID Sid2 ); +NTSYSAPI BOOLEAN NTAPI RtlFirstFreeAce( @@ -649,6 +668,7 @@ PVOID *Ace ); +NTSYSAPI NTSTATUS NTAPI RtlGetControlSecurityDescriptor( @@ -1181,7 +1201,7 @@ NTAPI RtlOemStringToUnicodeString( PUNICODE_STRING DestinationString, - PCOEM_STRING SourceString, + POEM_STRING SourceString, BOOLEAN AllocateDestinationString ); Index: include/ndk/sefuncs.h =================================================================== --- include/ndk/sefuncs.h (revision 21221) +++ include/ndk/sefuncs.h (working copy) @@ -29,6 +29,7 @@ // // Security Descriptors // +NTKERNELAPI NTSTATUS NTAPI SeCaptureSecurityDescriptor( @@ -39,6 +40,7 @@ OUT PSECURITY_DESCRIPTOR *CapturedSecurityDescriptor ); +NTKERNELAPI NTSTATUS NTAPI SeReleaseSecurityDescriptor( @@ -50,6 +52,7 @@ // // Access States // +NTKERNELAPI NTSTATUS NTAPI SeCreateAccessState( @@ -59,6 +62,7 @@ PGENERIC_MAPPING GenericMapping ); +NTKERNELAPI VOID NTAPI SeDeleteAccessState( @@ -68,6 +72,7 @@ // // Impersonation // +NTKERNELAPI SECURITY_IMPERSONATION_LEVEL NTAPI SeTokenImpersonationLevel( @@ -79,6 +84,7 @@ // // Native Calls // +NTSYSCALLAPI NTSTATUS NTAPI NtAccessCheck( @@ -133,12 +139,14 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS NTAPI NtAllocateLocallyUniqueId( OUT LUID *LocallyUniqueId ); +NTSYSCALLAPI NTSTATUS NTAPI NtAllocateUuids( @@ -148,6 +156,7 @@ PUCHAR Seed ); +NTSYSCALLAPI NTSTATUS NTAPI NtCreateToken( @@ -265,7 +274,7 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI NtSetInformationToken( @@ -275,6 +284,7 @@ IN ULONG TokenInformationLength ); +NTSYSAPI NTSTATUS NTAPI ZwAccessCheck( @@ -288,7 +298,7 @@ OUT PNTSTATUS AccessStatus ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwAdjustGroupsToken( @@ -300,7 +310,7 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwAdjustPrivilegesToken( @@ -312,12 +322,14 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwAllocateLocallyUniqueId( OUT LUID *LocallyUniqueId ); +NTSYSAPI NTSTATUS NTAPI ZwAllocateUuids( @@ -327,6 +339,7 @@ PUCHAR Seed ); +NTSYSAPI NTSTATUS NTAPI ZwCreateToken( @@ -345,7 +358,7 @@ IN PTOKEN_SOURCE TokenSource ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwDuplicateToken( @@ -357,14 +370,14 @@ OUT PHANDLE NewTokenHandle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwImpersonateAnonymousToken( IN HANDLE Thread ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenObjectAuditAlarm( @@ -382,7 +395,7 @@ OUT PBOOLEAN GenerateOnClose ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenProcessToken( @@ -391,7 +404,7 @@ OUT PHANDLE TokenHandle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwOpenProcessTokenEx( @@ -401,7 +414,7 @@ OUT PHANDLE TokenHandle ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwPrivilegeCheck( @@ -410,7 +423,7 @@ IN PBOOLEAN Result ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwPrivilegedServiceAuditAlarm( @@ -421,7 +434,7 @@ IN BOOLEAN AccessGranted ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwPrivilegeObjectAuditAlarm( @@ -433,7 +446,7 @@ IN BOOLEAN AccessGranted ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationToken( @@ -444,7 +457,7 @@ OUT PULONG ReturnLength ); -NTSYSCALLAPI +NTSYSAPI NTSTATUS NTAPI ZwSetInformationToken( Index: include/reactos/debug.h =================================================================== --- include/reactos/debug.h (revision 21221) +++ include/reactos/debug.h (working copy) @@ -33,6 +33,7 @@ IN ... ); +NTSYSAPI VOID NTAPI RtlAssert( Index: lib/crt/include/internal/wine/msvcrt.h =================================================================== --- lib/crt/include/internal/wine/msvcrt.h (revision 21221) +++ lib/crt/include/internal/wine/msvcrt.h (working copy) @@ -129,7 +129,7 @@ typedef void (*free_func_t)(void*); #define MSVCRT_malloc malloc #define MSVCRT_free free -VOID STDCALL RtlAssert(PVOID FailedAssertion,PVOID FileName,ULONG LineNumber,PCHAR Message); +NTSYSAPI VOID NTAPI RtlAssert(PVOID FailedAssertion,PVOID FileName,ULONG LineNumber,PCHAR Message); extern char* __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); #endif /* __WINE_MSVCRT_H */ Index: lib/crt/stdio/flsbuf.c =================================================================== --- lib/crt/stdio/flsbuf.c (revision 21221) +++ lib/crt/stdio/flsbuf.c (working copy) @@ -128,7 +128,7 @@ while (bufsiz > 0) { *endp = *(endp - n); if (*endp == '\n') { - *endp--; + endp--; n--; *endp = '\r'; } Index: lib/drivers/csq/csq.c =================================================================== --- lib/drivers/csq/csq.c (revision 21221) +++ lib/drivers/csq/csq.c (working copy) @@ -25,9 +25,8 @@ */ /* $Id$ */ -#define __NTDRIVER__ -#include #include +#include static VOID NTAPI IopCsqCancelRoutine(PDEVICE_OBJECT DeviceObject, @@ -254,7 +253,7 @@ } /* Step 2: Set our cancel routine */ - IoSetCancelRoutine(Irp, IopCsqCancelRoutine); + (void)IoSetCancelRoutine(Irp, IopCsqCancelRoutine); /* Step 3: Deal with an IRP that is already canceled */ if(!Irp->Cancel) Index: lib/epsapi/enum/processes.c =================================================================== --- lib/epsapi/enum/processes.c (revision 21221) +++ lib/epsapi/enum/processes.c (working copy) @@ -161,7 +161,7 @@ IN PTHREAD_ENUM_ROUTINE ThreadCallback, IN OUT PVOID ThreadCallbackContext) { - PSYSTEM_PROCESS_INFORMATION pInfoBuffer; + PSYSTEM_PROCESS_INFORMATION pInfoBuffer = NULL; NTSTATUS Status; if(ProcessCallback == NULL && ThreadCallback == NULL) Index: lib/rossym/find.c =================================================================== --- lib/rossym/find.c (revision 21221) +++ lib/rossym/find.c (working copy) @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#define NTOSAPI #include #include #include "rossympriv.h" Index: lib/rossym/rossym.rbuild =================================================================== --- lib/rossym/rossym.rbuild (revision 21221) +++ lib/rossym/rossym.rbuild (working copy) @@ -1,5 +1,6 @@ + delete.c find.c fromfile.c Index: lib/rtl/unicode.c =================================================================== --- lib/rtl/unicode.c (revision 21221) +++ lib/rtl/unicode.c (working copy) @@ -965,7 +965,7 @@ NTAPI RtlOemStringToUnicodeString( IN OUT PUNICODE_STRING UniDest, - IN PCOEM_STRING OemSource, + IN POEM_STRING OemSource, IN BOOLEAN AllocateDestinationString) { NTSTATUS Status; Index: lib/string/string.rbuild =================================================================== --- lib/string/string.rbuild (revision 21221) +++ lib/string/string.rbuild (working copy) @@ -4,6 +4,11 @@ + + + "extern __attribute__ ((dllexport))" + memchr_asm.s Index: ntoskrnl/ex/handle.c =================================================================== --- ntoskrnl/ex/handle.c (revision 21221) +++ ntoskrnl/ex/handle.c (working copy) @@ -616,10 +616,10 @@ (cure - 1)->u2.NextFreeTableEntry = -1; /* save the pointers to the allocated list(s) */ - InterlockedExchangePointer(&nmtbl[mli], ntbl); + (void)InterlockedExchangePointer(&nmtbl[mli], ntbl); if(AllocatedMtbl) { - InterlockedExchangePointer(&HandleTable->Table[tli], nmtbl); + (void)InterlockedExchangePointer(&HandleTable->Table[tli], nmtbl); } /* increment the NextIndexNeedingPool to the next index where we need to @@ -651,7 +651,7 @@ /* automatically unlock the entry if currently locked. We however don't notify anyone who waited on the handle because we're holding an exclusive lock after all and these locks will fail then */ - InterlockedExchangePointer(&Entry->u1.Object, NULL); + (void)InterlockedExchangePointer(&Entry->u1.Object, NULL); Entry->u2.NextFreeTableEntry = HandleTable->FirstFreeTableEntry; HandleTable->FirstFreeTableEntry = Handle; @@ -762,8 +762,8 @@ New = Current & ~EX_HANDLE_ENTRY_LOCKED; - InterlockedExchangePointer(&Entry->u1.Object, - (PVOID)New); + (void)InterlockedExchangePointer(&Entry->u1.Object, + (PVOID)New); /* we unlocked the entry, pulse the contention event so threads who're waiting on the release can continue */ Index: ntoskrnl/ex/resource.c =================================================================== --- ntoskrnl/ex/resource.c (revision 21221) +++ ntoskrnl/ex/resource.c (working copy) @@ -109,6 +109,9 @@ DbgBreakPoint(); } } +#else +#define ExpVerifyResource(r) +#define ExpCheckForApcsDisabled(b,r,t) #endif /*++ @@ -598,10 +601,13 @@ ExpWaitForResource(IN PERESOURCE Resource, IN PVOID Object) { +#if DBG ULONG i; - ULONG Size, WaitCount = 0; + ULONG Size; KIRQL OldIrql; POWNER_ENTRY Owner; +#endif + ULONG WaitCount = 0; NTSTATUS Status; LARGE_INTEGER Timeout; Index: ntoskrnl/fs/filelock.c =================================================================== --- ntoskrnl/fs/filelock.c (revision 21221) +++ ntoskrnl/fs/filelock.c (working copy) @@ -1021,7 +1021,7 @@ Irp->Tail.Overlay.DriverContext[3] = &LockToc->SpinLock; Irp->Tail.Overlay.DriverContext[2] = Context; - IoSetCancelRoutine(Irp, FsRtlpFileLockCancelRoutine); + (void)IoSetCancelRoutine(Irp, FsRtlpFileLockCancelRoutine); if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { //irp was canceled Index: ntoskrnl/fs/notify.c =================================================================== --- ntoskrnl/fs/notify.c (revision 21221) +++ ntoskrnl/fs/notify.c (working copy) @@ -488,7 +488,7 @@ /* save NotifySych for use in the cancel routine */ Irp->Tail.Overlay.DriverContext[3] = NotifySync; - IoSetCancelRoutine(Irp, FsRtlpNotifyCancelRoutine); + (void)IoSetCancelRoutine(Irp, FsRtlpNotifyCancelRoutine); if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { //irp was canceled Index: ntoskrnl/include/ntoskrnl.h =================================================================== --- ntoskrnl/include/ntoskrnl.h (revision 21221) +++ ntoskrnl/include/ntoskrnl.h (working copy) @@ -13,8 +13,8 @@ #define _NTSYSTEM_ /* DDK/IFS/NDK Headers */ +#include #include -#include #include #include #undef TEXT Index: ntoskrnl/ke/clock.c =================================================================== --- ntoskrnl/ke/clock.c (revision 21221) +++ ntoskrnl/ke/clock.c (working copy) @@ -267,8 +267,8 @@ if (TrapFrame->SegCs & MODE_MASK || TrapFrame->EFlags & X86_EFLAGS_VM) { - InterlockedIncrementUL(&CurrentThread->UserTime); - InterlockedIncrementUL(&CurrentProcess->UserTime); + (void)InterlockedIncrementUL(&CurrentThread->UserTime); + (void)InterlockedIncrementUL(&CurrentProcess->UserTime); Prcb->UserTime++; } else @@ -283,8 +283,8 @@ } else { - InterlockedIncrementUL(&CurrentThread->KernelTime); - InterlockedIncrementUL(&CurrentProcess->KernelTime); + (void)InterlockedIncrementUL(&CurrentThread->KernelTime); + (void)InterlockedIncrementUL(&CurrentProcess->KernelTime); Prcb->KernelTime++; } } Index: ntoskrnl/ke/ipi.c =================================================================== --- ntoskrnl/ke/ipi.c (revision 21221) +++ ntoskrnl/ke/ipi.c (working copy) @@ -72,7 +72,7 @@ if (Ke386TestAndClearBit(IPI_SYNCH_REQUEST, &Prcb->IpiFrozen)) { - InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]); + (void)InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { #ifdef DBG @@ -109,7 +109,7 @@ #endif } } - InterlockedExchangePointer(&Prcb->SignalDone, NULL); + (void)InterlockedExchangePointer(&Prcb->SignalDone, NULL); } DPRINT("KiIpiServiceRoutine done\n"); return TRUE; @@ -128,11 +128,11 @@ ASSERT(KeGetCurrentIrql() == SYNCH_LEVEL); CurrentPrcb = KeGetCurrentPrcb(); - InterlockedExchangeUL(&CurrentPrcb->TargetSet, TargetSet); - InterlockedExchangeUL(&CurrentPrcb->WorkerRoutine, (ULONG_PTR)WorkerRoutine); - InterlockedExchangePointer(&CurrentPrcb->CurrentPacket[0], Argument); - InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[1], Count); - InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[2], Synchronize ? 1 : 0); + (void)InterlockedExchangeUL(&CurrentPrcb->TargetSet, TargetSet); + (void)InterlockedExchangeUL(&CurrentPrcb->WorkerRoutine, (ULONG_PTR)WorkerRoutine); + (void)InterlockedExchangePointer(&CurrentPrcb->CurrentPacket[0], Argument); + (void)InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[1], Count); + (void)InterlockedExchangeUL(&CurrentPrcb->CurrentPacket[2], Synchronize ? 1 : 0); for (i = 0, Processor = 1; i < KeNumberProcessors; i++, Processor <<= 1) { Index: ntoskrnl/mm/balance.c =================================================================== --- ntoskrnl/mm/balance.c (revision 21221) +++ ntoskrnl/mm/balance.c (working copy) @@ -104,7 +104,7 @@ KeAcquireSpinLock(&AllocationListLock, &oldIrql); if (MmGetReferenceCountPage(Page) == 1) { - InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); if (IsListEmpty(&AllocationListHead) || MmStats.NrFreePages < MiMinimumAvailablePages) { KeReleaseSpinLock(&AllocationListLock, oldIrql); @@ -199,7 +199,7 @@ { if (!CanWait) { - InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); return(STATUS_NO_MEMORY); } MiTrimMemoryConsumer(Consumer); @@ -233,7 +233,7 @@ if (!CanWait) { - InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); + (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); return(STATUS_NO_MEMORY); } @@ -241,7 +241,7 @@ Request.Page = 0; KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); - InterlockedIncrementUL(&MiPagesRequired); + (void)InterlockedIncrementUL(&MiPagesRequired); KeAcquireSpinLock(&AllocationListLock, &oldIrql); @@ -265,7 +265,7 @@ } MmTransferOwnershipPage(Page, Consumer); *AllocatedPage = Page; - InterlockedDecrementUL(&MiPagesRequired); + (void)InterlockedDecrementUL(&MiPagesRequired); return(STATUS_SUCCESS); } Index: ntoskrnl/mm/i386/page.c =================================================================== --- ntoskrnl/mm/i386/page.c (revision 21221) +++ ntoskrnl/mm/i386/page.c (working copy) @@ -420,7 +420,7 @@ if (Ke386Pae) { ULONGLONG ZeroPde = 0LL; - ExfpInterlockedExchange64UL(PAE_ADDR_TO_PDE(Address), &ZeroPde); + (void)ExfpInterlockedExchange64UL(PAE_ADDR_TO_PDE(Address), &ZeroPde); MiFlushTlb((PULONG)PAE_ADDR_TO_PDE(Address), PAE_ADDR_TO_PTE(Address)); } else @@ -467,7 +467,7 @@ } } Pfn = PAE_PTE_TO_PFN(*(PAE_ADDR_TO_PDE(Address))); - ExfpInterlockedExchange64UL(PAE_ADDR_TO_PDE(Address), &ZeroPte); + (void)ExfpInterlockedExchange64UL(PAE_ADDR_TO_PDE(Address), &ZeroPte); MiFlushTlb((PULONG)PAE_ADDR_TO_PDE(Address), PAE_ADDR_TO_PTE(Address)); } else @@ -593,7 +593,7 @@ MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } } - ExfInterlockedCompareExchange64UL(PageDir, &MmGlobalKernelPageDirectoryForPAE[PAE_ADDR_TO_PDE_OFFSET(Address)], &ZeroEntry); + (void)ExfInterlockedCompareExchange64UL(PageDir, &MmGlobalKernelPageDirectoryForPAE[PAE_ADDR_TO_PDE_OFFSET(Address)], &ZeroEntry); } else { @@ -690,7 +690,7 @@ MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } } - InterlockedExchangeUL(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); + (void)InterlockedExchangeUL(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); } else { @@ -894,7 +894,7 @@ /* * Set the entry to zero */ - ExfpInterlockedExchange64UL(Pt, &ZeroPte); + (void)ExfpInterlockedExchange64UL(Pt, &ZeroPte); MiFlushTlb((PULONG)Pt, Address); } } @@ -908,7 +908,7 @@ /* * Set the entry to zero */ - InterlockedExchangeUL(Pt, 0); + (void)InterlockedExchangeUL(Pt, 0); MiFlushTlb(Pt, Address); } } @@ -1613,7 +1613,7 @@ { KEBUGCHECK(0); } - InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); } } @@ -1683,7 +1683,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - InterlockedExchangeUL(Pt, SwapEntry << 1); + (void)InterlockedExchangeUL(Pt, SwapEntry << 1); if (Pte != 0) { MiFlushTlb(Pt, Address); @@ -1886,7 +1886,7 @@ { MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } - InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Address < MmSystemRangeStart && Process->AddressSpace.PageTableRefCountTable != NULL && Attributes & PA_PRESENT) @@ -2322,7 +2322,7 @@ { if (i * 512 + Offset < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) || i * 512 + Offset >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)+4) { - ExfInterlockedCompareExchange64UL(&Pde[Offset], &MmGlobalKernelPageDirectoryForPAE[i*512 + Offset], &ZeroPde); + (void)ExfInterlockedCompareExchange64UL(&Pde[Offset], &MmGlobalKernelPageDirectoryForPAE[i*512 + Offset], &ZeroPde); } } MmUnmapPageTable((PULONG)Pde); @@ -2346,7 +2346,7 @@ { if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)) { - InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); + (void)InterlockedCompareExchangeUL(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); } } if (Pde != (PULONG)PAGEDIRECTORY_MAP) @@ -2374,7 +2374,7 @@ !(i >= PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) && i < PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) + 2) && 0LL == MmGlobalKernelPageDirectoryForPAE[i] && 0LL != CurrentPageDirectory[i]) { - ExfpInterlockedExchange64UL(&MmGlobalKernelPageDirectoryForPAE[i], &CurrentPageDirectory[i]); + (void)ExfpInterlockedExchange64UL(&MmGlobalKernelPageDirectoryForPAE[i], &CurrentPageDirectory[i]); if (Ke386GlobalPagesEnabled) { MmGlobalKernelPageDirectoryForPAE[i] |= PA_GLOBAL; Index: ntoskrnl/mm/pageop.c =================================================================== --- ntoskrnl/mm/pageop.c (revision 21221) +++ ntoskrnl/mm/pageop.c (working copy) @@ -46,7 +46,7 @@ KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return; } - InterlockedDecrementUL(&PageOp->MArea->PageOpCount); + (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); PrevPageOp = MmPageOpHashTable[PageOp->Hash]; if (PrevPageOp == PageOp) { @@ -236,7 +236,7 @@ PageOp->MArea = MArea; KeInitializeEvent(&PageOp->CompletionEvent, NotificationEvent, FALSE); MmPageOpHashTable[Hash] = PageOp; - InterlockedIncrementUL(&MArea->PageOpCount); + (void)InterlockedIncrementUL(&MArea->PageOpCount); KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return(PageOp); Index: ntoskrnl/mm/rmap.c =================================================================== --- ntoskrnl/mm/rmap.c (revision 21221) +++ ntoskrnl/mm/rmap.c (working copy) @@ -481,7 +481,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } } @@ -517,7 +517,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } return; } Index: ntoskrnl/mm/section.c =================================================================== --- ntoskrnl/mm/section.c (revision 21221) +++ ntoskrnl/mm/section.c (working copy) @@ -2111,7 +2111,7 @@ } else { - InterlockedDecrementUL(&Section->Segment->ReferenceCount); + (void)InterlockedDecrementUL(&Section->Segment->ReferenceCount); } } if (Section->FileObject != NULL) @@ -2499,7 +2499,7 @@ (PMM_SECTION_SEGMENT)FileObject->SectionObjectPointer-> DataSectionObject; Section->Segment = Segment; - InterlockedIncrementUL(&Segment->ReferenceCount); + (void)InterlockedIncrementUL(&Segment->ReferenceCount); MmLockSectionSegment(Segment); if (MaximumSize.u.LowPart > Segment->RawLength && @@ -3309,7 +3309,7 @@ for (i = 0; i < ImageSectionObject->NrSegments; i++) { - InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); + (void)InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); } } @@ -3337,7 +3337,7 @@ */ for (i = 0; i < ImageSectionObject->NrSegments; i++) { - InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); + (void)InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); } Status = STATUS_SUCCESS; Index: ntoskrnl/ps/job.c =================================================================== --- ntoskrnl/ps/job.c (revision 21221) +++ ntoskrnl/ps/job.c (working copy) @@ -552,7 +552,7 @@ ULONG UIRestrictionsClass) { ASSERT(Job); - InterlockedExchangeUL(&Job->UIRestrictionsClass, UIRestrictionsClass); + (void)InterlockedExchangeUL(&Job->UIRestrictionsClass, UIRestrictionsClass); /* FIXME - walk through the job process list and update the restrictions? */ } Index: ntoskrnl/ps/kill.c =================================================================== --- ntoskrnl/ps/kill.c (revision 21221) +++ ntoskrnl/ps/kill.c (working copy) @@ -329,9 +329,9 @@ * unset it. */ KeRaiseIrql(DISPATCH_LEVEL, &oldIrql); - InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, - NULL, - (PKPROCESS)CurrentThread); + (void)InterlockedCompareExchangePointer(&KeGetCurrentPrcb()->NpxThread, + NULL, + (PVOID)CurrentThread); KeLowerIrql(oldIrql); /* Rundown Mutexes */ Index: ntoskrnl/ps/process.c =================================================================== --- ntoskrnl/ps/process.c (revision 21221) +++ ntoskrnl/ps/process.c (working copy) @@ -98,7 +98,7 @@ if(InterlockedDecrementUL(&Process->LockCount) == 0) { - InterlockedExchangePointer(&Process->LockOwner, NULL); + (void)InterlockedExchangePointer(&Process->LockOwner, NULL); KeSetEvent(&Process->LockEvent, IO_NO_INCREMENT, FALSE); } Index: ntoskrnl/ps/quota.c =================================================================== --- ntoskrnl/ps/quota.c (revision 21221) +++ ntoskrnl/ps/quota.c (working copy) @@ -25,7 +25,7 @@ ASSERT(QuotaBlock != NULL); - InterlockedIncrementUL(&QuotaBlock->ReferenceCount); + (void)InterlockedIncrementUL(&QuotaBlock->ReferenceCount); Process->QuotaBlock = QuotaBlock; } Index: subsystems/win32/win32k/eng/semaphor.c =================================================================== --- subsystems/win32/win32k/eng/semaphor.c (revision 21221) +++ subsystems/win32/win32k/eng/semaphor.c (working copy) @@ -102,7 +102,9 @@ InterlockedDecrement(&Semaphore->lCount); return FALSE; } - InterlockedExchangePointer((volatile PVOID *)&Semaphore->hsem, hSem); + /* FIXME - not thread-safe! Check result of InterlockedCompareExchangePointer + and delete semaphore if already initialized! */ + (void)InterlockedExchangePointer((volatile PVOID *)&Semaphore->hsem, hSem); } else { @@ -124,8 +126,9 @@ { if (InterlockedDecrement(&Semaphore->lCount) == 0) { + /* FIXME - not thread-safe! Use result of InterlockedCompareExchangePointer! */ EngDeleteSemaphore(Semaphore->hsem); - InterlockedExchangePointer((volatile PVOID *)&Semaphore->hsem, NULL); + (void)InterlockedExchangePointer((volatile PVOID *)&Semaphore->hsem, NULL); } } Index: subsystems/win32/win32k/objects/gdiobj.c =================================================================== --- subsystems/win32/win32k/objects/gdiobj.c (revision 21221) +++ subsystems/win32/win32k/objects/gdiobj.c (working copy) @@ -398,7 +398,7 @@ Entry->Type = TypeInfo; /* unlock the entry */ - InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); + (void)InterlockedExchangePointer(&Entry->ProcessId, CurrentProcessId); #ifdef GDI_DEBUG memset ( GDIHandleAllocator[Index], 0xcd, GDI_STACK_LEVELS * sizeof(ULONG) ); @@ -520,7 +520,7 @@ Entry->KernelData = NULL; /* unlock the handle slot */ - InterlockedExchangePointer(&Entry->ProcessId, NULL); + (void)InterlockedExchangePointer(&Entry->ProcessId, NULL); /* push this entry to the free list */ InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, @@ -565,7 +565,7 @@ { DPRINT1("Attempted to delete object 0x%x which was already deleted!\n", hObj); } - InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); } } else if(PrevProcId == LockedProcessId) @@ -788,7 +788,7 @@ InterlockedDecrement((PLONG)&GdiHdr->Locks); /* Unlock the handle table entry. */ - InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); DelayExecution(); continue; @@ -824,7 +824,7 @@ } /* Unlock the handle table entry. */ - InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); break; } @@ -961,7 +961,7 @@ } /* Unlock the handle table entry. */ - InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId); break; } @@ -1111,7 +1111,7 @@ } /* remove the process id lock and make it global */ - InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); + (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); @@ -1132,7 +1132,7 @@ /* WTF?! The object is already locked by a different thread! Release the lock, wait a bit and try again! FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1236,7 +1236,7 @@ ProcessId = 0; /* remove the process id lock and change it to the new process id */ - InterlockedExchangePointer(&Entry->ProcessId, ProcessId); + (void)InterlockedExchangePointer(&Entry->ProcessId, ProcessId); /* we're done! */ return; @@ -1258,7 +1258,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); + (void)InterlockedExchangePointer(&Entry->ProcessId, PrevProcId); DelayExecution(); goto LockHandle; @@ -1357,7 +1357,7 @@ GDIOBJ_SetOwnership(CopyTo, NULL); } - InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); + (void)InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); } else { @@ -1376,7 +1376,7 @@ being deleted in the meantime (because we don't have aquired a reference at this point). FIXME - we should give up after some time unless we want to wait forever! */ - InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); + (void)InterlockedExchangePointer(&FromEntry->ProcessId, FromPrevProcId); DelayExecution(); goto LockHandleFrom; Index: subsystems/win32/win32k/objects/rect.c =================================================================== --- subsystems/win32/win32k/objects/rect.c (revision 21221) +++ subsystems/win32/win32k/objects/rect.c (working copy) @@ -186,7 +186,7 @@ BOOL STDCALL NtGdiUnionRect(PRECT UnsafeDest, const RECT* UnsafeSrc1, const RECT* UnsafeSrc2) { - RECT Dest, Src1, Src2; + RECT Dest, Src1 = {0}, Src2 = {0}; NTSTATUS Status = STATUS_SUCCESS; BOOL Ret;