Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 17657: Fix compilation when ENABLE_VALIDATE_POOL is defined
by gvg＠svn.reactos.com 05 Sep '05

05 Sep '05

Fix compilation when ENABLE_VALIDATE_POOL is defined Modified: trunk/reactos/ntoskrnl/mm/npool.c _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-09-05 09:25:06 UTC (rev 17656) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-09-05 09:26:02 UTC (rev 17657) @@ -1049,8 +1049,8 @@ DbgPrint("intersecting blocks on list\n"); KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0); } - if ( (ULONG_PTR)current < base && - ((ULONG_PTR)current + current->hdr.Size) > base ) + if ( (ULONG_PTR)used < base && + ((ULONG_PTR)used + used->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0); @@ -1077,7 +1077,7 @@ p = avl_get_first(FreeBlockListRoot); while (p) { - freet = CONTAINING_RECORD(p, HDR_FREE, Node); + free = CONTAINING_RECORD(p, HDR_FREE, Node); check_duplicates(&free->hdr); p = avl_get_next(FreeBlockListRoot, p); }

1 0

[gvg] 17656: The kernel extension is really a EXTENDED_DEVOBJ_EXTENSION now
by gvg＠svn.reactos.com 05 Sep '05

05 Sep '05

The kernel extension is really a EXTENDED_DEVOBJ_EXTENSION now Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-09-05 08:17:08 UTC (rev 17655) +++ trunk/reactos/ntoskrnl/io/device.c 2005-09-05 09:25:06 UTC (rev 17656) @@ -455,7 +455,7 @@ /* Total Size */ TotalSize = AlignedDeviceExtensionSize + - sizeof(DEVICE_OBJECT) + sizeof(DEVOBJ_EXTENSION); + sizeof(DEVICE_OBJECT) + sizeof(EXTENDED_DEVOBJ_EXTENSION); DPRINT("TotalSize %x\n", TotalSize); /* Create the Device Object */

1 0

[gvg] 17655: Wine-20050830 vendor drop
by gvg＠svn.reactos.com 05 Sep '05

05 Sep '05

Wine-20050830 vendor drop Modified: vendor/wine/dlls/cabinet/current/cabinet.h Modified: vendor/wine/dlls/cabinet/current/cabinet.spec Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c Modified: vendor/wine/dlls/comctl32/current/Makefile.in Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32.h Modified: vendor/wine/dlls/comctl32/current/comctl32.spec Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/current/commctrl.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/dpa.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/ipaddress.c Modified: vendor/wine/dlls/comctl32/current/listview.c Modified: vendor/wine/dlls/comctl32/current/monthcal.c Modified: vendor/wine/dlls/comctl32/current/progress.c Modified: vendor/wine/dlls/comctl32/current/propsheet.c Modified: vendor/wine/dlls/comctl32/current/rebar.c Modified: vendor/wine/dlls/comctl32/current/status.c Modified: vendor/wine/dlls/comctl32/current/tab.c Modified: vendor/wine/dlls/comctl32/current/toolbar.c Modified: vendor/wine/dlls/comctl32/current/tooltips.c Modified: vendor/wine/dlls/comctl32/current/trackbar.c Modified: vendor/wine/dlls/comctl32/current/treeview.c Modified: vendor/wine/dlls/commdlg/current/cdlg32.c Modified: vendor/wine/dlls/commdlg/current/filedlg.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.c Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.h Modified: vendor/wine/dlls/commdlg/current/printdlg.c Modified: vendor/wine/dlls/dinput8/current/Makefile.in Modified: vendor/wine/dlls/dinput8/current/dinput8.spec Modified: vendor/wine/dlls/dinput8/current/dinput8_main.c Modified: vendor/wine/dlls/dsound/current/capture.c Modified: vendor/wine/dlls/dsound/current/dsound_main.c Modified: vendor/wine/dlls/dsound/current/mixer.c Modified: vendor/wine/dlls/dsound/current/primary.c Modified: vendor/wine/dlls/icmp/current/icmp_main.c Modified: vendor/wine/dlls/midimap/current/midimap.spec Modified: vendor/wine/dlls/mpr/current/mpr.spec Modified: vendor/wine/dlls/mpr/current/mpr_main.c Modified: vendor/wine/dlls/msi/current/action.c Modified: vendor/wine/dlls/msi/current/action.h Modified: vendor/wine/dlls/msi/current/classes.c Modified: vendor/wine/dlls/msi/current/create.c Modified: vendor/wine/dlls/msi/current/custom.c Modified: vendor/wine/dlls/msi/current/delete.c Modified: vendor/wine/dlls/msi/current/events.c Modified: vendor/wine/dlls/msi/current/files.c Modified: vendor/wine/dlls/msi/current/format.c Modified: vendor/wine/dlls/msi/current/helpers.c Modified: vendor/wine/dlls/msi/current/insert.c Modified: vendor/wine/dlls/msi/current/install.c Modified: vendor/wine/dlls/msi/current/msi.c Modified: vendor/wine/dlls/msi/current/msi.spec Modified: vendor/wine/dlls/msi/current/msipriv.h Modified: vendor/wine/dlls/msi/current/msiquery.c Modified: vendor/wine/dlls/msi/current/package.c Modified: vendor/wine/dlls/msi/current/regsvr.c Modified: vendor/wine/dlls/msi/current/select.c Modified: vendor/wine/dlls/msi/current/table.c Modified: vendor/wine/dlls/msimg32/current/msimg32.spec Modified: vendor/wine/dlls/ole32/current/antimoniker.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj.spec Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/ifs.h Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/moniker.c Modified: vendor/wine/dlls/ole32/current/moniker.h Modified: vendor/wine/dlls/ole32/current/ole16.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/ole2.spec Modified: vendor/wine/dlls/ole32/current/ole2_16.c Modified: vendor/wine/dlls/ole32/current/ole32.spec Modified: vendor/wine/dlls/ole32/current/oleproxy.c Modified: vendor/wine/dlls/ole32/current/stg_prop.c Modified: vendor/wine/dlls/ole32/current/storage.c Modified: vendor/wine/dlls/ole32/current/storage.spec Modified: vendor/wine/dlls/ole32/current/storage32.c Modified: vendor/wine/dlls/oleaut32/current/oleaut.c Modified: vendor/wine/dlls/oleaut32/current/oleaut32.spec Modified: vendor/wine/dlls/oleaut32/current/olefont.c Modified: vendor/wine/dlls/oleaut32/current/olepicture.c Modified: vendor/wine/dlls/oleaut32/current/regsvr.c Modified: vendor/wine/dlls/oleaut32/current/safearray.c Modified: vendor/wine/dlls/oleaut32/current/tmarshal.c Modified: vendor/wine/dlls/oleaut32/current/typelib.c Modified: vendor/wine/dlls/oleaut32/current/typelib.h Modified: vendor/wine/dlls/oleaut32/current/typelib2.c Modified: vendor/wine/dlls/oleaut32/current/varformat.c Modified: vendor/wine/dlls/oleaut32/current/variant.c [truncated at 100 lines; 82 more skipped] _____ Modified: vendor/wine/dlls/cabinet/current/cabinet.h --- vendor/wine/dlls/cabinet/current/cabinet.h 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/cabinet/current/cabinet.h 2005-09-05 08:17:08 UTC (rev 17655) @@ -324,15 +324,15 @@ cab_ULONG cDataBlocks; cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ /* of spanned file of a spanning folder of a spanning cabinet */ - cab_UBYTE szFileNameCFDATA1[CB_MAX_FILENAME]; + char szFileNameCFDATA1[CB_MAX_FILENAME]; int handleCFDATA1; - cab_UBYTE szFileNameCFFILE1[CB_MAX_FILENAME]; + char szFileNameCFFILE1[CB_MAX_FILENAME]; int handleCFFILE1; - cab_UBYTE szFileNameCFDATA2[CB_MAX_FILENAME]; + char szFileNameCFDATA2[CB_MAX_FILENAME]; int handleCFDATA2; - cab_UBYTE szFileNameCFFILE2[CB_MAX_FILENAME]; + char szFileNameCFFILE2[CB_MAX_FILENAME]; int handleCFFILE2; - cab_UBYTE szFileNameCFFOLDER[CB_MAX_FILENAME]; + char szFileNameCFFOLDER[CB_MAX_FILENAME]; int handleCFFOLDER; cab_ULONG sizeFileCFDATA1; cab_ULONG sizeFileCFFILE1; _____ Modified: vendor/wine/dlls/cabinet/current/cabinet.spec --- vendor/wine/dlls/cabinet/current/cabinet.spec 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/cabinet/current/cabinet.spec 2005-09-05 08:17:08 UTC (rev 17655) @@ -1,5 +1,5 @@ 1 stub GetDllVersion -2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion +2 stdcall -private DllGetVersion (ptr) 3 stdcall Extract(ptr str) 4 stub DeleteExtractedFiles 10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) _____ Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c --- vendor/wine/dlls/cabinet/current/cabinet_main.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/cabinet/current/cabinet_main.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -52,7 +52,7 @@ * NOTES * Supposedly returns version from IE6SP1RP1 */ -HRESULT WINAPI CABINET_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { WARN("hmmm... not right version number \"5.1.1106.1\"?\n"); _____ Modified: vendor/wine/dlls/comctl32/current/Makefile.in --- vendor/wine/dlls/comctl32/current/Makefile.in 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/Makefile.in 2005-09-05 08:17:08 UTC (rev 17655) @@ -31,10 +31,15 @@ propsheet.c \ rebar.c \ smoothscroll.c \ + status.c \ string.c \ - status.c \ syslink.c \ tab.c \ + theme_combo.c \ + theme_dialog.c \ + theme_edit.c \ + theme_listbox.c \ + theming.c \ toolbar.c \ tooltips.c \ trackbar.c \ _____ Modified: vendor/wine/dlls/comctl32/current/animate.c --- vendor/wine/dlls/comctl32/current/animate.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/animate.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -53,7 +53,7 @@ HMODULE hModule; HIC (WINAPI *fnICOpen)(DWORD, DWORD, UINT); LRESULT (WINAPI *fnICClose)(HIC); - LRESULT (WINAPI *fnICSendMessage)(HIC, UINT, DWORD, DWORD); + LRESULT (WINAPI *fnICSendMessage)(HIC, UINT, DWORD_PTR, DWORD_PTR); DWORD (WINAPIV *fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER, LPVOID); } fnIC; @@ -139,7 +139,8 @@ { infoPtr->hMMio = mmioOpenW(lpName, 0, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); - return (BOOL)infoPtr->hMMio; + if(!infoPtr->hMMio) return FALSE; + return TRUE; } @@ -655,14 +656,14 @@ } outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, - (DWORD)infoPtr->inbih, 0L); + (DWORD_PTR)infoPtr->inbih, 0L); infoPtr->outbih = Alloc(outSize); if (!infoPtr->outbih) return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, - (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != outSize) + (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != outSize) { WARN("Can't get output BIH\n"); return FALSE; @@ -673,7 +674,7 @@ return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, - (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) { + (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) { WARN("Can't begin decompression\n"); return FALSE; } @@ -696,10 +697,10 @@ if (!hInstance) hInstance = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); - if (HIWORD(lpszName)) - { - TRACE("(\"%s\");\n", debugstr_w(lpszName)); + TRACE("(%s)\n", debugstr_w(lpszName)); + if (HIWORD(lpszName)) + { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { TRACE("No AVI resource found!\n"); @@ -712,9 +713,7 @@ } else { - TRACE("(%u);\n", (WORD)(DWORD)lpszName); - - if (!ANIMATE_LoadResW(infoPtr, hInstance, MAKEINTRESOURCEW((INT)lpszName))) + if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { WARN("No AVI resource found!\n"); return FALSE; _____ Modified: vendor/wine/dlls/comctl32/current/comboex.c --- vendor/wine/dlls/comctl32/current/comboex.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/comboex.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -839,10 +839,10 @@ } -static DWORD COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) +static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) { CBE_ITEMDATA *item1, *item2; - DWORD ret = 0; + DWORD_PTR ret = 0; item1 = get_item_data(infoPtr, index); if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) { @@ -854,7 +854,7 @@ if (item1->mask & CBEIF_LPARAM) ret = item1->lParam; TRACE("returning 0x%08lx\n", ret); } else { - ret = (DWORD)item1; + ret = (DWORD_PTR)item1; TRACE("non-valid result from combo, returning 0x%08lx\n", ret); } return ret; @@ -878,7 +878,7 @@ } -static DWORD COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD data) +static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PTR data) { CBE_ITEMDATA *item1, *item2; @@ -894,8 +894,8 @@ TRACE("setting lparam to 0x%08lx\n", data); return 0; } - TRACE("non-valid result from combo 0x%08lx\n", (DWORD)item1); - return (LRESULT)item1; + TRACE("non-valid result from combo %p\n", item1); + return (DWORD_PTR)item1; } @@ -1136,10 +1136,10 @@ n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0); for (cursel = 0; cursel < n; cursel++){ item = get_item_data(infoPtr, cursel); - if ((INT)item == CB_ERR) break; + if ((INT_PTR)item == CB_ERR) break; if (!cmptext(COMBOEX_GetText(infoPtr, item), wintext)) break; } - if ((cursel == n) || ((INT)item == CB_ERR)) { + if ((cursel == n) || ((INT_PTR)item == CB_ERR)) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); if (infoPtr->hwndEdit) @@ -1149,7 +1149,7 @@ } else { item = get_item_data(infoPtr, cursel); - if ((INT)item == CB_ERR) { + if ((INT_PTR)item == CB_ERR) { TRACE("failed to find match??? item=%p cursel=%d\n", item, cursel); if (infoPtr->hwndEdit) @@ -2223,7 +2223,7 @@ return COMBOEX_SetCursel (infoPtr, (INT)wParam); case CB_SETITEMDATA: - return COMBOEX_SetItemData (infoPtr, (INT)wParam, (DWORD)lParam); + return COMBOEX_SetItemData (infoPtr, (INT)wParam, (DWORD_PTR)lParam); case CB_SETITEMHEIGHT: return COMBOEX_SetItemHeight (infoPtr, (INT)wParam, (UINT)lParam); _____ Modified: vendor/wine/dlls/comctl32/current/comctl32.h --- vendor/wine/dlls/comctl32/current/comctl32.h 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/comctl32.h 2005-09-05 08:17:08 UTC (rev 17655) @@ -249,4 +249,8 @@ to->wMilliseconds = from->wMilliseconds; } +extern void THEMING_Initialize(void); +extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM); +extern void THEMING_SetSubclassData(HWND, ULONG_PTR); + #endif /* __WINE_COMCTL32_H */ _____ Modified: vendor/wine/dlls/comctl32/current/comctl32.spec --- vendor/wine/dlls/comctl32/current/comctl32.spec 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/comctl32.spec 2005-09-05 08:17:08 UTC (rev 17655) @@ -123,8 +123,8 @@ @ stdcall CreateStatusWindowW(long wstr long long) @ stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) @ stdcall DestroyPropertySheetPage(long) -@ stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion -@ stdcall DllInstall(long ptr) COMCTL32_DllInstall +@ stdcall -private DllGetVersion(ptr) +@ stdcall -private DllInstall(long wstr) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) @ stdcall FlatSB_EnableScrollBar (long long long) _____ Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c --- vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/comctl32undoc.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -274,7 +274,6 @@ HKEY newkey; WCHAR realname[2]; LPWINEMRUITEM witem; - static const WCHAR emptyW[] = {'\0'}; /* or should we do the following instead of RegOpenKeyEx: */ @@ -287,7 +286,7 @@ err); if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - emptyW, + NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, @@ -653,7 +652,6 @@ WCHAR realname[2]; LPWINEMRUITEM witem; DWORD type; - static const WCHAR emptyW[] = {'\0'}; /* get space to save indices that will turn into names * but in order of most to least recently used @@ -668,16 +666,16 @@ /* open the sub key */ if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey, 0, - emptyW, + NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &newkey, &dwdisp))) { /* error - what to do ??? */ - ERR("(%lu %lu %lx %lx \"%s\" %p): Could not open key, error=%d\n", + ERR("(%lu %lu %lx %p %s %p): Could not open key, error=%d\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), + mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, err); return 0; } @@ -718,9 +716,9 @@ else mp->cursize = 0; - TRACE("(%lu %lu %lx %lx \"%s\" %p): Current Size = %ld\n", + TRACE("(%lu %lu %lx %p %s %p): Current Size = %ld\n", mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags, - (DWORD)mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), + mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey), mp->extview.lpfnCompare, mp->cursize); return (HANDLE)mp; } _____ Modified: vendor/wine/dlls/comctl32/current/commctrl.c --- vendor/wine/dlls/comctl32/current/commctrl.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/commctrl.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -119,7 +119,7 @@ COMCTL32_hModule = (HMODULE)hinstDLL; /* add global subclassing atom (used by 'tooltip' and 'updown') */ - COMCTL32_wSubclass = (LPWSTR)(DWORD)GlobalAddAtomW (strCC32SubclassInfo); + COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo); TRACE("Subclassing atom added: %p\n", COMCTL32_wSubclass); /* create local pattern brush */ @@ -144,6 +144,9 @@ TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); + + /* subclass user32 controls */ + THEMING_Initialize (); break; case DLL_PROCESS_DETACH: @@ -305,7 +308,7 @@ */ BOOL WINAPI -ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo) +ShowHideMenuCtl (HWND hwnd, UINT_PTR uFlags, LPINT lpInfo) { LPINT lpMenuId; @@ -322,9 +325,9 @@ while (*lpMenuId != uFlags) lpMenuId += 2; - if (GetMenuState ((HMENU)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) { + if (GetMenuState ((HMENU)(DWORD_PTR)lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) { /* uncheck menu item */ - CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED); /* hide control */ lpMenuId++; @@ -333,7 +336,7 @@ } else { /* check menu item */ - CheckMenuItem ((HMENU)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem ((HMENU)(DWORD_PTR)lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED); /* show control */ lpMenuId++; @@ -373,8 +376,8 @@ INT *lpRun; HWND hwndCtrl; - TRACE("(0x%08lx 0x%08lx 0x%08lx)\n", - (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo); + TRACE("(%p %p %p)\n", + hwnd, lpRect, lpInfo); GetClientRect (hwnd, lpRect); lpRun = lpInfo; @@ -503,7 +506,7 @@ return CreateWindowA(STATUSCLASSNAMEA, text, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - parent, (HMENU)wid, 0, 0); + parent, (HMENU)(DWORD_PTR)wid, 0, 0); } @@ -529,7 +532,7 @@ return CreateWindowW(STATUSCLASSNAMEW, text, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - parent, (HMENU)wid, 0, 0); + parent, (HMENU)(DWORD_PTR)wid, 0, 0); } @@ -564,7 +567,7 @@ { HWND hUD = CreateWindowW (UPDOWN_CLASSW, 0, style, x, y, cx, cy, - parent, (HMENU)id, inst, 0); + parent, (HMENU)(DWORD_PTR)id, inst, 0); if (hUD) { SendMessageW (hUD, UDM_SETBUDDY, (WPARAM)buddy, 0); SendMessageW (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal)); @@ -725,7 +728,7 @@ hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style|WS_CHILD, 0,0,100,30, - hwnd, (HMENU)wID, COMCTL32_hModule, NULL); + hwnd, (HMENU)(DWORD_PTR)wID, COMCTL32_hModule, NULL); if(hwndTB) { TBADDBITMAP tbab; @@ -784,7 +787,7 @@ */ HBITMAP WINAPI -CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags, +CreateMappedBitmap (HINSTANCE hInstance, INT_PTR idBitmap, UINT wFlags, LPCOLORMAP lpColorMap, INT iNumMaps) { HGLOBAL hglb; @@ -931,8 +934,7 @@ * Returns version of a comctl32.dll from IE4.01 SP1. */ -HRESULT WINAPI -COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) { WARN("wrong DLLVERSIONINFO size from app\n"); @@ -960,7 +962,7 @@ * Success: S_OK * Failure: A HRESULT error */ -HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", debugstr_w(cmdline)); _____ Modified: vendor/wine/dlls/comctl32/current/datetime.c --- vendor/wine/dlls/comctl32/current/datetime.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/datetime.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -1164,6 +1164,15 @@ static LRESULT +DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) +{ + infoPtr->hFont = font; + if (repaint) InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return 0; +} + + +static LRESULT DATETIME_Create (HWND hwnd, LPCREATESTRUCTW lpcs) { static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 }; @@ -1314,6 +1323,12 @@ case WM_STYLECHANGED: return DATETIME_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_SETFONT: + return DATETIME_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam); + + case WM_GETFONT: + return (LRESULT) infoPtr->hFont; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP)) ERR("unknown msg %04x wp=%08x lp=%08lx\n", _____ Modified: vendor/wine/dlls/comctl32/current/dpa.c --- vendor/wine/dlls/comctl32/current/dpa.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/dpa.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -787,11 +787,6 @@ * RETURNS * Success: index of the pointer in the array. * Failure: -1 - * - * NOTES - * Binary search taken from R.Sedgewick "Algorithms in C"! - * Function is NOT tested! - * If something goes wrong, blame HIM not ME! (Eric Kohl) */ INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) @@ -807,47 +802,34 @@ INT l, r, x, n; LPVOID *lpPtr; - TRACE("binary search\n"); - l = (nStart == -1) ? 0 : nStart; r = hdpa->nItemCount - 1; lpPtr = hdpa->ptrs; while (r >= l) { x = (l + r) / 2; n = (pfnCompare)(pFind, lpPtr[x], lParam); - if (n < 0) + if (n == 0) + return x; + else if (n < 0) r = x - 1; - else + else /* (n > 0) */ l = x + 1; - if (n == 0) { - TRACE("-- ret=%d\n", n); - return n; - } } - - if (uOptions & (DPAS_INSERTBEFORE | DPAS_INSERTAFTER)) { - TRACE("-- ret=%d\n", l); - return l; - } + if (uOptions & (DPAS_INSERTBEFORE|DPAS_INSERTAFTER)) return l; } else { /* array is not sorted --> use linear search */ LPVOID *lpPtr; INT nIndex; - TRACE("linear search\n"); - nIndex = (nStart == -1)? 0 : nStart; lpPtr = hdpa->ptrs; for (; nIndex < hdpa->nItemCount; nIndex++) { - if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) { - TRACE("-- ret=%d\n", nIndex); + if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) return nIndex; - } } } - TRACE("-- not found: ret=-1\n"); return -1; } _____ Modified: vendor/wine/dlls/comctl32/current/header.c --- vendor/wine/dlls/comctl32/current/header.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/header.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -87,6 +87,7 @@ HIMAGELIST himl; /* handle to an image list (may be 0) */ HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ + INT *order; /* array of item IDs indexed by order */ BOOL bRectsValid; /* validity flag for bounding rectangles */ } HEADER_INFO; @@ -113,14 +114,10 @@ { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); INT iorder = (INT)wParam; - UINT i; - if ((iorder <0) || iorder >infoPtr->uNumItem) + if ((iorder <0) || iorder >= infoPtr->uNumItem) return iorder; - for (i=0; i<infoPtr->uNumItem; i++) - if (HEADER_IndexToOrder(hwnd,i) == iorder) - return i; - return iorder; + return infoPtr->order[iorder]; } static void @@ -339,7 +336,7 @@ } DeleteObject(hClipRgn); - DeleteDC(hClipDC); + ReleaseDC(hwnd, hClipDC); } if (((phdi->fmt & HDF_STRING) @@ -385,7 +382,7 @@ } x = rect.left; - for (i = 0; i < infoPtr->uNumItem; i++) { + for (i = 0; x <= rect.right && i < infoPtr->uNumItem; i++) { x = HEADER_DrawItem (hwnd, hdc, HEADER_OrderToIndex(hwnd,i), infoPtr->iHotItem == i); } @@ -416,7 +413,7 @@ hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT); hOldFont = SelectObject (hdc, hFont); - HEADER_DrawItem (hwnd, hdc, iItem, FALSE); + HEADER_DrawItem (hwnd, hdc, iItem, infoPtr->iHotItem == iItem); SelectObject (hdc, hOldFont); } @@ -647,16 +644,19 @@ if (infoPtr->items[0].pszText) Free (infoPtr->items[0].pszText); Free (infoPtr->items); + Free(infoPtr->order); infoPtr->items = 0; + infoPtr->order = 0; infoPtr->uNumItem = 0; } else { HEADER_ITEM *oldItems = infoPtr->items; - HEADER_ITEM *pItem; INT i; INT iOrder; TRACE("Complex delete! [iItem=%d]\n", iItem); + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); if (infoPtr->items[iItem].pszText) Free (infoPtr->items[iItem].pszText); iOrder = infoPtr->items[iItem].iOrder; @@ -676,11 +676,21 @@ } /* Correct the orders */ - for (i=infoPtr->uNumItem, pItem = infoPtr->items; i; i--, pItem++) + if (iOrder < infoPtr->uNumItem) { - if (pItem->iOrder > iOrder) - pItem->iOrder--; + memmove(&infoPtr->order[iOrder], &infoPtr->order[iOrder + 1], + (infoPtr->uNumItem - iOrder) * sizeof(INT)); + for (i = 0; i < infoPtr->uNumItem; i++) + { + if (infoPtr->order[i] > iItem) + infoPtr->order[i]--; + if (i >= iOrder) + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; + } } + + for (i = 0; i < infoPtr->uNumItem; i++) + TRACE("%d: order=%d, iOrder=%d, ->iOrder=%d\n", i, infoPtr->order[i], infoPtr->items[i].iOrder, infoPtr->items[infoPtr->order[i]].iOrder); Free (oldItems); } @@ -850,14 +860,13 @@ static LRESULT HEADER_GetOrderArray(HWND hwnd, WPARAM wParam, LPARAM lParam) { - int i; LPINT order = (LPINT) lParam; HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); if ((unsigned int)wParam <infoPtr->uNumItem) return FALSE; - for (i=0; i<(int)wParam; i++) - *order++=HEADER_OrderToIndex(hwnd,i); + + memcpy(order, infoPtr->order, infoPtr->uNumItem * sizeof(INT)); return TRUE; } @@ -871,6 +880,7 @@ if ((unsigned int)wParam <infoPtr->uNumItem) return FALSE; + memcpy(infoPtr->order, order, infoPtr->uNumItem * sizeof(INT)); for (i=0; i<(int)wParam; i++) { lpItem = &infoPtr->items[*order++]; @@ -923,10 +933,12 @@ if (infoPtr->uNumItem == 0) { infoPtr->items = Alloc (sizeof (HEADER_ITEM)); + infoPtr->order = Alloc(sizeof(INT)); infoPtr->uNumItem++; } else { HEADER_ITEM *oldItems = infoPtr->items; + INT *oldOrder = infoPtr->order; infoPtr->uNumItem++; infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); @@ -949,13 +961,21 @@ } } + infoPtr->order = Alloc(sizeof(INT) * infoPtr->uNumItem); + memcpy(infoPtr->order, oldOrder, iOrder * sizeof(INT)); + infoPtr->order[iOrder] = nItem; + memcpy(&infoPtr->order[iOrder + 1], &oldOrder[iOrder], + (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); + Free (oldItems); + Free(oldOrder); } - for (i=0; i < infoPtr->uNumItem; i++) + for (i = 0; i < infoPtr->uNumItem; i++) { - if (infoPtr->items[i].iOrder >= iOrder) - infoPtr->items[i].iOrder++; + if (i != iOrder && infoPtr->order[i] >= nItem) + infoPtr->order[i]++; + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; } lpItem = &infoPtr->items[nItem]; @@ -1025,10 +1045,12 @@ if (infoPtr->uNumItem == 0) { infoPtr->items = Alloc (sizeof (HEADER_ITEM)); + infoPtr->order = Alloc(sizeof(INT)); infoPtr->uNumItem++; } else { HEADER_ITEM *oldItems = infoPtr->items; + INT *oldOrder = infoPtr->order; infoPtr->uNumItem++; infoPtr->items = Alloc (sizeof (HEADER_ITEM) * infoPtr->uNumItem); @@ -1051,13 +1073,21 @@ } } + infoPtr->order = Alloc(infoPtr->uNumItem * sizeof(INT)); + memcpy(infoPtr->order, oldOrder, iOrder * sizeof(INT)); + infoPtr->order[iOrder] = nItem; + memcpy(&infoPtr->order[iOrder + 1], &oldOrder[iOrder], + (infoPtr->uNumItem - iOrder - 1) * sizeof(INT)); + Free (oldItems); + Free(oldOrder); } - for (i=0; i < infoPtr->uNumItem; i++) + for (i = 0; i < infoPtr->uNumItem; i++) { - if (infoPtr->items[i].iOrder >= iOrder) - infoPtr->items[i].iOrder++; + if (i != iOrder && infoPtr->order[i] >= nItem) + infoPtr->order[i]++; + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; } lpItem = &infoPtr->items[nItem]; @@ -1143,7 +1173,7 @@ HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); HIMAGELIST himlOld; - TRACE("(himl 0x%x)\n", (int)himl); + TRACE("(himl %p)\n", himl); himlOld = infoPtr->himl; infoPtr->himl = himl; @@ -1224,7 +1254,27 @@ if (phdi->mask & HDI_ORDER) { - lpItem->iOrder = phdi->iOrder; + INT i, nMin, nMax; + + if (lpItem->iOrder < phdi->iOrder) + { + memmove(&infoPtr->order[lpItem->iOrder], + &infoPtr->order[lpItem->iOrder + 1], + (phdi->iOrder - lpItem->iOrder) * sizeof(INT)); + } + if (phdi->iOrder < lpItem->iOrder) + { + memmove(&infoPtr->order[phdi->iOrder + 1], + &infoPtr->order[phdi->iOrder], + (lpItem->iOrder - phdi->iOrder) * sizeof(INT)); + } + infoPtr->order[phdi->iOrder] = nItem; + nMin = min(lpItem->iOrder, phdi->iOrder); + nMax = max(lpItem->iOrder, phdi->iOrder); + for (i = nMin; i <= nMax; i++) + { + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; + } } HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask); @@ -1289,7 +1339,27 @@ if (phdi->mask & HDI_ORDER) { - lpItem->iOrder = phdi->iOrder; + INT i, nMin, nMax; + + if (lpItem->iOrder < phdi->iOrder) + { + memmove(&infoPtr->order[lpItem->iOrder], + &infoPtr->order[lpItem->iOrder + 1], + (phdi->iOrder - lpItem->iOrder) * sizeof(INT)); + } + if (phdi->iOrder < lpItem->iOrder) + { + memmove(&infoPtr->order[phdi->iOrder + 1], + &infoPtr->order[phdi->iOrder], + (lpItem->iOrder - phdi->iOrder) * sizeof(INT)); + } + infoPtr->order[phdi->iOrder] = nItem; + nMin = min(lpItem->iOrder, phdi->iOrder); + nMax = max(lpItem->iOrder, phdi->iOrder); + for (i = nMin; i <= nMax; i++) + { + infoPtr->items[infoPtr->order[i]].iOrder = infoPtr->order[i]; + } } HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); @@ -1320,7 +1390,6 @@ TEXTMETRICW tm; HFONT hOldFont; HDC hdc; - BOOL themingActive = IsAppThemed() && IsThemeActive(); infoPtr = (HEADER_INFO *)Alloc (sizeof(HEADER_INFO)); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -1329,6 +1398,7 @@ infoPtr->uNumItem = 0; infoPtr->hFont = 0; infoPtr->items = 0; + infoPtr->order = 0; infoPtr->bRectsValid = FALSE; infoPtr->hcurArrow = LoadCursorW (0, (LPWSTR)IDC_ARROW); infoPtr->hcurDivider = LoadCursorW (COMCTL32_hModule, MAKEINTRESOURCEW(IDC_DIVIDER)); @@ -1350,7 +1420,7 @@ SelectObject (hdc, hOldFont); ReleaseDC (0, hdc); - if (themingActive) OpenThemeData(hwnd, themeClass); + OpenThemeData(hwnd, themeClass); return 0; } @@ -1373,6 +1443,9 @@ Free (infoPtr->items); } + if (infoPtr->order) + Free(infoPtr->order); + if (infoPtr->himl) ImageList_Destroy (infoPtr->himl); @@ -1506,6 +1579,9 @@ lpItem= &infoPtr->items[infoPtr->iMoveItem]; lpItem->iOrder = newindex; + infoPtr->order[oldindex] = nItem; + infoPtr->order[newindex] = infoPtr->iMoveItem; + infoPtr->bRectsValid = FALSE; InvalidateRect(hwnd, NULL, FALSE); /* FIXME: Should some WM_NOTIFY be sent */ @@ -1581,6 +1657,22 @@ static LRESULT +HEADER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); + /* Reset hot-tracked item when mouse leaves control. */ + INT oldHotItem = infoPtr->iHotItem; + HDC hdc = GetDC (hwnd); + + infoPtr->iHotItem = -1; + if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); + ReleaseDC (hwnd, hdc); + + return 0; +} + + +static LRESULT HEADER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); @@ -1589,28 +1681,35 @@ UINT flags; INT nItem, nWidth; HDC hdc; + /* With theming, hottracking is always enabled */ + BOOL hotTrackEnabled = + ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) + || (GetWindowTheme (hwnd) != NULL); + INT oldHotItem = infoPtr->iHotItem; pt.x = (INT)(SHORT)LOWORD(lParam); pt.y = (INT)(SHORT)HIWORD(lParam); HEADER_InternalHitTest (hwnd, &pt, &flags, &nItem); - if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) { + if (hotTrackEnabled) { if (flags & (HHT_ONHEADER | HHT_ONDIVIDER | HHT_ONDIVOPEN)) infoPtr->iHotItem = nItem; else infoPtr->iHotItem = -1; - InvalidateRect(hwnd, NULL, FALSE); } if (infoPtr->bCaptured) { if (infoPtr->bPressed) { + BOOL oldState = infoPtr->items[infoPtr->iMoveItem].bDown; if ((nItem == infoPtr->iMoveItem) && (flags == HHT_ONHEADER)) infoPtr->items[infoPtr->iMoveItem].bDown = TRUE; else infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; - hdc = GetDC (hwnd); - HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); - ReleaseDC (hwnd, hdc); + if (oldState != infoPtr->items[infoPtr->iMoveItem].bDown) { + hdc = GetDC (hwnd); + HEADER_RefreshItem (hwnd, hdc, infoPtr->iMoveItem); + ReleaseDC (hwnd, hdc); + } TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem); } @@ -1643,8 +1742,18 @@ } } - if ((dwStyle & HDS_BUTTONS) && (dwStyle & HDS_HOTTRACK)) { - FIXME("hot track support!\n"); + if (hotTrackEnabled) { + TRACKMOUSEEVENT tme; + if (oldHotItem != infoPtr->iHotItem) { + hdc = GetDC (hwnd); + if (oldHotItem != -1) HEADER_RefreshItem (hwnd, hdc, oldHotItem); + if (infoPtr->iHotItem != -1) HEADER_RefreshItem (hwnd, hdc, infoPtr->iHotItem); + ReleaseDC (hwnd, hdc); + } + tme.cbSize = sizeof( tme ); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); } return 0; @@ -1854,6 +1963,9 @@ case WM_LBUTTONUP: return HEADER_LButtonUp (hwnd, wParam, lParam); + case WM_MOUSELEAVE: + return HEADER_MouseLeave (hwnd, wParam, lParam); + case WM_MOUSEMOVE: return HEADER_MouseMove (hwnd, wParam, lParam); _____ Modified: vendor/wine/dlls/comctl32/current/imagelist.c --- vendor/wine/dlls/comctl32/current/imagelist.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/imagelist.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -1084,8 +1084,8 @@ bMask = (himl->flags & ILC_MASK) && (fStyle & ILD_MASK) ; bBlend = (fStyle & (ILD_BLEND25 | ILD_BLEND50) ) && !bMask; - TRACE("himl(0x%lx) hbmMask(%p) iImage(%d) x(%d) y(%d) cx(%d) cy(%d)\n", - (DWORD)himl, himl->hbmMask, pimldp->i, pimldp->x, pimldp->y, cx, cy); + TRACE("himl(%p) hbmMask(%p) iImage(%d) x(%d) y(%d) cx(%d) cy(%d)\n", + himl, himl->hbmMask, pimldp->i, pimldp->x, pimldp->y, cx, cy); /* we will use these DCs to access the images and masks in the ImageList */ hImageListDC = himl->hdcImage; _____ Modified: vendor/wine/dlls/comctl32/current/ipaddress.c --- vendor/wine/dlls/comctl32/current/ipaddress.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/ipaddress.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -143,7 +143,7 @@ fgCol = COLOR_GRAYTEXT; } - FillRect (hdc, &rect, (HBRUSH) (bgCol+1)); + FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); SetBkColor (hdc, GetSysColor(bgCol)); _____ Modified: vendor/wine/dlls/comctl32/current/listview.c --- vendor/wine/dlls/comctl32/current/listview.c 2005-09-05 08:01:05 UTC (rev 17654) +++ vendor/wine/dlls/comctl32/current/listview.c 2005-09-05 08:17:08 UTC (rev 17655) @@ -379,6 +379,9 @@ #define LV_FL_DT_FLAGS (DT_TOP | DT_NOPREFIX | DT_EDITCONTROL | DT_CENTER | DT_WORDBREAK | DT_NOCLIP) #define LV_SL_DT_FLAGS (DT_VCENTER | DT_NOPREFIX | DT_EDITCONTROL | DT_SINGLELINE | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS) +/* Image index from state */ +#define STATEIMAGEINDEX(x) (((x) & LVIS_STATEIMAGEMASK) >> 12) + /* The time in milliseconds to reset the search in the list */ #define KEY_DELAY 450 @@ -1243,8 +1246,8 @@ TRACE("building icon ranges:\n"); for (nItem = 0; nItem < infoPtr->nItemCount; nItem++) { - rcItem.left = (LONG)DPA_GetPtr(infoPtr->hdpaPosX, nItem); - rcItem.top = (LONG)DPA_GetPtr(infoPtr->hdpaPosY, nItem); + rcItem.left = (LONG_PTR)DPA_GetPtr(infoPtr->hdpaPosX, nItem); [truncated at 1000 lines; 24299 more skipped]

1 0

[gvg] 17654: svn maintenance: ignore generated GNUmakefile
by gvg＠svn.reactos.com 05 Sep '05

05 Sep '05

svn maintenance: ignore generated GNUmakefile Property changes on: trunk/reactos/apps/utils/net/arp ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/finger ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/ftp ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/ipconfig ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/netstat ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/ping ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/route ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/telnet ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/tracert ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/net/whois ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map makefile + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/ps ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.exe *.coff *.sym *.map makefile + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile Property changes on: trunk/reactos/apps/utils/rosperf ___________________________________________________________________ Name: svn:ignore - *.o *.a *.d *.exe *.coff *.sym *.map makefile + *.o *.a *.d *.exe *.coff *.sym *.map GNUmakefile Property changes on: trunk/reactos/boot/freeldr/bootsect ___________________________________________________________________ Name: svn:ignore - *.exe makefile + *.exe GNUmakefile Property changes on: trunk/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: svn:ignore - *.d *.map *.exe *.sys makefile + *.d *.map *.exe *.sys GNUmakefile Property changes on: trunk/reactos/boot/freeldr/install ___________________________________________________________________ Name: svn:ignore - *.exe makefile + *.exe GNUmakefile Property changes on: trunk/reactos/bootdata/bootcd ___________________________________________________________________ Name: svn:ignore - makefile + GNUmakefile Property changes on: trunk/reactos/bootdata/livecd ___________________________________________________________________ Name: svn:ignore - makefile + GNUmakefile Property changes on: trunk/reactos/drivers/bus/acpi ___________________________________________________________________ Name: svn:ignore - *.a *.d *.o *.sym *.sys *.map *.tmp acpi.coff objects makefile + *.a *.d *.o *.sym *.sys *.map *.tmp acpi.coff objects GNUmakefile Property changes on: trunk/reactos/drivers/bus/isapnp ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp isapnp.coff isapnp.sys.unstripped *.d *.o *.a *.sym *.sys *.map makefile + base.tmp junk.tmp temp.exp isapnp.coff isapnp.sys.unstripped *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/bus/pci ___________________________________________________________________ Name: svn:ignore - *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/bus/serenum ___________________________________________________________________ Name: svn:ignore - *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/beep ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/blue ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/bootvid ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/debugout ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/mpu401 ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/null ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/parallel ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/ramdrv ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/serial ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/sndblst ___________________________________________________________________ Name: svn:ignore - *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map makefile + *.tmp *.exp *.coff *.d *.o *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/dd/sound ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp *.coff *.sys *.sym *.map makefile + base.tmp junk.tmp temp.exp *.coff *.sys *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/cdfs ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp cdfs.coff *.d *.sys *.o *.a *.sym *.map makefile + base.tmp junk.tmp temp.exp cdfs.coff *.d *.sys *.o *.a *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/fs_rec ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp fs_rec.coff *.d *.o *.a *.sym *.sys *.map makefile + base.tmp junk.tmp temp.exp fs_rec.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/ms ___________________________________________________________________ Name: svn:ignore - msfs.coff *.o *.a *.sym *.sys *.map makefile + msfs.coff *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/mup ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp mup.coff *.o *.a *.sys *.sym *.map makefile + base.tmp junk.tmp temp.exp mup.coff *.o *.a *.sys *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/np ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp npfs.coff *.d *.o *.a *.sym *.sys *.map makefile + base.tmp junk.tmp temp.exp npfs.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/ntfs ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp ntfs.coff *.d *.o *.a *.sym *.sys *.map makefile + base.tmp junk.tmp temp.exp ntfs.coff *.d *.o *.a *.sym *.sys *.map GNUmakefile Property changes on: trunk/reactos/drivers/fs/vfat ___________________________________________________________________ Name: svn:ignore - base.tmp junk.tmp temp.exp vfatfs.coff *.d *.o *.a *.sys *.sym *.map makefile + base.tmp junk.tmp temp.exp vfatfs.coff *.d *.o *.a *.sys *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/input/i8042prt ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.a *.sys *.sym *.map makefile + *.coff *.o *.a *.sys *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/input/kbdclass ___________________________________________________________________ Name: svn:ignore - *.coff *.o *.a *.sys *.sym *.map makefile + *.coff *.o *.a *.sys *.sym *.map GNUmakefile Property changes on: trunk/reactos/drivers/input/mouclass ___________________________________________________________________ Name: svn:ignore - mouclass.coff *.o *.a *.sym [truncated at 1000 lines; 4733 more skipped]

1 0

[hpoussin] 17653: Fix the build. TIB field in KIPCR structure is named NtTib, not Tib
by hpoussin＠svn.reactos.com 05 Sep '05

05 Sep '05

Fix the build. TIB field in KIPCR structure is named NtTib, not Tib Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-09-05 07:51:15 UTC (rev 17652) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-09-05 07:59:29 UTC (rev 17653) @@ -1450,9 +1450,9 @@ " VdmAlert: 0x%08x\n" " L2CacheSize: 0x%08x\n" " InterruptMode: 0x%08x\n", - Pcr->Tib.ExceptionList, Pcr->Tib.StackBase, Pcr->Tib.StackLimit, - Pcr->Tib.SubSystemTib, Pcr->Tib.FiberData, Pcr->Tib.ArbitraryUserPointer, - Pcr->Tib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, + Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, + Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer, + Pcr->NtTib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, Pcr->Number, Pcr->L2CacheAssociativity,

1 0

[ion] 17652: - More NDK/MSDDK compatibility fixes.
by ion＠svn.reactos.com 05 Sep '05

05 Sep '05

- More NDK/MSDDK compatibility fixes. Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/lib/kernel32/file/lock.c Modified: trunk/reactos/lib/ntdll/inc/ntdll.h Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/lpc/query.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/se/audit.c Modified: trunk/reactos/w32api/include/ddk/ntddk.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/include/ndk/ifssupp.h --- trunk/reactos/include/ndk/ifssupp.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/ifssupp.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -112,5 +112,12 @@ TOKEN_CONTROL ClientTokenControl; } SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT; +typedef enum _RTL_GENERIC_COMPARE_RESULTS +{ + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + #endif _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -11,6 +11,8 @@ /* DEPENDENCIES **************************************************************/ #include "ldrtypes.h" +/* FIXME: this needs be implemented in the w32api ddk */ +//#include "ntimage.h" /* FUNCTION TYPES ************************************************************/ _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/pstypes.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -123,6 +123,14 @@ ProcessDebugObjectHandle, ProcessDebugFlags, ProcessHandleTracing, + ProcessIoPriority, + ProcessExecuteFlags, + ProcessTlsInformation, + ProcessCookie, + ProcessImageInformation, + ProcessCycleTime, + ProcessPagePriority, + ProcessInstrumentationCallback, MaxProcessInfoClass } PROCESSINFOCLASS; @@ -147,10 +155,34 @@ ThreadIsIoPending, ThreadHideFromDebugger, ThreadBreakOnTermination, + ThreadSwitchLegacyState, + ThreadIsTerminated, + ThreadLastSystemCall, + ThreadIoPriority, + ThreadCycleTime, + ThreadPagePriority, + ThreadActualBasePriority, MaxThreadInfoClass } THREADINFOCLASS; #endif +#ifndef NTOS_MODE_USER +typedef enum _JOBOBJECTINFOCLASS +{ + JobObjectBasicAccountingInformation = 1, + JobObjectBasicLimitInformation, + JobObjectBasicProcessIdList, + JobObjectBasicUIRestrictions, + JobObjectSecurityLimitInformation, + JobObjectEndOfJobTimeInformation, + JobObjectAssociateCompletionPortInformation, + JobObjectBasicAndIoAccountingInformation, + JobObjectExtendedLimitInformation, + JobObjectJobSetInformation, + MaxJobObjectInfoClass +} JOBOBJECTINFOCLASS; +#endif + /* FUNCTION TYPES ************************************************************/ typedef VOID (NTAPI *PPEBLOCKROUTINE)(PVOID); @@ -360,6 +392,53 @@ UCHAR BooleanSpare[3]; /* FB9h */ } TEB, *PTEB; +#ifdef NTOS_MODE_USER +typedef struct _PROCESS_BASIC_INFORMATION +{ + NTSTATUS ExitStatus; + PPEB PebBaseAddress; + ULONG_PTR AffinityMask; + KPRIORITY BasePriority; + ULONG_PTR UniqueProcessId; + ULONG_PTR InheritedFromUniqueProcessId; +} PROCESS_BASIC_INFORMATION,*PPROCESS_BASIC_INFORMATION; + +typedef struct _PROCESS_ACCESS_TOKEN +{ + HANDLE Token; + HANDLE Thread; +} PROCESS_ACCESS_TOKEN, *PPROCESS_ACCESS_TOKEN; + +typedef struct _PROCESS_DEVICEMAP_INFORMATION +{ + union + { + struct + { + HANDLE DirectoryHandle; + } Set; + struct + { + ULONG DriveMap; + UCHAR DriveType[32]; + } Query; + }; +} PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION; + +typedef struct _KERNEL_USER_TIMES +{ + LARGE_INTEGER CreateTime; + LARGE_INTEGER ExitTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; +} KERNEL_USER_TIMES, *PKERNEL_USER_TIMES; + +typedef struct _PROCESS_SESSION_INFORMATION +{ + ULONG SessionId; +} PROCESS_SESSION_INFORMATION, *PPROCESS_SESSION_INFORMATION; +#endif + #ifndef NTOS_MODE_USER /* FIXME: see note in mmtypes.h */ #ifdef _NTOSKRNL_ _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -93,7 +93,7 @@ STDCALL RtlCompactHeap( HANDLE heap, - DWORD flags + ULONG flags ); HANDLE _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -91,12 +91,15 @@ #define VER_CONDITION_MASK 7 #define VER_NUM_BITS_PER_CONDITION_MASK 3 +#define RTL_CRITSECT_TYPE 0 +#define RTL_RESOURCE_TYPE 1 + +#ifdef NTOS_MODE_USER /* RTL String Hash Algorithms */ #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1 #define HASH_STRING_ALGORITHM_INVALID 0xffffffff -#ifdef NTOS_MODE_USER /* List Macros */ static __inline VOID @@ -231,6 +234,7 @@ /* ENUMERATIONS **************************************************************/ +#ifdef NTOS_MODE_USER typedef enum _TABLE_SEARCH_RESULT { TableEmptyTree, @@ -245,6 +249,7 @@ GenericGreaterThan, GenericEqual } RTL_GENERIC_COMPARE_RESULTS; +#endif typedef enum { @@ -281,8 +286,8 @@ PEXCEPTION_POINTERS ExceptionPointers ); -typedef DWORD (NTAPI *PTHREAD_START_ROUTINE)( - LPVOID Parameter +typedef ULONG (NTAPI *PTHREAD_START_ROUTINE)( + PVOID Parameter ); typedef VOID @@ -315,7 +320,7 @@ typedef PVOID (NTAPI *PRTL_GENERIC_ALLOCATE_ROUTINE) ( struct _RTL_GENERIC_TABLE *Table, - LONG ByteSize + CLONG ByteSize ); typedef VOID @@ -324,10 +329,10 @@ PVOID Buffer ); -typedef VOID +typedef PVOID (NTAPI *PRTL_AVL_ALLOCATE_ROUTINE) ( struct _RTL_AVL_TABLE *Table, - LONG ByteSize + CLONG ByteSize ); typedef VOID @@ -353,11 +358,14 @@ IN OUT PSIZE_T CommitSize ); +#ifdef NTOS_MODE_USER typedef BOOLEAN (NTAPI *PRTL_CONFLICT_RANGE_CALLBACK) ( PVOID Context, struct _RTL_RANGE *Range ); +#endif + /* TYPES *********************************************************************/ #ifdef NTOS_MODE_USER @@ -634,6 +642,30 @@ UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; +#ifndef NTOS_MODE_USER +typedef struct _RTL_CRITICAL_SECTION_DEBUG +{ + USHORT Type; + USHORT CreatorBackTraceIndex; + struct _RTL_CRITICAL_SECTION *CriticalSection; + LIST_ENTRY ProcessLocksList; + ULONG EntryCount; + ULONG ContentionCount; + ULONG Spare[2]; +} RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG; + +typedef struct _RTL_CRITICAL_SECTION +{ + PRTL_CRITICAL_SECTION_DEBUG DebugInfo; + LONG LockCount; + LONG RecursionCount; + HANDLE OwningThread; + HANDLE LockSemaphore; + ULONG_PTR SpinCount; +} RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; +#endif + +#ifdef NTOS_MODE_USER typedef struct _RTL_RANGE_LIST { LIST_ENTRY ListHead; @@ -652,6 +684,16 @@ UCHAR Flags; /* RTL_RANGE_... flags */ } RTL_RANGE, *PRTL_RANGE; +typedef struct _RANGE_LIST_ITERATOR +{ + PLIST_ENTRY RangeListHead; + PLIST_ENTRY MergedHead; + PVOID Current; + ULONG Stamp; +} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; + +#endif + typedef struct _RTL_RESOURCE { RTL_CRITICAL_SECTION Lock; @@ -665,14 +707,6 @@ PVOID DebugInfo; /* ?? */ } RTL_RESOURCE, *PRTL_RESOURCE; -typedef struct _RANGE_LIST_ITERATOR -{ - PLIST_ENTRY RangeListHead; - PLIST_ENTRY MergedHead; - PVOID Current; - ULONG Stamp; -} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; - typedef struct _RTL_MESSAGE_RESOURCE_ENTRY { USHORT Length; @@ -779,41 +813,41 @@ PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; -/* Let Kernel Drivers use this */ -#if !defined(_WINBASE_H) && !defined(_WINBASE_) - typedef struct _SYSTEMTIME - { - WORD wYear; - WORD wMonth; - WORD wDayOfWeek; - WORD wDay; - WORD wHour; - WORD wMinute; - WORD wSecond; - WORD wMilliseconds; - } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; +#ifndef NTOS_MODE_USER + +typedef struct _SYSTEMTIME +{ + USHORT wYear; + USHORT wMonth; + USHORT wDayOfWeek; + USHORT wDay; + USHORT wHour; + USHORT wMinute; + USHORT wSecond; + USHORT wMilliseconds; +} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; - typedef struct _TIME_ZONE_INFORMATION - { - LONG Bias; - WCHAR StandardName[32]; - SYSTEMTIME StandardDate; - LONG StandardBias; - WCHAR DaylightName[32]; - SYSTEMTIME DaylightDate; - LONG DaylightBias; - } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; +typedef struct _TIME_ZONE_INFORMATION +{ + LONG Bias; + WCHAR StandardName[32]; + SYSTEMTIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + SYSTEMTIME DaylightDate; + LONG DaylightBias; +} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; - typedef enum _ACL_INFORMATION_CLASS - { - AclRevisionInformation = 1, - AclSizeInformation - } ACL_INFORMATION_CLASS; +typedef enum _ACL_INFORMATION_CLASS +{ + AclRevisionInformation = 1, + AclSizeInformation +} ACL_INFORMATION_CLASS; - #define TIME_ZONE_ID_UNKNOWN 0 - #define TIME_ZONE_ID_STANDARD 1 - #define TIME_ZONE_ID_DAYLIGHT 2 - #define TIME_ZONE_ID_INVALID 0xFFFFFFFF +#define TIME_ZONE_ID_UNKNOWN 0 +#define TIME_ZONE_ID_STANDARD 1 +#define TIME_ZONE_ID_DAYLIGHT 2 +#define TIME_ZONE_ID_INVALID 0xFFFFFFFF #endif #endif _____ Modified: trunk/reactos/include/ndk/sefuncs.h --- trunk/reactos/include/ndk/sefuncs.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/sefuncs.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -46,13 +46,6 @@ IN BOOLEAN CaptureIfKernelMode ); -VOID -NTAPI -SeSetAccessStateGenericMapping( - IN PACCESS_STATE AccessState, - IN PGENERIC_MAPPING GenericMapping -); - SECURITY_IMPERSONATION_LEVEL NTAPI SeTokenImpersonationLevel( _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/umtypes.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -61,15 +61,24 @@ #undef STATUS_SXS_INVALID_DEACTIVATION #include <ntstatus.h> -#define STATIC static /* CONSTANTS *****************************************************************/ /* NTAPI/NTOSAPI Define */ +#define DECLSPEC_ADDRSAFE #define NTAPI __stdcall -#define NTOSAPI #define FASTCALL __fastcall -#define STDCALL __stdcall +#if !defined(_NTSYSTEM_) +#define NTSYSAPI DECLSPEC_IMPORT +#define NTSYSCALLAPI DECLSPEC_IMPORT +#else +#define NTSYSAPI +#if defined(_NTDLLBUILD_) +#define NTSYSCALLAPI +#else +#define NTSYSCALLAPI DECLSPEC_ADDRSAFE +#endif +#endif /* Native API Return Value Macros */ #define NT_SUCCESS(x) ((x)>=0) @@ -81,10 +90,12 @@ /* Basic Types that aren't defined in User-Mode Headers */ typedef CONST int CINT; typedef CONST char *PCSZ; +typedef ULONG CLONG; typedef short CSHORT; typedef CSHORT *PCSHORT; typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; typedef LONG NTSTATUS, *PNTSTATUS; +#define STATIC static /* Basic NT Types */ #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-05 07:51:15 UTC (rev 17652) @@ -18,7 +18,7 @@ /* PROTOTYPES ****************************************************************/ NTSTATUS -STDCALL +NTAPI NtAcceptConnectPort( PHANDLE PortHandle, PVOID PortContext OPTIONAL, @@ -29,7 +29,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAcceptConnectPort( PHANDLE PortHandle, PVOID PortContext OPTIONAL, @@ -40,7 +40,7 @@ ); NTSTATUS -STDCALL +NTAPI NtAccessCheck( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, @@ -53,7 +53,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAccessCheck( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, @@ -65,11 +65,12 @@ OUT PNTSTATUS AccessStatus ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtAccessCheckAndAuditAlarm( IN PUNICODE_STRING SubsystemName, - IN PHANDLE ObjectHandle, + IN PVOID HandleId, IN PUNICODE_STRING ObjectTypeName, IN PUNICODE_STRING ObjectName, IN PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -82,7 +83,7 @@ ); NTSTATUS -STDCALL +NTAPI NtAddAtom( IN PWSTR AtomName, IN ULONG AtomNameLength, @@ -90,7 +91,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAddAtom( IN PWSTR AtomName, IN ULONG AtomNameLength, @@ -98,21 +99,22 @@ ); NTSTATUS -STDCALL +NTAPI NtAddBootEntry( IN PUNICODE_STRING EntryName, IN PUNICODE_STRING EntryValue ); NTSTATUS -STDCALL +NTAPI ZwAddBootEntry( IN PUNICODE_STRING EntryName, IN PUNICODE_STRING EntryValue ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtAdjustGroupsToken( IN HANDLE TokenHandle, IN BOOLEAN ResetToDefault, @@ -123,7 +125,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAdjustGroupsToken( IN HANDLE TokenHandle, IN BOOLEAN ResetToDefault, @@ -133,8 +135,9 @@ OUT PULONG ReturnLength ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtAdjustPrivilegesToken( IN HANDLE TokenHandle, IN BOOLEAN DisableAllPrivileges, @@ -145,7 +148,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAdjustPrivilegesToken( IN HANDLE TokenHandle, IN BOOLEAN DisableAllPrivileges, @@ -156,45 +159,45 @@ ); NTSTATUS -STDCALL +NTAPI NtAlertResumeThread( IN HANDLE ThreadHandle, OUT PULONG SuspendCount ); NTSTATUS -STDCALL +NTAPI ZwAlertResumeThread( IN HANDLE ThreadHandle, OUT PULONG SuspendCount ); NTSTATUS -STDCALL +NTAPI NtAlertThread( IN HANDLE ThreadHandle ); NTSTATUS -STDCALL +NTAPI ZwAlertThread( IN HANDLE ThreadHandle ); NTSTATUS -STDCALL +NTAPI NtAllocateLocallyUniqueId( OUT LUID *LocallyUniqueId ); NTSTATUS -STDCALL +NTAPI ZwAllocateLocallyUniqueId( OUT PLUID Luid ); NTSTATUS -STDCALL +NTAPI NtAllocateUuids( PULARGE_INTEGER Time, PULONG Range, @@ -203,7 +206,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwAllocateUuids( PULARGE_INTEGER Time, PULONG Range, @@ -211,8 +214,9 @@ PUCHAR Seed ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, @@ -222,8 +226,9 @@ IN ULONG Protect ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwAllocateVirtualMemory( IN HANDLE ProcessHandle, IN OUT PVOID *BaseAddress, @@ -234,21 +239,21 @@ ); NTSTATUS -STDCALL +NTAPI NtAssignProcessToJobObject( HANDLE JobHandle, HANDLE ProcessHandle ); NTSTATUS -STDCALL +NTAPI ZwAssignProcessToJobObject( HANDLE JobHandle, HANDLE ProcessHandle ); NTSTATUS -STDCALL +NTAPI NtCallbackReturn( PVOID Result, ULONG ResultLength, @@ -256,7 +261,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCallbackReturn( PVOID Result, ULONG ResultLength, @@ -264,40 +269,40 @@ ); NTSTATUS -STDCALL +NTAPI NtCancelIoFile( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); NTSTATUS -STDCALL +NTAPI ZwCancelIoFile( IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); NTSTATUS -STDCALL +NTAPI NtCancelTimer( IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL ); NTSTATUS -STDCALL +NTAPI NtClearEvent( IN HANDLE EventHandle ); NTSTATUS -STDCALL +NTAPI ZwClearEvent( IN HANDLE EventHandle ); NTSTATUS -STDCALL +NTAPI NtCreateJobObject( PHANDLE JobHandle, ACCESS_MASK DesiredAccess, @@ -305,27 +310,30 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateJobObject( PHANDLE JobHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtClose( IN HANDLE Handle ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwClose( IN HANDLE Handle ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtCloseObjectAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PVOID HandleId, @@ -333,7 +341,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCloseObjectAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PVOID HandleId, @@ -341,19 +349,20 @@ ); NTSTATUS -STDCALL +NTAPI NtCompleteConnectPort( HANDLE PortHandle ); NTSTATUS -STDCALL +NTAPI ZwCompleteConnectPort( HANDLE PortHandle ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtConnectPort( PHANDLE PortHandle, PUNICODE_STRING PortName, @@ -365,8 +374,9 @@ PULONG ConnectionInformationLength OPTIONAL ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwConnectPort( PHANDLE PortHandle, PUNICODE_STRING PortName, @@ -379,29 +389,30 @@ ); NTSTATUS -STDCALL +NTAPI NtContinue( IN PCONTEXT Context, IN BOOLEAN TestAlert ); NTSTATUS -STDCALL +NTAPI ZwContinue( IN PCONTEXT Context, - IN CINT IrqLevel + IN BOOLEAN TestAlert ); NTSTATUS -STDCALL +NTAPI NtCreateDirectoryObject( OUT PHANDLE DirectoryHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwCreateDirectoryObject( OUT PHANDLE DirectoryHandle, IN ACCESS_MASK DesiredAccess, @@ -409,7 +420,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateEvent( OUT PHANDLE EventHandle, IN ACCESS_MASK DesiredAccess, @@ -418,8 +429,9 @@ IN BOOLEAN InitialState ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwCreateEvent( OUT PHANDLE EventHandle, IN ACCESS_MASK DesiredAccess, @@ -429,7 +441,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateEventPair( OUT PHANDLE EventPairHandle, IN ACCESS_MASK DesiredAccess, @@ -437,15 +449,16 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateEventPair( OUT PHANDLE EventPairHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSCALLAPI NTSTATUS -STDCALL +NTAPI NtCreateFile( OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, @@ -460,8 +473,9 @@ IN ULONG EaLength ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwCreateFile( OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, @@ -477,7 +491,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateIoCompletion( OUT PHANDLE IoCompletionHandle, IN ACCESS_MASK DesiredAccess, @@ -486,7 +500,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateIoCompletion( OUT PHANDLE IoCompletionHandle, IN ACCESS_MASK DesiredAccess, @@ -495,7 +509,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateKey( OUT PHANDLE KeyHandle, IN ACCESS_MASK DesiredAccess, @@ -506,8 +520,9 @@ IN PULONG Disposition OPTIONAL ); +NTSYSAPI NTSTATUS -STDCALL +NTAPI ZwCreateKey( OUT PHANDLE KeyHandle, IN ACCESS_MASK DesiredAccess, @@ -519,7 +534,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateMailslotFile( OUT PHANDLE MailSlotFileHandle, IN ACCESS_MASK DesiredAccess, @@ -532,7 +547,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateMailslotFile( OUT PHANDLE MailSlotFileHandle, IN ACCESS_MASK DesiredAccess, @@ -545,7 +560,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateMutant( OUT PHANDLE MutantHandle, IN ACCESS_MASK DesiredAccess, @@ -554,7 +569,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateMutant( OUT PHANDLE MutantHandle, IN ACCESS_MASK DesiredAccess, @@ -563,7 +578,7 @@ ); NTSTATUS -STDCALL +NTAPI NtCreateNamedPipeFile( OUT PHANDLE NamedPipeFileHandle, IN ACCESS_MASK DesiredAccess, @@ -582,7 +597,7 @@ ); NTSTATUS -STDCALL +NTAPI ZwCreateNamedPipeFile( OUT PHANDLE NamedPipeFileHandle, IN ACCESS_MASK DesiredAccess, @@ -601,7 +616,7 @@ ); NTSTATUS -STDCALL [truncated at 1000 lines; 3984 more skipped]

1 0

[ion] 17651: - NDK compatibility fixes for MSDDK. Use NTAPI instead of STDCALL, and use NTSYSAPI instead of NTOSAPI.
by ion＠svn.reactos.com 05 Sep '05

05 Sep '05

- NDK compatibility fixes for MSDDK. Use NTAPI instead of STDCALL, and use NTSYSAPI instead of NTOSAPI. - Remove some functions/types in NDK that were already documented in DDK/IFS. - Fixup syscall structures for the table and fix protoype of KeAdd/RemoveServiceDescriptorTable. Modified: trunk/reactos/drivers/fs/ms/msfs.h Modified: trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/inbvfuncs.h Modified: trunk/reactos/include/ndk/kdfuncs.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/obfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/drivers/fs/ms/msfs.h --- trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/drivers/fs/ms/msfs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -2,7 +2,7 @@ #define __SERVICES_FS_MS_MSFS_H #include <ntifs.h> -#include <ndk/iotypes.h> +#include <ndk/ntndk.h> /* * FIXME: GCC doesn't have a working option for defaulting to a calling _____ Modified: trunk/reactos/include/ndk/cctypes.h --- trunk/reactos/include/ndk/cctypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/cctypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -13,9 +13,8 @@ /* DEPENDENCIES **************************************************************/ /* EXPORTED DATA *************************************************************/ -extern ULONG NTOSAPI CcFastMdlReadWait; -extern ULONG NTOSAPI CcFastReadNotPossible; -extern ULONG NTOSAPI CcFastReadWait; +extern ULONG NTSYSAPI CcFastReadNotPossible; +extern ULONG NTSYSAPI CcFastReadWait; /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/extypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,9 +14,9 @@ /* EXPORTED DATA *************************************************************/ #ifndef NTOS_MODE_USER -extern POBJECT_TYPE NTOSAPI ExIoCompletionType; -extern NTOSAPI POBJECT_TYPE ExMutantObjectType; -extern NTOSAPI POBJECT_TYPE ExTimerType; +extern POBJECT_TYPE NTSYSAPI ExIoCompletionType; +extern POBJECT_TYPE NTSYSAPI ExMutantObjectType; +extern POBJECT_TYPE NTSYSAPI ExTimerType; #endif /* CONSTANTS *****************************************************************/ @@ -46,9 +46,9 @@ #ifndef NTOS_MODE_USER typedef struct _EX_QUEUE_WORKER_INFO { - UCHAR QueueDisabled:1; - UCHAR MakeThreadsAsNecessary:1; - UCHAR WaitMode:1; + ULONG QueueDisabled:1; + ULONG MakeThreadsAsNecessary:1; + ULONG WaitMode:1; ULONG WorkerCount:29; } EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO; _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/halfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -16,31 +16,16 @@ /* PROTOTYPES ****************************************************************/ -VOID -STDCALL -HalAcquireDisplayOwnership( - IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters -); - BOOLEAN -STDCALL +NTAPI HalQueryDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI HalAllProcessorsStarted(VOID); -NTSTATUS -STDCALL -HalAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PWAIT_CONTEXT_BLOCK WaitContextBlock, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine -); - BOOLEAN -STDCALL +NTAPI HalBeginSystemInterrupt( ULONG Vector, KIRQL Irql, @@ -48,20 +33,20 @@ ); BOOLEAN -STDCALL +NTAPI HalDisableSystemInterrupt( ULONG Vector, KIRQL Irql ); VOID -STDCALL +NTAPI HalDisplayString ( IN PCHAR String ); BOOLEAN -STDCALL +NTAPI HalEnableSystemInterrupt( ULONG Vector, KIRQL Irql, @@ -69,14 +54,14 @@ ); VOID -STDCALL +NTAPI HalEndSystemInterrupt( KIRQL Irql, ULONG Vector ); BOOLEAN -STDCALL +NTAPI HalGetEnvironmentVariable( PCH Name, PCH Value, @@ -84,25 +69,25 @@ ); VOID -STDCALL +NTAPI HalInitializeProcessor( ULONG ProcessorNumber, PVOID ProcessorStack ); BOOLEAN -STDCALL +NTAPI HalInitSystem( ULONG BootPhase, PLOADER_PARAMETER_BLOCK LoaderBlock ); BOOLEAN -STDCALL +NTAPI HalQueryDisplayOwnership(VOID); VOID -STDCALL +NTAPI HalReportResourceUsage(VOID); VOID @@ -112,37 +97,37 @@ ); VOID -STDCALL +NTAPI HalReleaseDisplayOwnership(VOID); VOID -STDCALL +NTAPI HalReturnToFirmware( FIRMWARE_REENTRY Action ); VOID -STDCALL +NTAPI HalRequestIpi( ULONG Unknown ); BOOLEAN -STDCALL +NTAPI HalSetEnvironmentVariable( IN PCH Name, IN PCH Value ); BOOLEAN -STDCALL +NTAPI HalStartNextProcessor( ULONG Unknown1, ULONG Unknown2 ); VOID -STDCALL +NTAPI IoAssignDriveLetters( struct _LOADER_PARAMETER_BLOCK *LoaderBlock, PSTRING NtDeviceName, _____ Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/haltypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -12,7 +12,7 @@ /* DEPENDENCIES **************************************************************/ /* EXPORTED DATA *************************************************************/ -extern ULONG NTOSAPI KdComPortInUse; +extern ULONG NTSYSAPI KdComPortInUse; /* CONSTANTS *****************************************************************/ @@ -50,9 +50,9 @@ } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH; #ifdef __NTOSKRNL__ -extern NTOSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +extern HAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; #else -extern NTOSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; +extern PHAL_PRIVATE_DISPATCH NTSYSAPI HalPrivateDispatchTable; #endif #define HAL_PRIVATE_DISPATCH_VERSION 1 _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/i386/ketypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -117,29 +117,29 @@ typedef struct _LDT_ENTRY { - WORD LimitLow; - WORD BaseLow; + USHORT LimitLow; + USHORT BaseLow; union { struct { - BYTE BaseMid; - BYTE Flags1; - BYTE Flags2; - BYTE BaseHi; + UCHAR BaseMid; + UCHAR Flags1; + UCHAR Flags2; + UCHAR BaseHi; } Bytes; struct { - DWORD BaseMid : 8; - DWORD Type : 5; - DWORD Dpl : 2; - DWORD Pres : 1; - DWORD LimitHi : 4; - DWORD Sys : 1; - DWORD Reserved_0 : 1; - DWORD Default_Big : 1; - DWORD Granularity : 1; - DWORD BaseHi : 8; + ULONG BaseMid : 8; + ULONG Type : 5; + ULONG Dpl : 2; + ULONG Pres : 1; + ULONG LimitHi : 4; + ULONG Sys : 1; + ULONG Reserved_0 : 1; + ULONG Default_Big : 1; + ULONG Granularity : 1; + ULONG BaseHi : 8; } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; @@ -216,28 +216,28 @@ typedef struct _DESCRIPTOR { - WORD Pad; - WORD Limit; - DWORD Base; + USHORT Pad; + USHORT Limit; + ULONG Base; } KDESCRIPTOR, *PKDESCRIPTOR; typedef struct _KSPECIAL_REGISTERS { - DWORD Cr0; - DWORD Cr2; - DWORD Cr3; - DWORD Cr4; - DWORD KernelDr0; - DWORD KernelDr1; - DWORD KernelDr2; - DWORD KernelDr3; - DWORD KernelDr6; - DWORD KernelDr7; + ULONG Cr0; + ULONG Cr2; + ULONG Cr3; + ULONG Cr4; + ULONG KernelDr0; + ULONG KernelDr1; + ULONG KernelDr2; + ULONG KernelDr3; + ULONG KernelDr6; + ULONG KernelDr7; KDESCRIPTOR Gdtr; KDESCRIPTOR Idtr; - WORD Tr; - WORD Ldtr; - DWORD Reserved[6]; + USHORT Tr; + USHORT Ldtr; + ULONG Reserved[6]; } KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; #pragma pack(push,4) @@ -384,32 +384,45 @@ */ typedef struct _KIPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SparedUnused; /* 50 */ - UCHAR Number; /* 51 */ - UCHAR Reserved; /* 52 */ - UCHAR L2CacheAssociativity; /* 53 */ - ULONG VdmAlert; /* 54 */ - ULONG KernelReserved[14]; /* 58 */ - ULONG L2CacheSize; /* 90 */ - ULONG HalReserved[16]; /* 94 */ - ULONG InterruptMode; /* D4 */ - UCHAR KernelReserved2[0x48]; /* D8 */ - KPRCB PrcbData; /* 120 */ + union + { + NT_TIB NtTib; + struct + { + struct _EXCEPTION_REGISTRATION_RECORD *Used_ExceptionList; + PVOID Used_StackBase; + PVOID PerfGlobalGroupMask; + PVOID TssCopy; + ULONG ContextSwitches; + KAFFINITY SetMemberCopy; + PVOID Used_Self; + }; + }; + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SparedUnused; /* 50 */ + UCHAR Number; /* 51 */ + UCHAR Reserved; /* 52 */ + UCHAR L2CacheAssociativity; /* 53 */ + ULONG VdmAlert; /* 54 */ + ULONG KernelReserved[14]; /* 58 */ + ULONG L2CacheSize; /* 90 */ + ULONG HalReserved[16]; /* 94 */ + ULONG InterruptMode; /* D4 */ + UCHAR KernelReserved2[0x48]; /* D8 */ + KPRCB PrcbData; /* 120 */ } KIPCR, *PKIPCR; #pragma pack(pop) @@ -507,9 +520,6 @@ #include <poppack.h> /* i386 Doesn't have Exception Frames */ -typedef struct _KEXCEPTION_FRAME -{ +typedef struct _KEXCEPTION_FRAME KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; -} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; - #endif _____ Modified: trunk/reactos/include/ndk/inbvfuncs.h --- trunk/reactos/include/ndk/inbvfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/inbvfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -16,53 +16,53 @@ /* PROTOTYPES ****************************************************************/ VOID -STDCALL +NTAPI InbvAcquireDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI InbvCheckDisplayOwnership(VOID); BOOLEAN -STDCALL +NTAPI InbvDisplayString( IN PCHAR String ); VOID -STDCALL +NTAPI InbvEnableBootDriver( IN BOOLEAN Enable ); BOOLEAN -STDCALL +NTAPI InbvEnableDisplayString( IN BOOLEAN Enable ); VOID -STDCALL +NTAPI InbvInstallDisplayStringFilter( IN PVOID Unknown ); BOOLEAN -STDCALL +NTAPI InbvIsBootDriverInstalled(VOID); VOID -STDCALL +NTAPI InbvNotifyDisplayOwnershipLost( IN PVOID Callback ); BOOLEAN -STDCALL +NTAPI InbvResetDisplay(VOID); VOID -STDCALL +NTAPI InbvSetScrollRegion( IN ULONG Left, IN ULONG Top, @@ -71,13 +71,13 @@ ); VOID -STDCALL +NTAPI InbvSetTextColor( IN ULONG Color ); VOID -STDCALL +NTAPI InbvSolidColorFill( IN ULONG Left, IN ULONG Top, @@ -87,15 +87,15 @@ ); VOID -STDCALL +NTAPI VidCleanUp(VOID); -BOOL -STDCALL +BOOLEAN +NTAPI VidResetDisplay(VOID); BOOLEAN -STDCALL +NTAPI VidIsBootDriverInstalled(VOID); #endif _____ Modified: trunk/reactos/include/ndk/kdfuncs.h --- trunk/reactos/include/ndk/kdfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/kdfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,79 +14,79 @@ /* PROTOTYPES ****************************************************************/ -BYTE -STDCALL +UCHAR +NTAPI KdPollBreakIn(VOID); BOOLEAN -STDCALL +NTAPI KdPortInitialize( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ); BOOLEAN -STDCALL +NTAPI KdPortInitializeEx( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ); BOOLEAN -STDCALL +NTAPI KdPortGetByte( PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortGetByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortPollByte( PUCHAR ByteRecieved ); BOOLEAN -STDCALL +NTAPI KdPortPollByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved ); VOID -STDCALL +NTAPI KdPortPutByte( UCHAR ByteToSend ); VOID -STDCALL +NTAPI KdPortPutByteEx( PKD_PORT_INFORMATION PortInformation, UCHAR ByteToSend ); VOID -STDCALL +NTAPI KdPortRestore(VOID); VOID -STDCALL +NTAPI KdPortSave (VOID); BOOLEAN -STDCALL +NTAPI KdPortDisableInterrupts(VOID); BOOLEAN -STDCALL +NTAPI KdPortEnableInterrupts(VOID); #endif _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/kefuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -14,8 +14,18 @@ /* PROTOTYPES ****************************************************************/ +BOOLEAN +NTAPI +KeAddSystemServiceTable( + PULONG_PTR Base, + PULONG Count OPTIONAL, + ULONG Limit, + PUCHAR Number, + ULONG Index +); + VOID -STDCALL +NTAPI KeInitializeApc( IN PKAPC Apc, IN PKTHREAD Thread, @@ -28,7 +38,7 @@ ); VOID -STDCALL +NTAPI KeEnterKernelDebugger(VOID); VOID @@ -44,7 +54,7 @@ ); VOID -STDCALL +NTAPI KiDeliverApc( IN KPROCESSOR_MODE PreviousMode, IN PVOID Reserved, @@ -52,81 +62,34 @@ ); VOID -STDCALL +NTAPI KiDispatchInterrupt(VOID); - -BOOLEAN -STDCALL -KeAreApcsDisabled( - VOID - ); - VOID -STDCALL -KeFlushQueuedDpcs( - VOID - ); - -ULONG -STDCALL -KeGetRecommendedSharedDataAlignment( - VOID - ); - -ULONG -STDCALL -KeQueryRuntimeThread( - IN PKTHREAD Thread, - OUT PULONG UserTime - ); - -BOOLEAN -STDCALL -KeSetKernelStackSwapEnable( - IN BOOLEAN Enable - ); - -BOOLEAN -STDCALL -KeDeregisterBugCheckReasonCallback( - IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord - ); - -BOOLEAN -STDCALL -KeRegisterBugCheckReasonCallback( - IN PKBUGCHECK_REASON_CALLBACK_RECORD CallbackRecord, - IN PKBUGCHECK_REASON_CALLBACK_ROUTINE CallbackRoutine, - IN KBUGCHECK_CALLBACK_REASON Reason, - IN PUCHAR Component - ); - -VOID -STDCALL +NTAPI KeTerminateThread( IN KPRIORITY Increment ); BOOLEAN -STDCALL +NTAPI KeIsAttachedProcess(VOID); BOOLEAN -STDCALL +NTAPI KeIsExecutingDpc( VOID ); VOID -STDCALL +NTAPI KeSetEventBoostPriority( IN PKEVENT Event, IN PKTHREAD *Thread OPTIONAL ); PCONFIGURATION_COMPONENT_DATA -STDCALL +NTAPI KeFindConfigurationNextEntry( IN PCONFIGURATION_COMPONENT_DATA Child, IN CONFIGURATION_CLASS Class, @@ -136,7 +99,7 @@ ); PCONFIGURATION_COMPONENT_DATA -STDCALL +NTAPI KeFindConfigurationEntry( IN PCONFIGURATION_COMPONENT_DATA Child, IN CONFIGURATION_CLASS Class, @@ -145,57 +108,45 @@ ); VOID -STDCALL +NTAPI KeFlushEntireTb( IN BOOLEAN Unknown, IN BOOLEAN CurrentCpuOnly ); VOID -STDCALL -KeRevertToUserAffinityThread( - VOID -); - -VOID -STDCALL +NTAPI KiCoprocessorError( VOID ); VOID -STDCALL +NTAPI KiUnexpectedInterrupt( VOID ); VOID -STDCALL +NTAPI KeSetDmaIoCoherency( IN ULONG Coherency ); VOID -STDCALL +NTAPI KeSetProfileIrql( IN KIRQL ProfileIrql ); NTSTATUS -STDCALL +NTAPI KeSetAffinityThread( PKTHREAD Thread, KAFFINITY Affinity ); -VOID -STDCALL -KeSetSystemAffinityThread( - IN KAFFINITY Affinity -); - NTSTATUS -STDCALL +NTAPI KeUserModeCallback( IN ULONG FunctionID, IN PVOID InputBuffer, @@ -205,14 +156,14 @@ ); VOID -STDCALL +NTAPI KeSetTimeIncrement( IN ULONG MaxIncrement, IN ULONG MinIncrement ); VOID -STDCALL +NTAPI KeInitializeInterrupt( PKINTERRUPT InterruptObject, PKSERVICE_ROUTINE ServiceRoutine, @@ -228,19 +179,19 @@ ); BOOLEAN -STDCALL +NTAPI KeConnectInterrupt( PKINTERRUPT InterruptObject ); BOOLEAN -STDCALL +NTAPI KeDisconnectInterrupt( PKINTERRUPT InterruptObject ); PKPROCESS -STDCALL +NTAPI KeGetCurrentProcess( VOID ); @@ -252,36 +203,10 @@ ULONG Value2 ); -LONG -STDCALL -KeReadStateMutant( - IN PKMUTANT Mutant -); - -VOID -STDCALL -KeInitializeMutant( - IN PKMUTANT Mutant, - IN BOOLEAN InitialOwner -); - -LONG -STDCALL -KeReleaseMutant( - IN PKMUTANT Mutant, - IN KPRIORITY Increment, - IN BOOLEAN Abandon, - IN BOOLEAN Wait -); - NTSTATUS -STDCALL +NTAPI KeRaiseUserException( IN NTSTATUS ExceptionCode ); -VOID -STDCALL -KeFlushWriteBuffer(VOID); - #endif _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/ketypes.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -19,28 +19,11 @@ #define SSDT_MAX_ENTRIES 4 #define PROCESSOR_FEATURE_MAX 64 #define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) -#define THREAD_WAIT_OBJECTS 4 -#define THREAD_ALERT 0x4 #ifdef NTOS_MODE_USER #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) #endif -/* EXPORTED DATA *************************************************************/ -#ifndef NTOS_MODE_USER -extern CHAR NTOSAPI KeNumberProcessors; -extern LOADER_PARAMETER_BLOCK NTOSAPI KeLoaderBlock; -extern ULONG NTOSAPI KeDcacheFlushCount; -extern ULONG NTOSAPI KeIcacheFlushCount; -extern KAFFINITY NTOSAPI KeActiveProcessors; -extern ULONG NTOSAPI KiDmaIoCoherency; /* RISC Architectures only */ -extern ULONG NTOSAPI KeMaximumIncrement; -extern ULONG NTOSAPI KeMinimumIncrement; -extern ULONG NTOSAPI NtBuildNumber; -extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; -extern SSDT_ENTRY NTOSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; -#endif - /* ENUMERATIONS **************************************************************/ #ifdef NTOS_MODE_USER @@ -166,6 +149,7 @@ /* FUNCTION TYPES ************************************************************/ +#ifdef NTOS_MODE_USER typedef VOID (NTAPI *PKNORMAL_ROUTINE)( IN PVOID NormalContext, @@ -177,6 +161,7 @@ IN PVOID TimerContext, IN ULONG TimerLowValue, IN LONG TimerHighValue); +#endif /* TYPES *********************************************************************/ @@ -486,6 +471,32 @@ ULONG StackCount; /* 06C */ LIST_ENTRY ProcessListEntry; /* 070 */ } KPROCESS; + +typedef struct _KSERVICE_TABLE_DESCRIPTOR +{ + PULONG_PTR Base; + PULONG Count; + ULONG Limit; +#if defined(_IA64_) + LONG TableBaseGpOffset; +#endif + PUCHAR Number; +} KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; #endif /* !NTOS_MODE_USER */ +/* EXPORTED DATA *************************************************************/ +#ifndef NTOS_MODE_USER +extern CHAR NTSYSAPI KeNumberProcessors; +extern LOADER_PARAMETER_BLOCK NTSYSAPI KeLoaderBlock; +extern ULONG NTSYSAPI KeDcacheFlushCount; +extern ULONG NTSYSAPI KeIcacheFlushCount; +extern KAFFINITY NTSYSAPI KeActiveProcessors; +extern ULONG NTSYSAPI KiDmaIoCoherency; /* RISC Architectures only */ +extern ULONG NTSYSAPI KeMaximumIncrement; +extern ULONG NTSYSAPI KeMinimumIncrement; +extern ULONG NTSYSAPI NtBuildNumber; +extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; +extern KSERVICE_TABLE_DESCRIPTOR NTSYSAPI KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; #endif + +#endif _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-09-04 23:48:19 UTC (rev 17650) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-09-05 04:48:20 UTC (rev 17651) @@ -17,7 +17,7 @@ /* PROTOTYPES ****************************************************************/ NTSTATUS -STDCALL +NTAPI LdrAccessResource( IN PVOID BaseAddress, IN PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry, @@ -26,7 +26,7 @@ [truncated at 1000 lines; 821 more skipped]

1 0

[ion] 17650: - Fix kernel32 and ntoskrnl build issues.
by ion＠svn.reactos.com 04 Sep '05

04 Sep '05

- Fix kernel32 and ntoskrnl build issues. - Define public version of DEVOBJ_EXTENSION in DDK. Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/lib/kernel32/file/mailslot.c --- trunk/reactos/lib/kernel32/file/mailslot.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/lib/kernel32/file/mailslot.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -167,10 +167,12 @@ DWORD lReadTimeout) { FILE_MAILSLOT_SET_INFORMATION Buffer; + LARGE_INTEGER Timeout; IO_STATUS_BLOCK Iosb; NTSTATUS Status; - Buffer.ReadTimeout.QuadPart = lReadTimeout * -10000; + Timeout.QuadPart = lReadTimeout * -10000; + Buffer.ReadTimeout = &Timeout; Status = NtSetInformationFile(hMailslot, &Iosb, _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/device.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -336,17 +336,17 @@ OUT PDEVICE_OBJECT *AttachedToDeviceObject) { PDEVICE_OBJECT AttachedDevice; - PDEVOBJ_EXTENSION SourceDeviceExtension; + PEXTENDED_DEVOBJ_EXTENSION SourceDeviceExtension; DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n", SourceDevice, TargetDevice); /* Get the Attached Device and source extension */ AttachedDevice = IoGetAttachedDevice(TargetDevice); - SourceDeviceExtension = SourceDevice->DeviceObjectExtension; + SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice->DeviceObjectExtension; /* Make sure that it's in a correct state */ - if (!(AttachedDevice->DeviceObjectExtension->ExtensionFlags & + if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)-> ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | DOE_REMOVE_PROCESSED))) { @@ -624,7 +624,7 @@ } /* I guess this should be removed later... but it shouldn't cause problems */ - DeviceObject->DeviceObjectExtension->ExtensionFlags |= DOE_DELETE_PENDING; + ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Exten sionFlags |= DOE_DELETE_PENDING; /* Make the object temporary. This should automatically remove the device from the namespace */ @@ -650,7 +650,7 @@ DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice); /* Remove the attachment */ - TargetDevice->AttachedDevice->DeviceObjectExtension->AttachedTo = NULL; + ((PEXTENDED_DEVOBJ_EXTENSION)TargetDevice->AttachedDevice->DeviceObjectE xtension)->AttachedTo = NULL; TargetDevice->AttachedDevice = NULL; } @@ -758,7 +758,7 @@ IoGetDeviceAttachmentBaseRef(IN PDEVICE_OBJECT DeviceObject) { /* Return the attached Device */ - return (DeviceObject->DeviceObjectExtension->AttachedTo); + return (((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Atta chedTo); } /* @@ -790,7 +790,7 @@ IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, OUT PDEVICE_OBJECT *DiskDeviceObject) { - PDEVOBJ_EXTENSION DeviceExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; PVPB Vpb; KIRQL OldIrql; @@ -801,7 +801,7 @@ IoAcquireVpbSpinLock(&OldIrql); /* Get the Device Extension */ - DeviceExtension = FileSystemDeviceObject->DeviceObjectExtension; + DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)FileSystemDeviceObject->DeviceObjectExtensio n; /* Make sure this one has a VPB too */ Vpb = DeviceExtension->Vpb; @@ -825,7 +825,7 @@ STDCALL IoGetLowerDeviceObject(IN PDEVICE_OBJECT DeviceObject) { - PDEVOBJ_EXTENSION DeviceExtension = DeviceObject->DeviceObjectExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension; PDEVICE_OBJECT LowerDeviceObject = NULL; /* Make sure it's not getting deleted */ _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -618,8 +618,8 @@ ASSERT(PdoNameInfo->Name.Length); /* Create base key name for this interface: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{GUID} */ - ASSERT(PhysicalDeviceObject->DeviceObjectExtension->DeviceNode); - InstancePath = &PhysicalDeviceObject->DeviceObjectExtension->DeviceNode->InstancePath; + ASSERT(((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectEx tension)->DeviceNode); + InstancePath = &((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtensio n)->DeviceNode->InstancePath; BaseKeyName.Length = wcslen(BaseKeyString) * sizeof(WCHAR); BaseKeyName.MaximumLength = BaseKeyName.Length + GuidString.Length; _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/file.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -751,7 +751,7 @@ PFILE_OBJECT FileObject = NULL; PDEVICE_OBJECT DeviceObject; PIRP Irp; - PIO_STACK_LOCATION StackLoc; + PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; HANDLE LocalHandle; @@ -999,7 +999,7 @@ * Get the stack location for the new * IRP and prepare it. */ - StackLoc = IoGetNextIrpStackLocation(Irp); + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); StackLoc->MinorFunction = 0; StackLoc->Flags = (UCHAR)Options; StackLoc->Control = 0; _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -439,7 +439,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; } switch (RelatedDeviceData->Relation) @@ -518,7 +518,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; switch (StatusData->Operation) { @@ -559,7 +559,7 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; - DeviceNode = DeviceObject->DeviceObjectExtension->DeviceNode; + DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; DepthData->Depth = DeviceNode->Level; _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-04 23:48:19 UTC (rev 17650) @@ -30,7 +30,7 @@ IopGetDeviceNode( PDEVICE_OBJECT DeviceObject) { - return DeviceObject->DeviceObjectExtension->DeviceNode; + return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; } NTSTATUS @@ -619,7 +619,7 @@ Node->PhysicalDeviceObject = PhysicalDeviceObject; - PhysicalDeviceObject->DeviceObjectExtension->DeviceNode = Node; + ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension )->DeviceNode = Node; if (ParentNode) { _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:48:19 UTC (rev 17650) @@ -2668,6 +2668,13 @@ KSPIN_LOCK SpinLock; } ERESOURCE, *PERESOURCE; +typedef struct _DEVOBJ_EXTENSION +{ + CSHORT Type; + USHORT Size; + PDEVICE_OBJECT DeviceObject; +} DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; + typedef struct _DRIVER_EXTENSION { struct _DRIVER_OBJECT *DriverObject; PDRIVER_ADD_DEVICE AddDevice; _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-09-04 23:26:35 UTC (rev 17649) +++ trunk/reactos/w32api/include/ntdef.h 2005-09-04 23:48:19 UTC (rev 17650) @@ -8,6 +8,7 @@ #define RESTRICTED_POINTER #define NTAPI __stdcall + #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010 #define OBJ_EXCLUSIVE 0x00000020

1 0

[ion] 17649: - Define NTSYSAPI and NTSYSCALLAPI
by ion＠svn.reactos.com 04 Sep '05

04 Sep '05

- Define NTSYSAPI and NTSYSCALLAPI Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:18:34 UTC (rev 17648) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-04 23:26:35 UTC (rev 17649) @@ -38,6 +38,7 @@ #define DDKFASTAPI __fastcall #define DDKCDECLAPI __cdecl +/* FIXME: REMOVE THIS UNCOMPATIBLE CRUFT!!! */ #if defined(_NTOSKRNL_) #ifndef NTOSAPI #define NTOSAPI DECL_EXPORT @@ -82,6 +83,18 @@ # define _DDK_DUMMYUNION_N_MEMBER(n, name) name #endif +#if !defined(_NTSYSTEM_) +#define NTSYSAPI DECLSPEC_IMPORT +#define NTSYSCALLAPI DECLSPEC_IMPORT +#else +#define NTSYSAPI +#if defined(_NTDLLBUILD_) +#define NTSYSCALLAPI +#else +#define NTSYSCALLAPI DECLSPEC_ADDRSAFE +#endif +#endif + /* ** Forward declarations */

1 0

[ion] 17648: - Fix incorrect PFILE_MAILSLOT_SET_INFORMATION definition
by ion＠svn.reactos.com 04 Sep '05

04 Sep '05

- Fix incorrect PFILE_MAILSLOT_SET_INFORMATION definition - Fix MSFS to build with MSDDK. - Fix iotypes.h to be MSDDK compatible. Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/ms/finfo.c Modified: trunk/reactos/drivers/fs/ms/fsctrl.c Modified: trunk/reactos/drivers/fs/ms/msfs.c Modified: trunk/reactos/drivers/fs/ms/msfs.h Modified: trunk/reactos/drivers/fs/ms/rw.c Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/create.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -101,7 +101,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -229,7 +229,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/finfo.c --- trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/finfo.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -60,13 +60,13 @@ if (*BufferLength < sizeof(FILE_MAILSLOT_SET_INFORMATION)) return(STATUS_BUFFER_OVERFLOW); - Fcb->Mailslot->TimeOut = Buffer->ReadTimeout; + Fcb->Mailslot->TimeOut = *Buffer->ReadTimeout; return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -132,7 +132,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/fsctrl.c --- trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/fsctrl.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/drivers/fs/ms/msfs.c --- trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/msfs.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { _____ Modified: trunk/reactos/drivers/fs/ms/msfs.h --- trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/msfs.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -4,6 +4,22 @@ #include <ntifs.h> #include <ndk/iotypes.h> +/* + * FIXME: GCC doesn't have a working option for defaulting to a calling + * convention. It will always default to cdecl. The MS DDK was designed + * for compilers which support this option, and thus some of their headers + * do not specify STDCALL or NTAPI everywhere. As such, callbacks will be + * interpreted as cdecl on gcc, while they should be stdcall. Defining + * NTAPI manually won't work either, since msvc will realize that the + * two definitions are different. So we have to use something to close + * the compatibility gap, until someone fixes gcc. + */ +#ifdef _MSC_VER +#define DEFAULTAPI +#else +#define DEFAULTAPI __stdcall +#endif + typedef struct _MSFS_DEVICE_EXTENSION { LIST_ENTRY MailslotListHead; @@ -48,16 +64,16 @@ #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); -NTSTATUS STDCALL MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsCreateMailslot(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsQueryInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsSetInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS STDCALL MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS DEFAULTAPI MsfsFileSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); #endif /* __SERVICES_FS_NP_NPFS_H */ _____ Modified: trunk/reactos/drivers/fs/ms/rw.c --- trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/drivers/fs/ms/rw.c 2005-09-04 23:18:34 UTC (rev 17648) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -93,7 +93,7 @@ } -NTSTATUS STDCALL +NTSTATUS DEFAULTAPI MsfsWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { _____ Modified: trunk/reactos/include/ndk/iotypes.h --- trunk/reactos/include/ndk/iotypes.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/include/ndk/iotypes.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -14,11 +14,10 @@ /* EXPORTED DATA *************************************************************/ #ifndef NTOS_MODE_USER -extern POBJECT_TYPE NTOSAPI IoAdapterObjectType; -extern POBJECT_TYPE NTOSAPI IoDeviceHandlerObjectType; -extern POBJECT_TYPE NTOSAPI IoDeviceObjectType; -extern POBJECT_TYPE NTOSAPI IoDriverObjectType; -extern POBJECT_TYPE NTOSAPI IoFileObjectType; +extern POBJECT_TYPE NTSYSAPI IoAdapterObjectType; +extern POBJECT_TYPE NTSYSAPI IoDeviceHandlerObjectType; +extern POBJECT_TYPE NTSYSAPI IoDeviceObjectType; +extern POBJECT_TYPE NTSYSAPI IoDriverObjectType; #endif /* CONSTANTS *****************************************************************/ @@ -369,7 +368,7 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION { - LARGE_INTEGER ReadTimeout; + PLARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; typedef struct _FILE_BOTH_DIR_INFORMATION @@ -554,12 +553,12 @@ struct _DEVICE_NODE *PrevSibling; struct _DEVICE_NODE *NextSibling; struct _DEVICE_NODE *Child; - UINT Level; + ULONG Level; struct _PO_DEVICE_NOTIFY *Notify; PNP_DEVNODE_STATE State; PNP_DEVNODE_STATE PreviousState; PNP_DEVNODE_STATE StateHistory[20]; - UINT StateHistoryEntry; + ULONG StateHistoryEntry; INT CompletionStatus; PIRP PendingIrp; ULONG Flags; @@ -625,7 +624,7 @@ UCHAR ResourcesChanged; } PI_RESOURCE_ARBITER_ENTRY, *PPI_RESOURCE_ARBITER_ENTRY; -typedef struct _DEVOBJ_EXTENSION +typedef struct _EXTENDED_DEVOBJ_EXTENSION { CSHORT Type; USHORT Size; @@ -639,7 +638,7 @@ LONG StartIoKey; ULONG StartIoFlags; struct _VPB *Vpb; -} DEVOBJ_EXTENSION, *PDEVOBJ_EXTENSION; +} EXTENDED_DEVOBJ_EXTENSION, *PEXTENDED_DEVOBJ_EXTENSION; typedef struct _PRIVATE_DRIVER_EXTENSIONS { _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-04 22:33:28 UTC (rev 17647) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-04 23:18:34 UTC (rev 17648) @@ -899,7 +899,7 @@ } FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION; typedef struct _FILE_MAILSLOT_SET_INFORMATION { - LARGE_INTEGER ReadTimeout; + PLARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; typedef struct _FILE_MODE_INFORMATION {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs