Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 36934: - Change SetSysColorsTemp declaration
by dchapyshev＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: dchapyshev Date: Sat Oct 25 02:39:33 2008 New Revision: 36934 URL: http://svn.reactos.org/svn/reactos?rev=36934&view=rev Log: - Change SetSysColorsTemp declaration Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Oct 25 02:39:33 2008 @@ -4201,7 +4201,7 @@ int WINAPI SetScrollPos(HWND,int,int,BOOL); BOOL WINAPI SetScrollRange(HWND,int,int,int,BOOL); BOOL WINAPI SetSysColors(int,const INT *,const COLORREF *); -HANDLE WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, int); +DWORD WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD); #define SetSysModalWindow(h) (NULL) BOOL WINAPI SetSystemCursor(HCURSOR,DWORD); BOOL WINAPI SetThreadDesktop(HDESK);

1 0

[dchapyshev] 36933: DefWindowProcA/W: - Fix WM_GETTEXTLENGHT message - Add WM_IME_NOTIFY message - Implement WM_IME_KEYDOWN, WM_IME_KEYUP, WM_IME_SETCONTEXT, WM_IME_CHAR, WM_IME_STARTCOMPOSITION, WM_IME_COMPOSITION, WM_IME_ENDCOMPOSITION, WM_IME_SELECT, WM_IME_NOTIFY - Remove CascadeWindows and TileWindows from window.c (it is already declared in mdi.c) - Implement TileChildWindows, CascadeChildWindows, GetInternalWindowPos, SetSysColorsTemp - Add checking params for GetProcessDefaultLayout, Set
by dchapyshev＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: dchapyshev Date: Sat Oct 25 02:37:48 2008 New Revision: 36933 URL: http://svn.reactos.org/svn/reactos?rev=36933&view=rev Log: DefWindowProcA/W: - Fix WM_GETTEXTLENGHT message - Add WM_IME_NOTIFY message - Implement WM_IME_KEYDOWN, WM_IME_KEYUP, WM_IME_SETCONTEXT, WM_IME_CHAR, WM_IME_STARTCOMPOSITION, WM_IME_COMPOSITION, WM_IME_ENDCOMPOSITION, WM_IME_SELECT, WM_IME_NOTIFY - Remove CascadeWindows and TileWindows from window.c (it is already declared in mdi.c) - Implement TileChildWindows, CascadeChildWindows, GetInternalWindowPos, SetSysColorsTemp - Add checking params for GetProcessDefaultLayout, SetProcessDefaultLayout, GetMouseMovePointsEx, GetRawInputDeviceList - LockSetForegroundWindow return TRUE - GetRawInputBuffer, GetRawInputDeviceInfoA/W, DefRawInputProc, GetRawInputData, GetRegisteredRawInputDevices return 0 Based on Wine implementation Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sat Oct 25 02:37:48 2008 @@ -42,8 +42,22 @@ int nBufPoints, DWORD resolution) { - UNIMPLEMENTED; - return 0; + if((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + + if(!lppt || !lpptBuf) + { + SetLastError(ERROR_NOACCESS); + return -1; + } + + UNIMPLEMENTED; + + SetLastError(ERROR_POINT_NOT_FOUND); + return -1; } @@ -137,8 +151,15 @@ LPPOINT ptIcon ) { - UNIMPLEMENTED; - return FALSE; + WINDOWPLACEMENT wndpl; + + if (GetWindowPlacement(hwnd, &wndpl)) + { + if (rectWnd) *rectWnd = wndpl.rcNormalPosition; + if (ptIcon) *ptIcon = wndpl.ptMinPosition; + return wndpl.showCmd; + } + return 0; } /* @@ -226,41 +247,91 @@ return NtUserCallOneParam((DWORD) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE); } -/* - * @unimplemented - */ -HANDLE + +/************************************************************************* + * SetSysColorsTemp (USER32.@) (Wine 10/22/2008) + * + * UNDOCUMENTED !! + * + * Called by W98SE desk.cpl Control Panel Applet: + * handle = SetSysColorsTemp(ptr, ptr, nCount); ("set" call) + * result = SetSysColorsTemp(NULL, NULL, handle); ("restore" call) + * + * pPens is an array of COLORREF values, which seems to be used + * to indicate the color values to create new pens with. + * + * pBrushes is an array of solid brush handles (returned by a previous + * CreateSolidBrush), which seems to contain the brush handles to set + * for the system colors. + * + * n seems to be used for + * a) indicating the number of entries to operate on (length of pPens, + * pBrushes) + * b) passing the handle that points to the previously used color settings. + * I couldn't figure out in hell what kind of handle this is on + * Windows. I just use a heap handle instead. Shouldn't matter anyway. + * + * RETURNS + * heap handle of our own copy of the current syscolors in case of + * "set" call, i.e. pPens, pBrushes != NULL. + * TRUE (unconditionally !) in case of "restore" call, + * i.e. pPens, pBrushes == NULL. + * FALSE in case of either pPens != NULL and pBrushes == NULL + * or pPens == NULL and pBrushes != NULL. + * + * I'm not sure whether this implementation is 100% correct. [AM] + */ + +static HPEN SysColorPens[COLOR_MENUBAR + 1]; +static HBRUSH SysColorBrushes[COLOR_MENUBAR + 1]; + +DWORD WINAPI -SetSysColorsTemp( - const COLORREF *pPens, - const HBRUSH *pBrushes, - INT n - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -WORD -STDCALL -CascadeChildWindows ( HWND hWndParent, WORD wFlags ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -WORD -STDCALL -TileChildWindows ( HWND hWndParent, WORD wFlags ) -{ - UNIMPLEMENTED; - return FALSE; +SetSysColorsTemp(const COLORREF *pPens, + const HBRUSH *pBrushes, + DWORD n) +{ + DWORD i; + + if (pPens && pBrushes) /* "set" call */ + { + /* allocate our structure to remember old colors */ + LPVOID pOldCol = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)+n*sizeof(HPEN)+n*sizeof(HBRUSH)); + LPVOID p = pOldCol; + *(DWORD *)p = n; p = (char*)p + sizeof(DWORD); + memcpy(p, SysColorPens, n*sizeof(HPEN)); p = (char*)p + n*sizeof(HPEN); + memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); p = (char*)p + n*sizeof(HBRUSH); + + for (i=0; i < n; i++) + { + SysColorPens[i] = CreatePen( PS_SOLID, 1, pPens[i] ); + SysColorBrushes[i] = pBrushes[i]; + } + + return (DWORD) pOldCol; /* FIXME: pointer truncation */ + } + if (!pPens && !pBrushes) /* "restore" call */ + { + LPVOID pOldCol = (LPVOID)n; /* FIXME: not 64-bit safe */ + LPVOID p = pOldCol; + DWORD nCount = *(DWORD *)p; + p = (char*)p + sizeof(DWORD); + + for (i=0; i < nCount; i++) + { + DeleteObject(SysColorPens[i]); + SysColorPens[i] = *(HPEN *)p; p = (char*)p + sizeof(HPEN); + } + for (i=0; i < nCount; i++) + { + SysColorBrushes[i] = *(HBRUSH *)p; p = (char*)p + sizeof(HBRUSH); + } + /* get rid of storage structure */ + HeapFree(GetProcessHeap(), 0, pOldCol); + + return TRUE; + } + return FALSE; } /* @@ -308,7 +379,7 @@ PUINT pcbSize) { UNIMPLEMENTED; - return FALSE; + return 0; } /* @@ -340,7 +411,7 @@ PUINT pcbSize) { UNIMPLEMENTED; - return FALSE; + return 0; } /* @@ -365,7 +436,7 @@ UINT cbSizeHeader) { UNIMPLEMENTED; - return FALSE; + return 0; } /* @@ -374,12 +445,12 @@ UINT STDCALL GetRawInputBuffer( - PRAWINPUT pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - UNIMPLEMENTED; - return FALSE; + PRAWINPUT pData, + PUINT pcbSize, + UINT cbSizeHeader) +{ + UNIMPLEMENTED; + return 0; } /* @@ -388,14 +459,14 @@ UINT STDCALL GetRawInputData( - HRAWINPUT hRawInput, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - UNIMPLEMENTED; - return FALSE; + HRAWINPUT hRawInput, + UINT uiCommand, + LPVOID pData, + PUINT pcbSize, + UINT cbSizeHeader) +{ + UNIMPLEMENTED; + return 0; } /* @@ -408,8 +479,12 @@ PUINT puiNumDevices, UINT cbSize) { - UNIMPLEMENTED; - return FALSE; + if(pRawInputDeviceList) + memset(pRawInputDeviceList, 0, sizeof *pRawInputDeviceList); + *puiNumDevices = 0; + + UNIMPLEMENTED; + return 0; } /* @@ -423,7 +498,7 @@ UINT cbSize) { UNIMPLEMENTED; - return FALSE; + return 0; } /* Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Oct 25 02:37:48 2008 @@ -1194,6 +1194,7 @@ if (hDC) { HICON hIcon; + if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE && (hIcon = (HICON)GetClassLongW(hWnd, GCL_HICON)) != NULL) { @@ -1762,6 +1763,75 @@ } +/* + * helpers for calling IMM32 (from Wine 10/22/2008) + * + * WM_IME_* messages are generated only by IMM32, + * so I assume imm32 is already LoadLibrary-ed. + */ +static HWND +DefWndImmGetDefaultIMEWnd(HWND hwnd) +{ + HINSTANCE hInstIMM = GetModuleHandleW(L"imm32\0"); + HWND (WINAPI *pFunc)(HWND); + HWND hwndRet = 0; + + if (!hInstIMM) + { + ERR("cannot get IMM32 handle\n"); + return 0; + } + + pFunc = (void*) GetProcAddress(hInstIMM, "ImmGetDefaultIMEWnd"); + if (pFunc != NULL) + hwndRet = (*pFunc)(hwnd); + + return hwndRet; +} + + +static BOOL +DefWndImmIsUIMessageA(HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HINSTANCE hInstIMM = GetModuleHandleW(L"imm32\0"); + BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM); + BOOL fRet = FALSE; + + if (!hInstIMM) + { + ERR("cannot get IMM32 handle\n"); + return FALSE; + } + + pFunc = (void*) GetProcAddress(hInstIMM, "ImmIsUIMessageA"); + if (pFunc != NULL) + fRet = (*pFunc)(hwndIME, msg, wParam, lParam); + + return fRet; +} + + +static BOOL +DefWndImmIsUIMessageW(HWND hwndIME, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HINSTANCE hInstIMM = GetModuleHandleW(L"imm32\0"); + BOOL (WINAPI *pFunc)(HWND,UINT,WPARAM,LPARAM); + BOOL fRet = FALSE; + + if (!hInstIMM) + { + ERR("cannot get IMM32 handle\n"); + return FALSE; + } + + pFunc = (void*) GetProcAddress(hInstIMM, "ImmIsUIMessageW"); + if (pFunc != NULL) + fRet = (*pFunc)(hwndIME, msg, wParam, lParam); + + return fRet; +} + + LRESULT STDCALL DefWindowProcA(HWND hWnd, UINT Msg, @@ -1784,13 +1854,13 @@ if(cs->lpszName) { - RtlInitAnsiString(&AnsiString, (LPSTR)cs->lpszName); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); + RtlInitAnsiString(&AnsiString, (LPSTR)cs->lpszName); + RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); + NtUserDefSetText(hWnd, &UnicodeString); + RtlFreeUnicodeString(&UnicodeString); } else - NtUserDefSetText(hWnd, NULL); + NtUserDefSetText(hWnd, NULL); Result = 1; break; @@ -1810,9 +1880,11 @@ buf, Wnd->WindowName.Length))) { - Result = (LRESULT)len; + Result = (LRESULT) len; } } + else Result = 0L; + break; } @@ -1859,13 +1931,13 @@ if(lParam) { - RtlInitAnsiString(&AnsiString, (LPSTR)lParam); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); + RtlInitAnsiString(&AnsiString, (LPSTR)lParam); + RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); + NtUserDefSetText(hWnd, &UnicodeString); + RtlFreeUnicodeString(&UnicodeString); } else - NtUserDefSetText(hWnd, NULL); + NtUserDefSetText(hWnd, NULL); if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { @@ -1876,16 +1948,50 @@ break; } -/* FIXME: Implement these. */ + case WM_IME_KEYDOWN: + { + Result = PostMessageA(hWnd, WM_KEYDOWN, wParam, lParam); + break; + } + + case WM_IME_KEYUP: + { + Result = PostMessageA(hWnd, WM_KEYUP, wParam, lParam); + break; + } + case WM_IME_CHAR: - case WM_IME_KEYDOWN: - case WM_IME_KEYUP: + { + if (HIBYTE(wParam)) + PostMessageA(hWnd, WM_CHAR, HIBYTE(wParam), lParam); + PostMessageA(hWnd, WM_CHAR, LOBYTE(wParam), lParam); + break; + } + case WM_IME_STARTCOMPOSITION: case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: + case WM_IME_NOTIFY: + { + HWND hwndIME; + + hwndIME = DefWndImmGetDefaultIMEWnd(hWnd); + if (hwndIME) + Result = SendMessageA(hwndIME, Msg, wParam, lParam); + break; + } + case WM_IME_SETCONTEXT: - FIXME("FIXME: WM_IME_* conversion isn't implemented yet!"); + { + HWND hwndIME; + + hwndIME = DefWndImmGetDefaultIMEWnd(hWnd); + if (hwndIME) + Result = DefWndImmIsUIMessageA(hwndIME, Msg, wParam, lParam); + break; + } + /* fall through */ default: Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, FALSE); @@ -1916,9 +2022,9 @@ * may have child window IDs instead of window name */ if(cs->lpszName) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)cs->lpszName); - - NtUserDefSetText( hWnd, (cs->lpszName ? &UnicodeString : NULL)); + RtlInitUnicodeString(&UnicodeString, (LPWSTR)cs->lpszName); + + NtUserDefSetText(hWnd, (cs->lpszName ? &UnicodeString : NULL)); Result = 1; break; } @@ -1937,9 +2043,11 @@ buf, Wnd->WindowName.Length))) { - Result = (LRESULT)len; + Result = (LRESULT) (Wnd->WindowName.Length / sizeof(WCHAR)); } } + else Result = 0L; + break; } @@ -1978,7 +2086,7 @@ UNICODE_STRING UnicodeString; if(lParam) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)lParam); + RtlInitUnicodeString(&UnicodeString, (LPWSTR)lParam); NtUserDefSetText(hWnd, (lParam ? &UnicodeString : NULL)); @@ -1992,16 +2100,44 @@ case WM_IME_CHAR: { - SendMessageW(hWnd, WM_CHAR, wParam, lParam); + PostMessageW(hWnd, WM_CHAR, wParam, lParam); Result = 0; break; } + case WM_IME_KEYDOWN: + { + Result = PostMessageW(hWnd, WM_KEYDOWN, wParam, lParam); + break; + } + + case WM_IME_KEYUP: + { + Result = PostMessageW(hWnd, WM_KEYUP, wParam, lParam); + break; + } + + case WM_IME_STARTCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_SELECT: + case WM_IME_NOTIFY: + { + HWND hwndIME; + + hwndIME = DefWndImmGetDefaultIMEWnd(hWnd); + if (hwndIME) + Result = SendMessageW(hwndIME, Msg, wParam, lParam); + break; + } + case WM_IME_SETCONTEXT: { - /* FIXME */ - FIXME("FIXME: WM_IME_SETCONTEXT is not implemented!"); - Result = 0; + HWND hwndIME; + + hwndIME = DefWndImmGetDefaultIMEWnd(hWnd); + if (hwndIME) + Result = DefWndImmIsUIMessageW(hwndIME, Msg, wParam, lParam); break; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Oct 25 02:37:48 2008 @@ -96,27 +96,23 @@ } -/* - * @unimplemented - */ -/* -WORD STDCALL -CascadeWindows(HWND hwndParent, - UINT wHow, - CONST RECT *lpRect, - UINT cKids, - const HWND *lpKids) -{ - UNIMPLEMENTED; - return 0; -} -*/ - VOID STDCALL SwitchToThisWindow(HWND hwnd, BOOL fUnknown) { ShowWindow(hwnd, SW_SHOW); } + + +/* + * @implemented + */ +WORD +STDCALL +CascadeChildWindows ( HWND hWndParent, WORD wFlags ) +{ + return CascadeWindows(hWndParent, wFlags, NULL, 0, NULL); +} + /* * @implemented @@ -1003,8 +999,16 @@ BOOL STDCALL GetProcessDefaultLayout(DWORD *pdwDefaultLayout) { + if (!pdwDefaultLayout) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + UNIMPLEMENTED; - return FALSE; + + *pdwDefaultLayout = 0; + return TRUE; } @@ -1502,7 +1506,7 @@ LockSetForegroundWindow(UINT uLockCode) { UNIMPLEMENTED; - return FALSE; + return TRUE; } @@ -1602,6 +1606,9 @@ BOOL STDCALL SetProcessDefaultLayout(DWORD dwDefaultLayout) { + if (dwDefaultLayout == 0) + return TRUE; + UNIMPLEMENTED; return FALSE; } @@ -1739,23 +1746,6 @@ { return NtUserShowWindowAsync(hWnd, nCmdShow); } - - -/* - * @unimplemented - */ -/* -WORD STDCALL -TileWindows(HWND hwndParent, - UINT wHow, - CONST RECT *lpRect, - UINT cKids, - const HWND *lpKids) -{ - UNIMPLEMENTED; - return 0; -} -*/ /* @@ -2003,6 +1993,16 @@ /* * @implemented */ +WORD +STDCALL +TileChildWindows(HWND hWndParent, WORD wFlags) +{ + return TileWindows(hWndParent, wFlags, NULL, 0, NULL); +} + +/* + * @implemented + */ BOOL STDCALL AnyPopup(VOID) {

1 0

[dchapyshev] 36932: - Sync iads.idl with wine - Add some defines to winnt.h
by dchapyshev＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: dchapyshev Date: Sat Oct 25 02:15:16 2008 New Revision: 36932 URL: http://svn.reactos.org/svn/reactos?rev=36932&view=rev Log: - Sync iads.idl with wine - Add some defines to winnt.h Modified: trunk/reactos/include/psdk/iads.idl trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/iads.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iads.idl?rev=… ============================================================================== --- trunk/reactos/include/psdk/iads.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iads.idl [iso-8859-1] Sat Oct 25 02:15:16 2008 @@ -18,6 +18,30 @@ import "oaidl.idl"; +typedef enum +{ + ADS_RIGHT_DS_CREATE_CHILD = 0x00000001, + ADS_RIGHT_DS_DELETE_CHILD = 0x00000002, + ADS_RIGHT_ACTRL_DS_LIST = 0x00000004, + ADS_RIGHT_DS_SELF = 0x00000008, + ADS_RIGHT_DS_READ_PROP = 0x00000010, + ADS_RIGHT_DS_WRITE_PROP = 0x00000020, + ADS_RIGHT_DS_DELETE_TREE = 0x00000040, + ADS_RIGHT_DS_LIST_OBJECT = 0x00000080, + ADS_RIGHT_DS_CONTROL_ACCESS = 0x00000100, + + ADS_RIGHT_DELETE = 0x00010000, + ADS_RIGHT_READ_CONTROL = 0x00020000, + ADS_RIGHT_WRITE_DAC = 0x00040000, + ADS_RIGHT_WRITE_OWNER = 0x00080000, + ADS_RIGHT_SYNCHRONIZE = 0x00100000, + ADS_RIGHT_ACCESS_SYSTEM_SECURITY = 0x00200000, + + ADS_RIGHT_GENERIC_ALL = 0x10000000, + ADS_RIGHT_GENERIC_EXECUTE = 0x20000000, + ADS_RIGHT_GENERIC_WRITE = 0x40000000, + ADS_RIGHT_GENERIC_READ = 0x80000000 +} ADS_RIGHTS_ENUM; /***************************************************************************** * IADsContainer interface Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Oct 25 02:15:16 2008 @@ -568,6 +568,12 @@ #define SECURITY_NETWORK_SERVICE_RID 0x00000014L #define SECURITY_NT_NON_UNIQUE 0x00000015L #define SECURITY_BUILTIN_DOMAIN_RID 0x00000020L + +#define SECURITY_PACKAGE_BASE_RID 0x00000040L +#define SECURITY_PACKAGE_NTLM_RID 0x0000000AL +#define SECURITY_PACKAGE_SCHANNEL_RID 0x0000000EL +#define SECURITY_PACKAGE_DIGEST_RID 0x00000015L +#define SECURITY_OTHER_ORGANIZATION_RID 0x000003E8L #define SECURITY_LOGON_IDS_RID_COUNT 0x3 #define SID_REVISION 1

1 0

[dchapyshev] 36931: - Implement RtlFindCharInUnicodeString - Implement RtlInitializeSListHead, RtlFirstEntrySList, RtlQueryDepthSList Based on Wine implementation
by dchapyshev＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: dchapyshev Date: Sat Oct 25 02:12:41 2008 New Revision: 36931 URL: http://svn.reactos.org/svn/reactos?rev=36931&view=rev Log: - Implement RtlFindCharInUnicodeString - Implement RtlInitializeSListHead, RtlFirstEntrySList, RtlQueryDepthSList Based on Wine implementation Modified: trunk/reactos/lib/rtl/slist.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/slist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/slist.c?rev=36931&… ============================================================================== --- trunk/reactos/lib/rtl/slist.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/slist.c [iso-8859-1] Sat Oct 25 02:12:41 2008 @@ -19,21 +19,33 @@ NTAPI RtlInitializeSListHead(IN PSLIST_HEADER ListHead) { +#ifdef _WIN64 UNIMPLEMENTED; +#else + ListHead->Alignment = 0; +#endif } PSLIST_ENTRY NTAPI RtlFirstEntrySList(IN const SLIST_HEADER *ListHead) { +#ifdef _WIN64 UNIMPLEMENTED; return NULL; +#else + return ListHead->Next.Next; +#endif } WORD NTAPI RtlQueryDepthSList(IN PSLIST_HEADER ListHead) { +#ifdef _WIN64 UNIMPLEMENTED; return 0; +#else + return ListHead->Depth; +#endif } Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=3693… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Sat Oct 25 02:12:41 2008 @@ -229,56 +229,56 @@ char bMinus = 0; while (*str != '\0' && *str <= ' ') { - str++; + str++; } /* while */ if (*str == '+') { - str++; + str++; } else if (*str == '-') { - bMinus = 1; - str++; + bMinus = 1; + str++; } /* if */ if (base == 0) { - base = 10; - if (str[0] == '0') { - if (str[1] == 'b') { - str += 2; - base = 2; - } else if (str[1] == 'o') { - str += 2; - base = 8; - } else if (str[1] == 'x') { - str += 2; - base = 16; - } /* if */ - } /* if */ + base = 10; + if (str[0] == '0') { + if (str[1] == 'b') { + str += 2; + base = 2; + } else if (str[1] == 'o') { + str += 2; + base = 8; + } else if (str[1] == 'x') { + str += 2; + base = 16; + } /* if */ + } /* if */ } else if (base != 2 && base != 8 && base != 10 && base != 16) { - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } /* if */ if (value == NULL) { - return STATUS_ACCESS_VIOLATION; + return STATUS_ACCESS_VIOLATION; } /* if */ while (*str != '\0') { - chCurrent = *str; - if (chCurrent >= '0' && chCurrent <= '9') { - digit = chCurrent - '0'; - } else if (chCurrent >= 'A' && chCurrent <= 'Z') { - digit = chCurrent - 'A' + 10; - } else if (chCurrent >= 'a' && chCurrent <= 'z') { - digit = chCurrent - 'a' + 10; - } else { - digit = -1; - } /* if */ - if (digit < 0 || digit >= (int)base) { - *value = bMinus ? -RunningTotal : RunningTotal; - return STATUS_SUCCESS; - } /* if */ - - RunningTotal = RunningTotal * base + digit; - str++; + chCurrent = *str; + if (chCurrent >= '0' && chCurrent <= '9') { + digit = chCurrent - '0'; + } else if (chCurrent >= 'A' && chCurrent <= 'Z') { + digit = chCurrent - 'A' + 10; + } else if (chCurrent >= 'a' && chCurrent <= 'z') { + digit = chCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= (int)base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ + + RunningTotal = RunningTotal * base + digit; + str++; } /* while */ *value = bMinus ? -RunningTotal : RunningTotal; @@ -546,34 +546,34 @@ ULONG len; if (base == 0) { - base = 10; + base = 10; } else if (base != 2 && base != 8 && base != 10 && base != 16) { - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } /* if */ pos = &buffer[32]; *pos = '\0'; do { - pos--; - digit = value % base; - value = value / base; - if (digit < 10) { - *pos = '0' + digit; - } else { - *pos = 'A' + digit - 10; - } /* if */ + pos--; + digit = value % base; + value = value / base; + if (digit < 10) { + *pos = '0' + digit; + } else { + *pos = 'A' + digit - 10; + } /* if */ } while (value != 0L); len = &buffer[32] - pos; if (len > length) { - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_OVERFLOW; } else if (str == NULL) { - return STATUS_ACCESS_VIOLATION; + return STATUS_ACCESS_VIOLATION; } else if (len == length) { - memcpy(str, pos, len); + memcpy(str, pos, len); } else { - memcpy(str, pos, len + 1); + memcpy(str, pos, len + 1); } /* if */ return STATUS_SUCCESS; } @@ -800,65 +800,65 @@ char bMinus = 0; while (CharsRemaining >= 1 && *lpwstr <= ' ') { - lpwstr++; - CharsRemaining--; + lpwstr++; + CharsRemaining--; } /* while */ if (CharsRemaining >= 1) { - if (*lpwstr == '+') { - lpwstr++; - CharsRemaining--; - } else if (*lpwstr == '-') { - bMinus = 1; - lpwstr++; - CharsRemaining--; - } /* if */ + if (*lpwstr == '+') { + lpwstr++; + CharsRemaining--; + } else if (*lpwstr == '-') { + bMinus = 1; + lpwstr++; + CharsRemaining--; } /* if */ + } /* if */ if (base == 0) { - base = 10; - if (CharsRemaining >= 2 && lpwstr[0] == '0') { - if (lpwstr[1] == 'b') { - lpwstr += 2; - CharsRemaining -= 2; - base = 2; - } else if (lpwstr[1] == 'o') { - lpwstr += 2; - CharsRemaining -= 2; - base = 8; - } else if (lpwstr[1] == 'x') { - lpwstr += 2; - CharsRemaining -= 2; - base = 16; - } /* if */ - } /* if */ + base = 10; + if (CharsRemaining >= 2 && lpwstr[0] == '0') { + if (lpwstr[1] == 'b') { + lpwstr += 2; + CharsRemaining -= 2; + base = 2; + } else if (lpwstr[1] == 'o') { + lpwstr += 2; + CharsRemaining -= 2; + base = 8; + } else if (lpwstr[1] == 'x') { + lpwstr += 2; + CharsRemaining -= 2; + base = 16; + } /* if */ + } /* if */ } else if (base != 2 && base != 8 && base != 10 && base != 16) { - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } /* if */ if (value == NULL) { - return STATUS_ACCESS_VIOLATION; + return STATUS_ACCESS_VIOLATION; } /* if */ while (CharsRemaining >= 1) { - wchCurrent = *lpwstr; - if (wchCurrent >= '0' && wchCurrent <= '9') { - digit = wchCurrent - '0'; - } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { - digit = wchCurrent - 'A' + 10; - } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { - digit = wchCurrent - 'a' + 10; - } else { - digit = -1; - } /* if */ - if (digit < 0 || digit >= base) { - *value = bMinus ? -RunningTotal : RunningTotal; - return STATUS_SUCCESS; - } /* if */ - - RunningTotal = RunningTotal * base + digit; - lpwstr++; - CharsRemaining--; + wchCurrent = *lpwstr; + if (wchCurrent >= '0' && wchCurrent <= '9') { + digit = wchCurrent - '0'; + } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { + digit = wchCurrent - 'A' + 10; + } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { + digit = wchCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ + + RunningTotal = RunningTotal * base + digit; + lpwstr++; + CharsRemaining--; } /* while */ *value = bMinus ? -RunningTotal : RunningTotal; @@ -2240,6 +2240,85 @@ IN PCUNICODE_STRING MatchString, OUT PUSHORT Position) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + int main_idx; + unsigned int search_idx; + + switch (Flags) + { + case 0: + { + for (main_idx = 0; main_idx < SearchString->Length / sizeof(WCHAR); main_idx++) + { + for (search_idx = 0; search_idx < MatchString->Length / sizeof(WCHAR); search_idx++) + { + if (SearchString->Buffer[main_idx] == MatchString->Buffer[search_idx]) + { + *Position = (main_idx + 1) * sizeof(WCHAR); + return STATUS_SUCCESS; + } + } + } + *Position = 0; + return STATUS_NOT_FOUND; + } + + case 1: + { + for (main_idx = SearchString->Length / sizeof(WCHAR) - 1; main_idx >= 0; main_idx--) + { + for (search_idx = 0; search_idx < MatchString->Length / sizeof(WCHAR); search_idx++) + { + if (SearchString->Buffer[main_idx] == MatchString->Buffer[search_idx]) + { + *Position = main_idx * sizeof(WCHAR); + return STATUS_SUCCESS; + } + } + } + *Position = 0; + return STATUS_NOT_FOUND; + } + + case 2: + { + for (main_idx = 0; main_idx < SearchString->Length / sizeof(WCHAR); main_idx++) + { + search_idx = 0; + while (search_idx < MatchString->Length / sizeof(WCHAR) && + SearchString->Buffer[main_idx] != MatchString->Buffer[search_idx]) + { + search_idx++; + } + if (search_idx >= MatchString->Length / sizeof(WCHAR)) + { + *Position = (main_idx + 1) * sizeof(WCHAR); + return STATUS_SUCCESS; + } + } + *Position = 0; + return STATUS_NOT_FOUND; + } + + case 3: + { + for (main_idx = SearchString->Length / sizeof(WCHAR) - 1; main_idx >= 0; main_idx--) + { + search_idx = 0; + while (search_idx < MatchString->Length / sizeof(WCHAR) && + SearchString->Buffer[main_idx] != MatchString->Buffer[search_idx]) + { + search_idx++; + } + if (search_idx >= MatchString->Length / sizeof(WCHAR)) + { + *Position = main_idx * sizeof(WCHAR); + return STATUS_SUCCESS; + } + } + *Position = 0; + return STATUS_NOT_FOUND; + } + } /* switch */ + + return STATUS_NOT_FOUND; +}

1 0

[sserapion] 36930: Fix more rbuild files and fix up gdi32 and glu32 spec files.
by sserapion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sserapion Date: Sat Oct 25 02:04:51 2008 New Revision: 36930 URL: http://svn.reactos.org/svn/reactos?rev=36930&view=rev Log: Fix more rbuild files and fix up gdi32 and glu32 spec files. Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/fmifs/fmifs.rbuild [iso-8859-1] Sat Oct 25 02:04:51 2008 @@ -1,5 +1,5 @@ <module name="fmifs" type="win32dll" entrypoint="InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll"> - <importlibrary definition="fmifs.spec.def" /> + <importlibrary definition="fmifs.spec" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0600</define> Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Sat Oct 25 02:04:51 2008 @@ -288,22 +288,22 @@ @ stdcall GdiDrawStream(ptr long ptr) @ stdcall GdiEndDocEMF(ptr) @ stdcall GdiEndPageEMF(ptr long) -#@ stdcall GdiEntry1 -#@ stdcall GdiEntry10 -#@ stdcall GdiEntry11 -#@ stdcall GdiEntry12 -#@ stdcall GdiEntry13 -#@ stdcall GdiEntry14 -#@ stdcall GdiEntry15 -#@ stdcall GdiEntry16 -#@ stdcall GdiEntry2 -#@ stdcall GdiEntry3 -#@ stdcall GdiEntry4 -#@ stdcall GdiEntry5 -#@ stdcall GdiEntry6 -#@ stdcall GdiEntry7 -#@ stdcall GdiEntry8 -#@ stdcall GdiEntry9 +@ stdcall GdiEntry1(ptr ptr) gdi32.DdCreateDirectDrawObject +@ stdcall GdiEntry10(ptr long) gdi32.DdReenableDirectDrawObject +@ stdcall GdiEntry11(ptr ptr) gdi32.DdAttachSurface +@ stdcall GdiEntry12(ptr ptr) gdi32.DdUnattachSurface +@ stdcall GdiEntry13() gdi32.DdQueryDisplaySettingsUniqueness +@ stdcall GdiEntry14(ptr ptr long) gdi32.DdGetDxHandle +@ stdcall GdiEntry15(ptr ptr ptr) gdi32.DdSetGammaRamp +@ stub GdiEntry16 +@ stdcall GdiEntry2(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdQueryDirectDrawObject +@ stdcall GdiEntry3(ptr) gdi32.DdDeleteDirectDrawObject +@ stdcall GdiEntry4(ptr long) gdi32.DdCreateSurfaceObject +@ stdcall GdiEntry5(ptr) gdi32.DdDeleteSurfaceObject +@ stdcall GdiEntry6(ptr ptr) gdi32.DdResetVisrgn +@ stdcall GdiEntry7(ptr ptr) gdi32.DdGetDC +@ stdcall GdiEntry8(ptr) gdi32.DdReleaseDC +@ stdcall GdiEntry9(ptr ptr ptr ptr ptr ptr) gdi32.DdCreateDIBSection @ stdcall GdiFixUpHandle(ptr) @ stdcall GdiFlush() @ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl Modified: branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/glu32/glu32.spec [iso-8859-1] Sat Oct 25 02:04:51 2008 @@ -18,7 +18,7 @@ @ stub gluErrorUnicodeStringEXT @ stdcall gluGetNurbsProperty(ptr long ptr) @ stdcall gluGetString(long) -@ stdcall gluGetTessProperty(ptr long double) +@ stdcall gluGetTessProperty(ptr ptr ptr) @ stdcall gluLoadSamplingMatrices(ptr ptr ptr ptr) @ stdcall gluLookAt(double double double double double double double double double) @ stdcall gluNewNurbsRenderer() Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Sat Oct 25 02:04:51 2008 @@ -1,5 +1,5 @@ <module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> - <importlibrary definition="lsasrv.spec.def" /> + <importlibrary definition="lsasrv.spec" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> <define name="WINVER">0x600</define>

1 0

[hyperion] 36929: modified tools/rbuild/backend/mingw/modulehandler.cpp Allow static libraries to "link" to other static libraries Removed some dead code modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/win32/kernel32/kernel32.rbuild No need to specify icu4ros explicitely anymore, thanks to the rbuild changes Make kernel32_base include normalize, rather than linking it as an external dependency of kernel32
by hyperion＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: hyperion Date: Fri Oct 24 21:52:24 2008 New Revision: 36929 URL: http://svn.reactos.org/svn/reactos?rev=36929&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp Allow static libraries to "link" to other static libraries Removed some dead code modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/win32/kernel32/kernel32.rbuild No need to specify icu4ros explicitely anymore, thanks to the rbuild changes Make kernel32_base include normalize, rather than linking it as an external dependency of kernel32 Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… ============================================================================== --- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Fri Oct 24 21:52:24 2008 @@ -7,7 +7,6 @@ <module name="normaliz_redist" type="win32dll" installname="normaliz_redist.dll"> <library>normalize</library> <library>idna</library> - <library>icu4ros</library> <library>normaliz_redist_data</library> <library>libcntpr</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Oct 24 21:52:24 2008 @@ -120,6 +120,8 @@ </directory> </if> </directory> + + <library>normalize</library> </module> <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> <importlibrary definition="kernel32.def" /> @@ -134,9 +136,6 @@ <file>kernel32.rc</file> - <library>normalize</library> - <library>icu4ros</library> - <library>ntdll</library> </module> </group> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Oct 24 21:52:24 2008 @@ -347,6 +347,18 @@ dep = backend->GetFullName ( *library_target ); delete library_target; } + + if ( IsStaticLibrary ( importedModule ) || importedModule.type == ObjectLibrary ) + { + const std::vector<Library*>& libraries = importedModule.non_if_data.libraries; + + for ( size_t i = 0; i < libraries.size (); ++ i ) + { + dep += " "; + dep += GetImportLibraryDependency ( *libraries[i]->importedModule ); + } + } + return dep; } @@ -2891,7 +2903,6 @@ CLEAN_FILE ( junk_tmp ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); GenerateRules (); @@ -2968,7 +2979,6 @@ CLEAN_FILE ( junk_cpy ); string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); - string libsMacro = GetLibsMacro (); const Module *payload = module.project.LocateModule ( module.payload ); GenerateRules ();

1 0

[tkreuzer] 36928: merge 36224 and 36910 from amd64 branch
by tkreuzer＠svn.reactos.org 24 Oct '08

24 Oct '08

Author: tkreuzer Date: Fri Oct 24 17:13:45 2008 New Revision: 36928 URL: http://svn.reactos.org/svn/reactos?rev=36928&view=rev Log: merge 36224 and 36910 from amd64 branch Modified: trunk/reactos/tools/rsym.h Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=36928&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.h [iso-8859-1] Fri Oct 24 17:13:45 2008 @@ -6,6 +6,17 @@ #define IMAGE_DOS_MAGIC 0x5a4d #define IMAGE_PE_MAGIC 0x00004550 #define IMAGE_SIZEOF_SHORT_NAME 8 + +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 + +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 + +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 +#define IMAGE_SCN_LNK_REMOVE 0x00000800 +#define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 @@ -34,6 +45,7 @@ #endif #pragma pack(push,2) + typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -56,10 +68,6 @@ LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; #pragma pack(pop) - -#define IMAGE_FILE_LINE_NUMS_STRIPPED 4 -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 -#define IMAGE_FILE_DEBUG_STRIPPED 512 #pragma pack(push,4) typedef struct _IMAGE_FILE_HEADER { @@ -145,41 +153,14 @@ IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; } IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; -#pragma pack(push,4) -typedef struct _IMAGE_NT_HEADERS32 { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32; -#pragma pack(pop) - -#pragma pack(push,4) -typedef struct _IMAGE_NT_HEADERS64 { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER64 OptionalHeader; -} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64; -#pragma pack(pop) #ifdef _TARGET_PE64 -#error HERE typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; -typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; #else typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; -typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; #endif - -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_LNK_REMOVE 0x00000800 -#define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 typedef struct _IMAGE_SECTION_HEADER { BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; @@ -201,6 +182,7 @@ typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; DWORD SizeOfBlock; + WORD TypeOffset[1]; } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; #pragma pack(pop)

1 0

[tkreuzer] 36927: merge 36223 from amd64-branch
by tkreuzer＠svn.reactos.org 24 Oct '08

24 Oct '08

Author: tkreuzer Date: Fri Oct 24 16:32:48 2008 New Revision: 36927 URL: http://svn.reactos.org/svn/reactos?rev=36927&view=rev Log: merge 36223 from amd64-branch Modified: trunk/reactos/tools/rsym.h trunk/reactos/tools/rsym.mak trunk/reactos/tools/winebuild/main.c Modified: trunk/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.h?rev=36927&r1=… ============================================================================== --- trunk/reactos/tools/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.h [iso-8859-1] Fri Oct 24 16:32:48 2008 @@ -5,7 +5,6 @@ #define IMAGE_DOS_MAGIC 0x5a4d #define IMAGE_PE_MAGIC 0x00004550 - #define IMAGE_SIZEOF_SHORT_NAME 8 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 @@ -14,6 +13,7 @@ typedef unsigned char UCHAR; typedef unsigned short WORD; typedef unsigned short USHORT; +typedef unsigned long long ULONGLONG; #if defined(__x86_64__) && defined(unix) typedef signed int LONG; typedef unsigned int ULONG; @@ -33,7 +33,7 @@ #endif #endif -#pragma pack(2) +#pragma pack(push,2) typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -55,63 +55,126 @@ WORD e_res2[10]; LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(4) +#pragma pack(pop) #define IMAGE_FILE_LINE_NUMS_STRIPPED 4 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 #define IMAGE_FILE_DEBUG_STRIPPED 512 -#pragma pack(4) +#pragma pack(push,4) typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; + WORD Machine; + WORD NumberOfSections; + DWORD TimeDateStamp; + DWORD PointerToSymbolTable; + DWORD NumberOfSymbols; + WORD SizeOfOptionalHeader; + WORD Characteristics; } IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; +#pragma pack(pop) typedef struct _IMAGE_DATA_DIRECTORY { DWORD VirtualAddress; DWORD Size; } IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; +typedef struct _IMAGE_OPTIONAL_HEADER32 { + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + DWORD BaseOfData; + DWORD ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Win32VersionValue; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + DWORD SizeOfStackReserve; + DWORD SizeOfStackCommit; + DWORD SizeOfHeapReserve; + DWORD SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; + +typedef struct _IMAGE_OPTIONAL_HEADER64 { + WORD Magic; + BYTE MajorLinkerVersion; + BYTE MinorLinkerVersion; + DWORD SizeOfCode; + DWORD SizeOfInitializedData; + DWORD SizeOfUninitializedData; + DWORD AddressOfEntryPoint; + DWORD BaseOfCode; + ULONGLONG ImageBase; + DWORD SectionAlignment; + DWORD FileAlignment; + WORD MajorOperatingSystemVersion; + WORD MinorOperatingSystemVersion; + WORD MajorImageVersion; + WORD MinorImageVersion; + WORD MajorSubsystemVersion; + WORD MinorSubsystemVersion; + DWORD Win32VersionValue; + DWORD SizeOfImage; + DWORD SizeOfHeaders; + DWORD CheckSum; + WORD Subsystem; + WORD DllCharacteristics; + ULONGLONG SizeOfStackReserve; + ULONGLONG SizeOfStackCommit; + ULONGLONG SizeOfHeapReserve; + ULONGLONG SizeOfHeapCommit; + DWORD LoaderFlags; + DWORD NumberOfRvaAndSizes; + IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; +} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; + +#pragma pack(push,4) +typedef struct _IMAGE_NT_HEADERS32 { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + IMAGE_OPTIONAL_HEADER32 OptionalHeader; +} IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32; +#pragma pack(pop) + +#pragma pack(push,4) +typedef struct _IMAGE_NT_HEADERS64 { + DWORD Signature; + IMAGE_FILE_HEADER FileHeader; + IMAGE_OPTIONAL_HEADER64 OptionalHeader; +} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64; +#pragma pack(pop) + +#ifdef _TARGET_PE64 +#error HERE +typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; +typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; +typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; +typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; +#else +typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; +typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; +typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; +typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; +#endif + #define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -typedef struct _IMAGE_OPTIONAL_HEADER { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Reserved1; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; #define IMAGE_SCN_TYPE_NOLOAD 0x00000002 #define IMAGE_SCN_LNK_REMOVE 0x00000800 @@ -134,11 +197,12 @@ DWORD Characteristics; } IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; +#pragma pack(push,4) typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; DWORD SizeOfBlock; } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; - +#pragma pack(pop) typedef struct { USHORT f_magic; /* magic number */ Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=36927&r… ============================================================================== --- trunk/reactos/tools/rsym.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.mak [iso-8859-1] Fri Oct 24 16:32:48 2008 @@ -16,7 +16,11 @@ RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) -RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +ifeq ($(ARCH),amd64) +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) -D_TARGET_PE64 +else +RSYM_HOST_CFLAGS = $(TOOLS_CFLAGS) +endif RSYM_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Fri Oct 24 16:32:48 2008 @@ -48,7 +48,7 @@ int save_temps = 0; int link_ext_symbols = 0; -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64;

1 0

[tkreuzer] 36926: sync to trunk head (36925)
by tkreuzer＠svn.reactos.org 24 Oct '08

24 Oct '08

Author: tkreuzer Date: Fri Oct 24 15:58:06 2008 New Revision: 36926 URL: http://svn.reactos.org/svn/reactos?rev=36926&view=rev Log: sync to trunk head (36925) Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/read.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/main.c branches/ros-amd64-bringup/reactos/lib/drivers/ip/network/arp.c branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -77,11 +77,6 @@ AFD_DbgPrint(MID_TRACE,("Called: FCB %x, FO %x\n", Context, FCB->FileObject)); - if( Irp->Cancel ) { - if( FCB ) FCB->ConnectIrp.InFlightRequest = NULL; - return STATUS_CANCELLED; - } - /* I was wrong about this before as we can have pending writes to a not * yet connected socket */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; @@ -90,6 +85,11 @@ Irp->IoStatus.Status)); FCB->ConnectIrp.InFlightRequest = NULL; + + if( Irp->Cancel ) { + SocketStateUnlock( FCB ); + return STATUS_CANCELLED; + } if( NT_SUCCESS(Irp->IoStatus.Status) ) { FCB->PollState |= AFD_EVENT_CONNECT | AFD_EVENT_SEND; Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -102,14 +102,14 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; + + FCB->ListenIrp.InFlightRequest = NULL; + if( Irp->Cancel ) { - if( FCB ) FCB->ListenIrp.InFlightRequest = NULL; + SocketStateUnlock( FCB ); return STATUS_CANCELLED; } - - if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - - FCB->ListenIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -234,14 +234,15 @@ ASSERT_IRQL(APC_LEVEL); + if( !SocketAcquireStateLock( FCB ) ) return Status; + + FCB->ReceiveIrp.InFlightRequest = NULL; + if( Irp->Cancel ) { - if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + SocketStateUnlock( FCB ); return STATUS_CANCELLED; } - if( !SocketAcquireStateLock( FCB ) ) return Status; - - FCB->ReceiveIrp.InFlightRequest = NULL; FCB->Recv.Content = Irp->IoStatus.Information; FCB->Recv.BytesUsed = 0; @@ -455,14 +456,14 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; + + FCB->ReceiveIrp.InFlightRequest = NULL; + if( Irp->Cancel ) { - if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + SocketStateUnlock( FCB ); return STATUS_CANCELLED; } - - if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; - - FCB->ReceiveIrp.InFlightRequest = NULL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -40,15 +40,15 @@ ASSERT_IRQL(APC_LEVEL); - if( Irp->Cancel ) { - if( FCB ) FCB->SendIrp.InFlightRequest = NULL; - return STATUS_CANCELLED; - } - if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ + + if( Irp->Cancel ) { + SocketStateUnlock( FCB ); + return STATUS_CANCELLED; + } if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); @@ -176,19 +176,19 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); - if( Irp->Cancel ) { - if( FCB ) FCB->SendIrp.InFlightRequest = NULL; - return STATUS_CANCELLED; - } - /* It's ok if the FCB already died */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS; + FCB->SendIrp.InFlightRequest = NULL; + /* Request is not in flight any longer */ + + if( Irp->Cancel ) { + SocketStateUnlock( FCB ); + return STATUS_CANCELLED; + } + FCB->PollState |= AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); - - FCB->SendIrp.InFlightRequest = NULL; - /* Request is not in flight any longer */ if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -485,18 +485,22 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); DisReq = (PTDI_REQUEST_KERNEL_DISCONNECT)&IrpSp->Parameters; + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + /* Get associated connection endpoint file object. Quit if none exists */ TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; if (!Connection) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Status = TCPDisconnect( @@ -507,7 +511,15 @@ DispDataRequestComplete, Irp ); - TI_DbgPrint(MAX_TRACE, ("TCP Connect returned %08x\n", Status)); +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, 0); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); + + TI_DbgPrint(MAX_TRACE, ("TCP Disconnect returned %08x\n", Status)); return Status; } @@ -1494,7 +1506,7 @@ TI_DbgPrint(DEBUG_IRP, ("Completing IRP at (0x%X).\n", Irp)); - return IRPFinish(Irp, STATUS_INVALID_PARAMETER); + return Irp->IoStatus.Status; } Status = DispPrepareIrpForCancel(TranContext, Irp, NULL); Modified: branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -437,6 +437,7 @@ case TDI_DISCONNECT: Status = DispTdiDisconnect(Irp); + Complete = FALSE; break; case TDI_ASSOCIATE_ADDRESS: Modified: branches/ros-amd64-bringup/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -230,7 +230,7 @@ Header->HWAddrLen, NUD_REACHABLE); } - if (Header->Opcode != ARP_OPCODE_REQUEST) + if (Header->Opcode != ARP_OPCODE_REQUEST || !NCE) return; /* This is a request for our address. Swap the addresses and Modified: branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Fri Oct 24 15:58:06 2008 @@ -254,6 +254,9 @@ { ReceiveRequest->RemotePort = 0; } + + IoMarkIrpPending(Irp); + ReceiveRequest->ReturnInfo = ReturnInfo; ReceiveRequest->Buffer = BufferData; ReceiveRequest->BufferSize = ReceiveLength;

1 0

[tkreuzer] 36925: fix ntoskrnl spec file
by tkreuzer＠svn.reactos.org 24 Oct '08

24 Oct '08

Author: tkreuzer Date: Fri Oct 24 15:53:05 2008 New Revision: 36925 URL: http://svn.reactos.org/svn/reactos?rev=36925&view=rev Log: fix ntoskrnl spec file Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Oct 24 15:53:05 2008 @@ -55,6 +55,9 @@ @ stdcall DbgPrompt(str ptr long) @ stdcall DbgQueryDebugFilterState(long long) @ stdcall DbgSetDebugFilterState(long long long) +#ifdef __x86_64__ +@ fastcall ExAcquireFastMutex(ptr) +#endif @ fastcall ExAcquireFastMutexUnsafe(ptr) @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stdcall ExAcquireResourceSharedLite(ptr long) @@ -103,18 +106,26 @@ @ stdcall ExInterlockedAddLargeInteger(ptr long long ptr) @ fastcall ExInterlockedAddLargeStatistic(ptr long) @ stdcall ExInterlockedAddUlong(ptr long ptr) +#ifndef __x86_64__ @ fastcall ExInterlockedCompareExchange64(ptr ptr ptr ptr) @ stdcall ExInterlockedDecrementLong(ptr ptr) @ stdcall ExInterlockedExchangeUlong(ptr long ptr) +#endif @ stdcall ExInterlockedExtendZone(ptr ptr long ptr) +#ifndef __x86_64__ @ fastcall ExInterlockedFlushSList(ptr) @ stdcall ExInterlockedIncrementLong(ptr ptr) +#endif @ stdcall ExInterlockedInsertHeadList(ptr ptr ptr) @ stdcall ExInterlockedInsertTailList(ptr ptr ptr) @ stdcall ExInterlockedPopEntryList(ptr ptr) +#ifndef __x86_64__ @ fastcall ExInterlockedPopEntrySList(ptr ptr) +#endif @ stdcall ExInterlockedPushEntryList(ptr ptr ptr) +#ifndef __x86_64__ @ fastcall ExInterlockedPushEntrySList(ptr ptr ptr) +#endif @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stdcall ExIsProcessorFeaturePresent(long) @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) @@ -132,6 +143,9 @@ @ fastcall ExReInitializeRundownProtectionCacheAware(ptr) ExfReInitializeRundownProtectionCacheAware @ stdcall ExRegisterCallback(ptr ptr ptr) @ stdcall ExReinitializeResourceLite(ptr) +#ifdef __x86_64__ +@ fastcall ExReleaseFastMutex(ptr) +#endif @ fastcall ExReleaseFastMutexUnsafe(ptr) @ fastcall ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(ptr) @ fastcall ExReleaseResourceAndLeaveCriticalRegion(ptr) @@ -149,6 +163,9 @@ @ stdcall ExSizeOfRundownProtectionCacheAware() @ stdcall ExSystemExceptionFilter() @ stdcall ExSystemTimeToLocalTime(ptr ptr) +#ifdef __x86_64__ +@ fastcall ExTryToAcquireFastMutex(ptr) +#endif @ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stdcall ExVerifySuite(long) @@ -157,6 +174,7 @@ @ extern ExWindowStationObjectType @ fastcall ExfAcquirePushLockExclusive(ptr) @ fastcall ExfAcquirePushLockShared(ptr) +#ifndef __x86_64__ @ fastcall ExfInterlockedAddUlong(ptr long ptr) @ fastcall ExfInterlockedCompareExchange64(ptr ptr ptr) @ fastcall ExfInterlockedInsertHeadList(ptr ptr ptr) @@ -164,11 +182,17 @@ @ fastcall ExfInterlockedPopEntryList(ptr ptr) @ fastcall ExfInterlockedPushEntryList(ptr ptr ptr) @ fastcall ExfInterlockedRemoveHeadList(ptr ptr) +#endif @ fastcall ExfReleasePushLock(ptr) @ fastcall ExfReleasePushLockExclusive(ptr) @ fastcall ExfReleasePushLockShared(ptr) @ fastcall ExfTryToWakePushLock(ptr) @ fastcall ExfUnblockPushLock(ptr ptr) +#ifdef __x86_64__ +@ stdcall ExpInterlockedFlushSList(ptr) +@ stdcall ExpInterlockedPopEntrySList(ptr ptr) +@ stdcall ExpInterlockedPushEntrySList(ptr ptr) +#endif #ifdef _M_IX86 @ fastcall Exfi386InterlockedDecrementLong(ptr) @ fastcall Exfi386InterlockedExchangeUlong(ptr long) @@ -177,9 +201,11 @@ @ stdcall Exi386InterlockedExchangeUlong(ptr long long) @ stdcall Exi386InterlockedIncrementLong(ptr) #endif +#ifdef _M_IX86 @ fastcall ExiAcquireFastMutex(ptr) ExAcquireFastMutex @ fastcall ExiReleaseFastMutex(ptr) ExReleaseFastMutex @ fastcall ExiTryToAcquireFastMutex(ptr) ExTryToAcquireFastMutex +#endif @ stdcall FsRtlAcquireFileExclusive(ptr) ;FsRtlAddBaseMcbEntry @ stdcall FsRtlAddLargeMcbEntry(ptr long long long long long long) @@ -321,8 +347,10 @@ @ fastcall InterlockedExchange(ptr long) @ fastcall InterlockedExchangeAdd(ptr long) @ fastcall InterlockedIncrement(ptr) +#ifndef __x86_64__ @ fastcall InterlockedPopEntrySList(ptr) @ fastcall InterlockedPushEntrySList(ptr ptr) +#endif @ stdcall IoAcquireCancelSpinLock(ptr) @ stdcall IoAcquireRemoveLockEx(ptr ptr str long long) @ stdcall IoAcquireVpbSpinLock(ptr) @@ -549,6 +577,9 @@ @ stdcall KeAcquireInterruptSpinLock(ptr) @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ fastcall KeAcquireSpinLockForDpc(ptr) +#ifdef __x86_64__ +@ stdcall KeAcquireSpinLockRaiseToDpc(ptr) +#endif @ stdcall KeAddSystemServiceTable(ptr ptr long ptr long) @ stdcall KeAreAllApcsDisabled() @ stdcall KeAreApcsDisabled() @@ -599,7 +630,9 @@ @ stdcall KeInitializeMutex(ptr long) @ stdcall KeInitializeQueue(ptr long) @ stdcall KeInitializeSemaphore(ptr long long) +#ifndef __x86_64__ @ stdcall KeInitializeSpinLock(ptr) +#endif @ stdcall KeInitializeThreadedDpc(ptr ptr ptr) @ stdcall KeInitializeTimer(ptr) @ stdcall KeInitializeTimerEx(ptr long) @@ -622,10 +655,14 @@ @ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KePulseEvent(ptr long long) @ stdcall KeQueryActiveProcessors() +#ifndef __x86_64__ @ stdcall KeQueryInterruptTime() +#endif @ stdcall KeQueryPriorityThread(ptr) @ stdcall KeQueryRuntimeThread(ptr ptr) +#ifndef __x86_64__ @ stdcall KeQuerySystemTime(ptr) +#endif @ stdcall KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() @ stdcall KeRaiseUserException(long) @@ -646,6 +683,9 @@ @ stdcall KeReleaseMutant(ptr long long long) @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +#ifdef __x86_64__ +@ stdcall KeReleaseSpinLock(ptr long) +#endif @ fastcall KeReleaseSpinLockForDpc(ptr long) @ stdcall KeReleaseSpinLockFromDpcLevel(ptr) @ stdcall KeRemoveByKeyDeviceQueue(ptr long) @@ -1023,12 +1063,14 @@ @ stdcall PsTerminateSystemThread(long) @ extern PsThreadType _PsThreadType ;PsWrapApcWow64Thread +#ifndef __x86_64__ @ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stdcall READ_REGISTER_BUFFER_ULONG(ptr ptr long) @ stdcall READ_REGISTER_BUFFER_USHORT(ptr ptr long) @ stdcall READ_REGISTER_UCHAR(ptr) @ stdcall READ_REGISTER_ULONG(ptr) @ stdcall READ_REGISTER_USHORT(ptr) +#endif @ stdcall KeRosDumpStackFrames(ptr long) @ stdcall RtlAbsoluteToSelfRelativeSD(ptr ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @@ -1276,8 +1318,10 @@ ;RtlTraceDatabaseLock ;RtlTraceDatabaseUnlock ;RtlTraceDatabaseValidate +#ifndef __x86_64__ @ fastcall RtlUlongByteSwap(long) @ fastcall RtlUlonglongByteSwap(long long) +#endif @ stdcall RtlUnicodeStringToAnsiSize(ptr) RtlxUnicodeStringToAnsiSize @ stdcall RtlUnicodeStringToAnsiString(ptr ptr long) @ stdcall RtlUnicodeStringToCountedOemString(ptr ptr long) @@ -1300,7 +1344,9 @@ @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr wstr long) @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) +#ifndef __x86_64__ @ fastcall RtlUshortByteSwap(long) +#endif @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @@ -1371,12 +1417,14 @@ ;VfFailDriver ;VfFailSystemBIOS ;VfIsVerificationEnabled +#ifndef __x86_64__ @ stdcall WRITE_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stdcall WRITE_REGISTER_BUFFER_ULONG(ptr ptr long) @ stdcall WRITE_REGISTER_BUFFER_USHORT(ptr ptr long) @ stdcall WRITE_REGISTER_UCHAR(ptr long) @ stdcall WRITE_REGISTER_ULONG(ptr long) @ stdcall WRITE_REGISTER_USHORT(ptr long) +#endif ;WmiFlushTrace ;WmiGetClock ;WmiQueryTrace @@ -1515,7 +1563,9 @@ ;_CIcos ;_CIsin ;_CIsqrt +#ifndef __x86_64 @ cdecl _abnormal_termination() +#endif #ifdef _M_IX86 @ cdecl _alldiv() @ cdecl _alldvrm() @@ -1529,12 +1579,16 @@ @ cdecl _aullrem() @ cdecl _aullshr() #endif +#ifndef __x86_64 @ cdecl _except_handler2() @ cdecl _except_handler3() @ cdecl _global_unwind2() +#endif @ cdecl _itoa() @ cdecl _itow() +#ifndef __x86_64 @ cdecl _local_unwind2() +#endif @ cdecl _purecall() @ cdecl _snprintf() @ cdecl _snwprintf()

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