Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 43965: [USER32] - Fix several user32 warnings. - Sync GetWindow*A/W with wine and unify all versions, commenting out a wine hack. - As a bonus implement GetWindowLongPtrA/W. - Tested to work in trunk.
by sserapion＠svn.reactos.org 05 Nov '09

05 Nov '09

Author: sserapion Date: Thu Nov 5 02:56:29 2009 New Revision: 43965 URL: http://svn.reactos.org/svn/reactos?rev=43965&view=rev Log: [USER32] - Fix several user32 warnings. - Sync GetWindow*A/W with wine and unify all versions, commenting out a wine hack. - As a bonus implement GetWindowLongPtrA/W. - Tested to work in trunk. Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] Thu Nov 5 02:56:29 2009 @@ -101,7 +101,7 @@ NTSTATUS Status; CsrRequest = MAKE_CSR_API(REGISTER_SERVICES_PROCESS, CSR_GUI); - Request.Data.RegisterServicesProcessRequest.ProcessId = (HANDLE)ServicesProcessId; + Request.Data.RegisterServicesProcessRequest.ProcessId = LongToHandle(ServicesProcessId); Status = CsrClientCallServer(&Request, NULL, Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Thu Nov 5 02:56:29 2009 @@ -274,7 +274,7 @@ return TRUE; else return (NtUserQueryWindow(Wnd->head.h, QUERY_WINDOW_UNIQUE_PROCESS_ID) == - (DWORD)NtCurrentTeb()->ClientId.UniqueProcess ); + (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess ); } BOOL @@ -300,7 +300,7 @@ INT Index; USHORT generation; - Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + Index = (((UINT_PTR)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; if (Index < 0 || Index >= gHandleTable->nb_handles) return NULL; @@ -308,7 +308,7 @@ if (!gHandleEntries[Index].type || !gHandleEntries[Index].ptr) return NULL; - generation = (UINT)handle >> 16; + generation = (UINT_PTR)handle >> 16; if (generation == gHandleEntries[Index].generation || !generation || generation == 0xffff) return &gHandleEntries[Index]; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Thu Nov 5 02:56:29 2009 @@ -174,7 +174,7 @@ return FALSE; } - ConfigRet = UnRegNotify((ULONG) Handle ); + ConfigRet = UnRegNotify( HandleToUlong(Handle) ); if (ConfigRet != CR_SUCCESS) { switch (ConfigRet) Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Thu Nov 5 02:56:29 2009 @@ -193,11 +193,11 @@ SysColorBrushes[i] = pBrushes[i]; } - return (DWORD) pOldCol; /* FIXME: pointer truncation */ + return PtrToLong(pOldCol); /* FIXME: pointer truncation */ } if (!pPens && !pBrushes) /* "restore" call */ { - LPVOID pOldCol = (LPVOID)n; /* FIXME: not 64-bit safe */ + LPVOID pOldCol = LongToPtr(n); /* FIXME: not 64-bit safe */ LPVOID p = pOldCol; DWORD nCount = *(DWORD *)p; p = (char*)p + sizeof(DWORD); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Thu Nov 5 02:56:29 2009 @@ -658,157 +658,133 @@ } -/* - * @implemented - */ -LONG -WINAPI -GetWindowLongA ( HWND hWnd, int nIndex ) -{ - PWND Wnd; - - Wnd = ValidateHwnd(hWnd); - if (Wnd == NULL) +LONG_PTR Internal_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) +{ + LONG_PTR retvalue = 0; + WND *wndPtr; + + if (offset == GWLP_HWNDPARENT) + { + HWND parent = GetAncestor( hwnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hwnd, GW_OWNER ); + return (ULONG_PTR)parent; + } + + if (!(wndPtr = ValidateHwnd( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; - - if (nIndex >= 0) - { - if ((DWORD)nIndex + sizeof(LONG) > Wnd->cbwndExtra) + } + + if (offset >= 0) + { + if (offset > (int)(wndPtr->cbwndExtra - size)) { - SetLastError(ERROR_INVALID_PARAMETER); + WARN("Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); return 0; } - return *((LONG *)((PCHAR)(Wnd + 1) + nIndex)); - } - else - { - switch (nIndex) + retvalue = *((LONG_PTR *)((PCHAR)(wndPtr + 1) + offset)); + + /* WINE: special case for dialog window procedure */ + //if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + // retvalue = (LONG_PTR)IntGetWndProc( (WNDPROC)retvalue, unicode ); + return retvalue; + } + + switch(offset) + { + case GWLP_USERDATA: retvalue = wndPtr->dwUserData; break; + case GWL_STYLE: retvalue = wndPtr->style; break; + case GWL_EXSTYLE: retvalue = wndPtr->ExStyle; break; + case GWLP_ID: retvalue = wndPtr->IDMenu; break; + case GWLP_HINSTANCE: retvalue = (ULONG_PTR)wndPtr->hModule; break; + case GWLP_WNDPROC: + { + if (!TestWindowProcess(wndPtr)) + { + SetLastError(ERROR_ACCESS_DENIED); + retvalue = 0; + } + retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, unicode); + break; + } + default: + WARN("Unknown offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + break; + } + return retvalue; + +} +/* + * @implemented + */ +LONG +WINAPI +GetWindowLongA ( HWND hWnd, int nIndex ) +{ + return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG), FALSE ); +} + +/* + * @implemented + */ +LONG +WINAPI +GetWindowLongW(HWND hWnd, int nIndex) +{ + return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG), TRUE ); +} + +#ifdef _WIN64 +/* + * @unimplemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrA(HWND hWnd, + INT nIndex) +{ + return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), FALSE ); +} + +/* + * @unimplemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrW(HWND hWnd, + INT nIndex) +{ + return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), TRUE ); + +} +#endif // _WIN64 + +/* + * @implemented + */ +WORD +WINAPI +GetWindowWord(HWND hWnd, int nIndex) +{ + switch(nIndex) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + break; + default: + if (nIndex < 0) { - case GWL_EXSTYLE: - return Wnd->ExStyle; - case GWL_STYLE: - return Wnd->style; - case GWL_HINSTANCE: - return (LONG)Wnd->hModule; - case GWL_ID: - return Wnd->IDMenu; - case GWL_USERDATA: - return Wnd->dwUserData; - - case GWL_HWNDPARENT: - { - HWND parent = GetAncestor( hWnd, GA_PARENT ); - if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); - return (LONG)parent; - } - case GWL_WNDPROC: - if (!TestWindowProcess(Wnd)) - { - SetLastError(ERROR_ACCESS_DENIED); - return 0; - } - return IntGetWndProc(Wnd, TRUE); - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - } -} - - -/* - * @implemented - */ -LONG -WINAPI -GetWindowLongW(HWND hWnd, int nIndex) -{ - PWND Wnd; - - Wnd = ValidateHwnd(hWnd); - if (Wnd == NULL) - return 0; - - if (nIndex >= 0) - { - if ((DWORD)nIndex + sizeof(LONG) > Wnd->cbwndExtra) - { - SetLastError(ERROR_INVALID_PARAMETER); + WARN("Invalid offset %d\n", nIndex ); + SetLastError( ERROR_INVALID_INDEX ); return 0; } - return *((LONG *)((PCHAR)(Wnd + 1) + nIndex)); - } - else - { - switch (nIndex) - { - case GWL_EXSTYLE: - return Wnd->ExStyle; - case GWL_STYLE: - return Wnd->style; - case GWL_HINSTANCE: - return (LONG)Wnd->hModule; - case GWL_ID: - return Wnd->IDMenu; - case GWL_USERDATA: - return Wnd->dwUserData; - - case GWL_HWNDPARENT: - { - HWND parent = GetAncestor( hWnd, GA_PARENT ); - if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); - return (LONG)parent; - } - case GWL_WNDPROC: - if (!TestWindowProcess(Wnd)) - { - SetLastError(ERROR_ACCESS_DENIED); - return 0; - } - return IntGetWndProc(Wnd, FALSE); - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - } -} - -#ifdef _WIN64 -/* - * @unimplemented - */ -LONG_PTR -WINAPI -GetWindowLongPtrA(HWND hWnd, - INT nIndex) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -LONG_PTR -WINAPI -GetWindowLongPtrW(HWND hWnd, - INT nIndex) -{ - UNIMPLEMENTED; - return 0; -} -#endif // _WIN64 - -/* - * @implemented - */ -WORD -WINAPI -GetWindowWord(HWND hWnd, int nIndex) -{ - return (WORD)GetWindowLongW(hWnd, nIndex); + break; + } + return Internal_GetWindowLong( hWnd, nIndex, sizeof(WORD), FALSE ); } /*

1 0

[tkreuzer] 43964: Hey Arch, next time you change 3rdparty code, either make sure, it's merged upstream or provide a diff, please. Adding back MSVC fixes.
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Thu Nov 5 00:15:07 2009 New Revision: 43964 URL: http://svn.reactos.org/svn/reactos?rev=43964&view=rev Log: Hey Arch, next time you change 3rdparty code, either make sure, it's merged upstream or provide a diff, please. Adding back MSVC fixes. Added: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/reactos.diff (with props) Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -32,6 +32,12 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + typedef struct { intptr_t osfhnd; char osfile; @@ -42,6 +48,10 @@ char unicode : 1; char pipech2[2]; } ioinfo; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif #define IOINFO_ARRAY_ELTS (1 << 5) Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -30,6 +30,11 @@ #endif #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#endif + typedef struct _FTIME { unsigned short twosecs : 5; @@ -46,6 +51,10 @@ unsigned short year : 7; } FDATE; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + typedef FDATE *PFDATE; #endif Added: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff (added) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -1,0 +1,83 @@ +Index: internal.h +=================================================================== +--- internal.h (Revision 43956) ++++ internal.h (Arbeitskopie) +@@ -32,6 +32,12 @@ + #define __IOINFO_TM_UTF8 1 + #define __IOINFO_TM_UTF16LE 2 + ++#ifdef _MSC_VER ++#pragma warning(push) ++#pragma warning(disable:4214) ++#pragma warning(disable:4820) ++#endif ++ + typedef struct { + intptr_t osfhnd; + char osfile; +@@ -43,6 +49,10 @@ + char pipech2[2]; + } ioinfo; + ++#ifdef _MSC_VER ++#pragma warning(pop) ++#endif ++ + #define IOINFO_ARRAY_ELTS (1 << 5) + + #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1))) +Index: oscalls.h +=================================================================== +--- oscalls.h (Revision 43956) ++++ oscalls.h (Arbeitskopie) +@@ -30,6 +30,11 @@ + #endif + #endif + ++#ifdef _MSC_VER ++#pragma warning(push) ++#pragma warning(disable:4214) ++#endif ++ + typedef struct _FTIME + { + unsigned short twosecs : 5; +@@ -46,6 +51,10 @@ + unsigned short year : 7; + } FDATE; + ++#ifdef _MSC_VER ++#pragma warning(pop) ++#endif ++ + typedef FDATE *PFDATE; + + #endif +Index: sect_attribs.h +=================================================================== +--- sect_attribs.h (Revision 43956) ++++ sect_attribs.h (Arbeitskopie) +@@ -10,7 +10,7 @@ + #define _ATTRIBUTES shared + #endif + +-#if 0 ++#if defined(_MSC_VER) + /* Reference list of existing section for msvcrt. */ + #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) + #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) +@@ -55,6 +55,14 @@ + #pragma section(".rtc$IZZ",long,read) + #pragma section(".rtc$TAA",long,read) + #pragma section(".rtc$TZZ",long,read) ++#pragma section(".tls",long,read,write) ++#pragma section(".tls$ZZZ",long,read,write) + #endif + ++#if defined(_MSC_VER) ++#define _CRTALLOC(x) __declspec(allocate(x)) ++#elif defined(__GNUC__) + #define _CRTALLOC(x) __attribute__ ((section (x) )) ++#else ++#error ++#endif Propchange: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -10,7 +10,7 @@ #define _ATTRIBUTES shared #endif -#if 0 +#if defined(_MSC_VER) /* Reference list of existing section for msvcrt. */ #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) @@ -55,6 +55,14 @@ #pragma section(".rtc$IZZ",long,read) #pragma section(".rtc$TAA",long,read) #pragma section(".rtc$TZZ",long,read) +#pragma section(".tls",long,read,write) +#pragma section(".tls$ZZZ",long,read,write) #endif +#if defined(_MSC_VER) +#define _CRTALLOC(x) __declspec(allocate(x)) +#elif defined(__GNUC__) #define _CRTALLOC(x) __attribute__ ((section (x) )) +#else +#error +#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -7,6 +7,16 @@ void _fpreset (void); void _fpreset (void) - { __asm__ ("fninit" ) ;} +{ +#ifdef __GNUC__ + __asm__ ("fninit" ); +#else + __asm fninit; +#endif +} +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -14,4 +14,8 @@ (* __MINGW_IMP_SYMBOL(_fpreset))(); } +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -20,6 +20,7 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> +#include <intrin.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -51,7 +52,11 @@ #define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; +#if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; +#else +int _MINGW_INSTALL_DEBUG_MATHERR = 0; +#endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -112,12 +112,22 @@ else #endif { +#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; +#endif +#else +#ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); +#else + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); +#endif #endif } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/reactos.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/reactos.diff (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/reactos.diff [iso-8859-1] Thu Nov 5 00:15:07 2009 @@ -1,0 +1,87 @@ +Index: CRT_fp10.c +=================================================================== +--- CRT_fp10.c (Revision 43956) ++++ CRT_fp10.c (Arbeitskopie) +@@ -7,6 +7,16 @@ + void _fpreset (void); + + void _fpreset (void) +- { __asm__ ("fninit" ) ;} ++{ ++#ifdef __GNUC__ ++ __asm__ ("fninit" ); ++#else ++ __asm fninit; ++#endif ++} + ++#ifdef __GNUC__ + void __attribute__ ((alias ("_fpreset"))) fpreset(void); ++#else ++void fpreset(void) { _fpreset(); } ++#endif +Index: CRT_fp8.c +=================================================================== +--- CRT_fp8.c (Revision 43956) ++++ CRT_fp8.c (Arbeitskopie) +@@ -14,4 +14,8 @@ + (* __MINGW_IMP_SYMBOL(_fpreset))(); + } + ++#ifdef __GNUC__ + void __attribute__ ((alias ("_fpreset"))) fpreset(void); ++#else ++void fpreset(void) { _fpreset(); } ++#endif +Index: crtexe.c +=================================================================== +--- crtexe.c (Revision 43956) ++++ crtexe.c (Arbeitskopie) +@@ -20,6 +20,7 @@ + #include <tchar.h> + #include <sect_attribs.h> + #include <locale.h> ++#include <intrin.h> + + #ifndef __winitenv + extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); +@@ -51,7 +52,11 @@ + #define _commode (* __MINGW_IMP_SYMBOL(_commode)) + extern int _dowildcard; + ++#if defined(__GNUC__) + int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; ++#else ++int _MINGW_INSTALL_DEBUG_MATHERR = 0; ++#endif + extern int __defaultmatherr; + extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); + +Index: gs_support.c +=================================================================== +--- gs_support.c (Revision 43956) ++++ gs_support.c (Arbeitskopie) +@@ -112,6 +112,7 @@ + else + #endif + { ++#ifdef __GNUC__ + #ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); + GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; +@@ -119,6 +120,15 @@ + GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); + GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; + #endif ++#else ++#ifdef _WIN64 ++ GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); ++ GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); ++#else ++ GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); ++ GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); ++#endif ++#endif + } + + #ifdef _WIN64 Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/reactos.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 43963: - Convert one more __invlpg to KeInvalidateTlbEntry
by sginsberg＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: sginsberg Date: Wed Nov 4 23:51:00 2009 New Revision: 43963 URL: http://svn.reactos.org/svn/reactos?rev=43963&view=rev Log: - Convert one more __invlpg to KeInvalidateTlbEntry Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Wed Nov 4 23:51:00 2009 @@ -67,7 +67,7 @@ { if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) { - __invlpg(Address); + KeInvalidateTlbEntry(Address); } }

1 0

[sginsberg] 43962: - Oh snap. KDBG is not dead yet.
by sginsberg＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: sginsberg Date: Wed Nov 4 23:49:46 2009 New Revision: 43962 URL: http://svn.reactos.org/svn/reactos?rev=43962&view=rev Log: - Oh snap. KDBG is not dead yet. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Nov 4 23:49:46 2009 @@ -383,11 +383,13 @@ // MmArmInitSystem(1, KeLoaderBlock); +#if defined(_WINKD_) // // Everything required for the debugger to read and write // physical memory is now set up // MiDbgReadyForPhysical = TRUE; +#endif /* Put the paged pool after the loaded modules */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart +

1 0

[ablackmann] 43961: Holy shit Batman! KbdTool can now write out the keyboard layout header file! You should get a Layout01.h if you run it on test.klc (in your current working directory).
by ablackmann＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: ablackmann Date: Wed Nov 4 23:48:55 2009 New Revision: 43961 URL: http://svn.reactos.org/svn/reactos?rev=43961&view=rev Log: Holy shit Batman! KbdTool can now write out the keyboard layout header file! You should get a Layout01.h if you run it on test.klc (in your current working directory). Modified: trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/kbdtool/output.c trunk/reactos/tools/kbdtool/parser.c Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Wed Nov 4 23:48:55 2009 @@ -13,6 +13,7 @@ #include <stdio.h> #include <stdlib.h> #include <getopt.h> +#include <time.h> #include <host/typedefs.h> #define KEYWORD_COUNT 17 @@ -65,11 +66,22 @@ LAYOUTENTRY Entry[110]; } LAYOUT, *PLAYOUT; +PCHAR +getVKName( + IN ULONG VirtualKey, + IN BOOLEAN Prefix +); + extern BOOLEAN Verbose, UnicodeFile, SanityCheck, FallbackDriver; extern PCHAR gpszFileName; extern FILE* gfpInput; extern VKNAME VKName[]; extern SCVK ScVk[]; extern LAYOUT g_Layout; +extern CHAR gVKeyName[32]; +extern CHAR gKBDName[10]; +extern CHAR gCopyright[256]; +extern CHAR gDescription[256]; +extern ULONG gVersion, gSubVersion; /* EOF */ Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Wed Nov 4 23:48:55 2009 @@ -12,13 +12,133 @@ /* GLOBALS ********************************************************************/ +time_t Clock; +struct tm *Now; + /* FUNCTIONS ******************************************************************/ BOOLEAN kbd_h(IN PLAYOUT Layout) { - /* FIXME: Stub */ - return FALSE; + CHAR OutputFile[13]; + FILE *FileHandle; + ULONG i; + CHAR UndefChar; + USHORT SubCode; + + /* Build the keyboard name */ + strcpy(OutputFile, gKBDName); + strcat(OutputFile, ".H"); + + /* Open it */ + FileHandle = fopen(OutputFile, "wt"); + if (!FileHandle) + { + /* Fail */ + printf(" %12s : can't open for write.\n", OutputFile); + return FALSE; + } + + /* Print the module header */ + fprintf(FileHandle, + "/****************************** Module Header ******************************\\\n" + "* Module Name: %s\n*\n* keyboard layout header\n" + "*\n" + "* Copyright (c) 2009, ReactOS Foundation\n" + "*\n" + "* Various defines for use by keyboard input code.\n*\n* History:\n" + "*\n" + "* created by KBDTOOL v%d.%02d %s*\n" + "\\***************************************************************************/\n\n", + OutputFile, + gVersion, + gSubVersion, + asctime(Now)); + + /* Print out the includes and defines */ + fprintf(FileHandle, + "/*\n" + " * kbd type should be controlled by cl command-line argument\n" + " *\\n" + "#define KBD_TYPE 4\n\n" + "/*\n" + "* Include the basis of all keyboard table values\n" + "*/\n" + "#include \"kbd.h\"\n"); + + /* Now print out the virtual key conversion table */ + fprintf(FileHandle, + "/***************************************************************************\\\n" + "* The table below defines the virtual keys for various keyboard types where\n" + "* the keyboard differ from the US keyboard.\n" + "*\n" + "* _EQ() : all keyboard types have the same virtual key for this scancode\n" + "* _NE() : different virtual keys for this scancode, depending on kbd type\n" + "*\n" + "* +------+ +----------+----------+----------+----------+----------+----------+\n" + "* | Scan | | kbd | kbd | kbd | kbd | kbd | kbd |\n" + "* | code | | type 1 | type 2 | type 3 | type 4 | type 5 | type 6 |\n" + "\\****+-------+_+----------+----------+----------+----------+----------+----------+*/\n\n"); + + /* Loop all keys */ + for (i = 0; i < 110; i++) + { + /* Check if we processed this key */ + if (Layout->Entry[i].Processed) + { + /* Check if it redefined a virtual key */ + if (Layout->Entry[i].VirtualKey != Layout->Entry[i].OriginalVirtualKey) + { + /* Do we have a subcode? */ + SubCode = Layout->Entry[i].ScanCode & 0xFF00; + if (SubCode) + { + /* Which kind is it? */ + if (SubCode == 0xE000) + { + /* Extended 0 */ + UndefChar = 'X'; + } + else + { + /* Illegal */ + if (SubCode != 0xE100) + { + /* Unrecognized */ + printf("Weird scancode value %04x: expected xx, E0xx, or E1xx\n", SubCode); + exit(1); + } + + /* Extended 1 */ + UndefChar = 'Y'; + } + } + else + { + /* Normal key */ + UndefChar = 'T'; + } + + /* Print out the virtual key redefinition */ + fprintf(FileHandle, + "#undef %c%02X\n#define %c%02X _EQ(%43s%23s\n", + UndefChar, + Layout->Entry[i].ScanCode, + UndefChar, + Layout->Entry[i].ScanCode, + getVKName(Layout->Entry[i].VirtualKey, 0), + ")"); + } + } + } + + /* Cleanup and close */ + fprintf(FileHandle,"\n"); + fclose(FileHandle); + + /* We made it */ + return TRUE; + } BOOLEAN @@ -64,7 +184,11 @@ IN PKEYNAME KeyNameDeadData) { ULONG FailureCode = 0; - + + /* Take the time */ + time(&Clock); + Now = localtime(&Clock); + /* Check if this just a fallback driver*/ if (!FallbackDriver) { Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Nov 4 23:48:55 2009 @@ -19,6 +19,7 @@ CHAR gDescription[256]; CHAR gCompany[256]; CHAR gLocaleName[256]; +CHAR gVKeyName[32]; ULONG gID = 0; ULONG gKbdLayoutVersion; LAYOUT g_Layout; @@ -58,6 +59,53 @@ /* If we didn't find anything, i will be KEYWORD_COUNT, which is invalid */ return i; +} + +PCHAR +getVKName(IN ULONG VirtualKey, + IN BOOLEAN Prefix) +{ + ULONG i; + + /* Loop for standard virtual key */ + if (((VirtualKey >= 'A') && (VirtualKey <= 'Z')) || + ((VirtualKey >= '0') && (VirtualKey <= '9'))) + { + /* Fill out the name */ + gVKeyName[0] = '\''; + gVKeyName[1] = VirtualKey; + gVKeyName[2] = '\''; + gVKeyName[3] = '\0'; + return gVKeyName; + } + + /* Check if a prefix is required */ + if (Prefix) + { + /* Add it */ + strcpy(gVKeyName, "VK_"); + } + else + { + /* Otherwise, don't add anything */ + strcpy(gVKeyName, ""); + } + + /* Loop all virtual keys */ + for (i = 0; i < 36; i++) + { + /* Check if this key matches */ + if (VKName[i].VirtualKey == VirtualKey) + { + /* Copy the key's name into the buffer */ + strcat(gVKeyName, VKName[i].Name); + return gVKeyName; + } + } + + /* If we got here, then we failed, so print out an error name */ + strcpy(gVKeyName, "#ERROR#"); + return gVKeyName; } ULONG

1 0

[sginsberg] 43960: - Implement support for reading and writing physical memory for KD. The implementation uses a reserved mapping page to map the target physical address to. On x86 this page is located at virtual address 0xFFBFF000, and the PTE for this page is the last PTE of the nonpaged pool's PDE. Other architectures may need to reserve the PTE elsewhere. - The physical memory support relies on several Mm variables and structures to be properly set up. Add a new flag, MiDbgReadyForPhysical,
by sginsberg＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: sginsberg Date: Wed Nov 4 23:40:18 2009 New Revision: 43960 URL: http://svn.reactos.org/svn/reactos?rev=43960&view=rev Log: - Implement support for reading and writing physical memory for KD. The implementation uses a reserved mapping page to map the target physical address to. On x86 this page is located at virtual address 0xFFBFF000, and the PTE for this page is the last PTE of the nonpaged pool's PDE. Other architectures may need to reserve the PTE elsewhere. - The physical memory support relies on several Mm variables and structures to be properly set up. Add a new flag, MiDbgReadyForPhysical, and set it when the debugger support can handle physical memory requests. - Protect this page with a Memory Area to make the old Mm keep its dirty hands off it. - Does not support I/O space or cache flags yet. - Add generic KeInvalidateTlbEntry to invalidate a single TLB entry for a given address instead of flushing the whole TLB. Used by the debugger physical memory support as invalidating the whole TLB for every map and unmap of its debug PTE would incur significant overhead for large copies. Replace direct usage of __invlpg() with this in x86 code too. - Fix incorrect cache flag check and set in KdpRead/WritePhysicalmemory for write combined requests. The debugger's Uncached flag was checked instead of the Write Combined flag, and the debuggers Write Combine number (0x3) was set instead of Mm's flag (0x20). - Fix implementation of MmIsAddressValid (at least for x86; other architectures will need more checks). Just check the Address' PDE and PTE valid bits instead of using Memory Areas. - Add missing ASSERTs to ensure the Memory Areas for paged pool, the PCR page, and the Shared User Data page are created. - Add missing Memory Area for the 2 pages HAL currently uses for its own mappings on x86 -- previously, those pages could have been allocated by other parts of the OS, which would have resulted in serious corruptions. Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c trunk/reactos/ntoskrnl/mm/mmdbg.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -3,7 +3,7 @@ FORCEINLINE VOID -KeArmHaltProcessor(void) +KeArmHaltProcessor(VOID) { // // Enter Wait-For-Interrupt Mode Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -40,6 +40,17 @@ // //#define KeGetTrapFrameInterruptState(TrapFrame) \ +// +// Invalidates the TLB entry for a specified address +// +FORCEINLINE +VOID +KeInvalidateTlbEntry(IN PVOID Address) +{ + /* Invalidate the TLB entry for this address */ + KeArmInvalidateTlbEntry(Address); +} + VOID KiPassiveRelease( VOID Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -41,6 +41,17 @@ // #define KeGetTrapFrameInterruptState(TrapFrame) \ BooleanFlagOn((TrapFrame)->EFlags, EFLAGS_INTERRUPT_MASK) + +// +// Invalidates the TLB entry for a specified address +// +FORCEINLINE +VOID +KeInvalidateTlbEntry(IN PVOID Address) +{ + /* Invalidate the TLB entry for this address */ + __invlpg(Address); +} VOID FASTCALL Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -45,6 +45,8 @@ extern SIZE_T MmPeakCommitment; extern SIZE_T MmtotalCommitLimitMaximum; +extern BOOLEAN MiDbgReadyForPhysical; + struct _KTRAP_FRAME; struct _EPROCESS; struct _MM_RMAP_ENTRY; @@ -67,8 +69,11 @@ // #define MMDBG_COPY_MAX_SIZE 0x8 - -#define MI_STATIC_MEMORY_AREAS (12) +#if defined(_X86_) +#define MI_STATIC_MEMORY_AREAS (14) +#else +#define MI_STATIC_MEMORY_AREAS (13) +#endif #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -47,14 +47,14 @@ PointerPte = MiAddressToPte(MI_KDBG_TMP_PAGE_1); *PointerPte = TempPte; VirtAddr = (ULONG_PTR)PointerPte << 10; - __invlpg((PVOID)VirtAddr); + KeInvalidateTlbEntry((PVOID)VirtAddr); } TempPte.u.Hard.PageFrameNumber = PhysAddr >> PAGE_SHIFT; PointerPte = MiAddressToPte(MI_KDBG_TMP_PAGE_0); *PointerPte = TempPte; VirtAddr = (ULONG_PTR)PointerPte << 10; - __invlpg((PVOID)VirtAddr); + KeInvalidateTlbEntry((PVOID)VirtAddr); return VirtAddr + (PhysAddr & (PAGE_SIZE - 1)); } Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -500,10 +500,10 @@ /* Uncached */ Flags |= MMDBG_COPY_UNCACHED; } - else if (CacheFlags == DBGKD_CACHING_UNCACHED) + else if (CacheFlags == DBGKD_CACHING_WRITE_COMBINED) { /* Write Combined */ - Flags |= DBGKD_CACHING_WRITE_COMBINED; + Flags |= MMDBG_COPY_WRITE_COMBINED; } /* Do the read */ @@ -553,10 +553,10 @@ /* Uncached */ Flags |= MMDBG_COPY_UNCACHED; } - else if (CacheFlags == DBGKD_CACHING_UNCACHED) + else if (CacheFlags == DBGKD_CACHING_WRITE_COMBINED) { /* Write Combined */ - Flags |= DBGKD_CACHING_WRITE_COMBINED; + Flags |= MMDBG_COPY_WRITE_COMBINED; } /* Do the write */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -28,6 +28,7 @@ #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 +#define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmsup.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -60,6 +60,32 @@ { UNIMPLEMENTED; return FALSE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +MmIsAddressValid(IN PVOID VirtualAddress) +{ + // + // Just check the Valid bit in the Address' PDE and PTE + // + if ((MiAddressToPde(VirtualAddress)->u.Hard.Valid == 0) || + (MiAddressToPte(VirtualAddress)->u.Hard.Valid == 0)) + { + // + // Attempting to access this page is guranteed to result in a page fault + // + return FALSE; + } + + // + // This address is valid now, but it will only stay so if the caller holds + // the PFN lock + // + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -6,13 +6,124 @@ * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> +#include "ARM3/miarm.h" #define NDEBUG #include <debug.h> -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ********************************************************************/ + +PMMPTE MmDebugPte = MiAddressToPte(MI_DEBUG_MAPPING); +BOOLEAN MiDbgReadyForPhysical = FALSE; + +/* FUNCTIONS ******************************************************************/ + +PVOID +NTAPI +MiDbgTranslatePhysicalAddress(IN ULONG64 PhysicalAddress, + IN ULONG Flags) +{ + PFN_NUMBER Pfn; + MMPTE TempPte; + PVOID MappingBaseAddress; + + // + // Check if we are called too early + // + if (MiDbgReadyForPhysical == FALSE) + { + // + // The structures we require aren't initialized yet, fail + // + KdpDprintf("MiDbgTranslatePhysicalAddress called too early! " + "Address: 0x%I64x\n", PhysicalAddress); + return NULL; + } + + // + // FIXME: No support for cache flags yet + // + if ((Flags & (MMDBG_COPY_CACHED | + MMDBG_COPY_UNCACHED | + MMDBG_COPY_WRITE_COMBINED)) != 0) + { + // + // Fail + // + KdpDprintf("MiDbgTranslatePhysicalAddress: Cache Flags not yet supported. " + "Flags: 0x%lx\n", Flags & (MMDBG_COPY_CACHED | + MMDBG_COPY_UNCACHED | + MMDBG_COPY_WRITE_COMBINED)); + return NULL; + } + + // + // Save the base address of our mapping page + // + MappingBaseAddress = MiPteToAddress(MmDebugPte); + + // + // + // + TempPte = HyperTemplatePte; + + // + // Convert physical address to PFN + // + Pfn = (PFN_NUMBER)(PhysicalAddress >> PAGE_SHIFT); + + // + // Check if this could be an I/O mapping + // + if (Pfn > MmHighestPhysicalPage) + { + // + // FIXME: We don't support this yet + // + KdpDprintf("MiDbgTranslatePhysicalAddress: I/O Space not yet supported. " + "PFN: 0x%I64x\n", (ULONG64)Pfn); + return NULL; + } + else + { + // + // Set the PFN in the PTE + // + TempPte.u.Hard.PageFrameNumber = Pfn; + } + + // + // Map the PTE and invalidate its TLB entry + // + *MmDebugPte = TempPte; + KeInvalidateTlbEntry(MappingBaseAddress); + + // + // Calculate and return the virtual offset into our mapping page + // + return (PVOID)((ULONG_PTR)MappingBaseAddress + + BYTE_OFFSET(PhysicalAddress)); +} + +VOID +NTAPI +MiDbgUnTranslatePhysicalAddress(VOID) +{ + PVOID MappingBaseAddress = MiPteToAddress(MmDebugPte); + + // + // The address must still be valid at this point + // + ASSERT(MmIsAddressValid(MappingBaseAddress)); + + // + // Clear the mapping PTE and invalidate its TLB entry + // + MmDebugPte->u.Long = 0; + KeInvalidateTlbEntry(MappingBaseAddress); +} NTSTATUS NTAPI @@ -22,87 +133,174 @@ IN ULONG Flags) { NTSTATUS Status; - - /* For now, this must be a "unsafe" copy */ + PVOID TargetAddress; + + // + // No local kernel debugging support yet, so don't worry about locking + // ASSERT(Flags & MMDBG_COPY_UNSAFE); - /* We only handle 1, 2, 4 and 8 byte requests */ + // + // We only handle 1, 2, 4 and 8 byte requests + // if ((Size != 1) && (Size != 2) && (Size != 4) && (Size != MMDBG_COPY_MAX_SIZE)) { - /* Invalid size, fail */ + // + // Invalid size, fail + // + KdpDprintf("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", Size); return STATUS_INVALID_PARAMETER_3; } - /* The copy must be aligned too */ + // + // The copy must be aligned + // if ((Address & (Size - 1)) != 0) { - /* Fail */ + // + // Fail + // + KdpDprintf("MmDbgCopyMemory: Received Unaligned Address 0x%I64x Size %lx\n", + Address, Size); return STATUS_INVALID_PARAMETER_3; } - /* No physical memory support yet */ + // + // Check if this is physical or virtual copy + // if (Flags & MMDBG_COPY_PHYSICAL) { - /* Fail */ - KdpDprintf("MmDbgCopyMemory: Failing %s for Physical Address 0x%I64x\n", - Flags & MMDBG_COPY_WRITE ? "write" : "read", - Address); + // + // Physical: translate and map it to our mapping space + // + TargetAddress = MiDbgTranslatePhysicalAddress(Address, Flags); + + // + // Check if translation failed + // + if (!TargetAddress) + { + // + // Fail + // + KdpDprintf("MmDbgCopyMemory: Failed to Translate Physical Address " + "%I64x\n", Address); + return STATUS_UNSUCCESSFUL; + } + + // + // The address we received must be valid! + // + ASSERT(MmIsAddressValid(TargetAddress)); + } + else + { + // + // Virtual; truncate it to avoid casts later down + // + TargetAddress = (PVOID)(ULONG_PTR)Address; + + // + // Check if the address is invalid + // + if (!MmIsAddressValid(TargetAddress)) + { + // + // Fail + // + KdpDprintf("MmDbgCopyMemory: Failing %s for invalid " + "Virtual Address 0x%p\n", + Flags & MMDBG_COPY_WRITE ? "write" : "read", + TargetAddress); + return STATUS_UNSUCCESSFUL; + } + } + + // + // If we are going to write to the address then make sure it is writeable too + // + if ((Flags & MMDBG_COPY_WRITE) && + (!MI_IS_PAGE_WRITEABLE(MiAddressToPte(TargetAddress)))) + { + // + // Check if we mapped anything + // + if (Flags & MMDBG_COPY_PHYSICAL) + { + // + // Get rid of the mapping + // + MiDbgUnTranslatePhysicalAddress(); + } + + // + // Fail + // + // FIXME: We should attempt to override the write protection instead of + // failing here + // + KdpDprintf("MmDbgCopyMemory: Failing Write for Protected Address 0x%p\n", + TargetAddress); return STATUS_UNSUCCESSFUL; } - /* Simple check for invalid address */ - if ((MiAddressToPde((ULONG_PTR)Address)->u.Hard.Valid == 0) || - (MiAddressToPte((ULONG_PTR)Address)->u.Hard.Valid == 0)) - { - /* Fail */ - KdpDprintf("MmDbgCopyMemory: Failing %s for invalid Address 0x%p\n", - Flags & MMDBG_COPY_WRITE ? "write" : "read", - (PVOID)(ULONG_PTR)Address); - return STATUS_UNSUCCESSFUL; - } - - /* If we are going to write to it then make sure it is writeable too */ - if ((Flags & MMDBG_COPY_WRITE) && - (!MI_IS_PAGE_WRITEABLE(MiAddressToPte((ULONG_PTR)Address)))) - { - /* Fail */ - KdpDprintf("MmDbgCopyMemory: Failing write for Address 0x%p\n", - (PVOID)(ULONG_PTR)Address); - return STATUS_UNSUCCESSFUL; - } - - /* Use SEH to try to catch anything else somewhat cleanly */ + // + // Use SEH to try to catch anything else somewhat cleanly + // _SEH2_TRY { - /* Check if this is read or write */ + // + // Check if this is read or write + // if (Flags & MMDBG_COPY_WRITE) { - /* Do the write */ - RtlCopyMemory((PVOID)(ULONG_PTR)Address, + // + // Do the write + // + RtlCopyMemory(TargetAddress, Buffer, Size); } else { - /* Do the read */ + // + // Do the read + // RtlCopyMemory(Buffer, - (PVOID)(ULONG_PTR)Address, + TargetAddress, Size); } - /* Copy succeeded */ + // + // Copy succeeded + // Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ + // + // Get the exception code + // Status = _SEH2_GetExceptionCode(); } _SEH2_END; - /* Return status */ + // + // Get rid of the mapping if this was a physical copy + // + if (Flags & MMDBG_COPY_PHYSICAL) + { + // + // Unmap and flush it + // + MiDbgUnTranslatePhysicalAddress(); + } + + // + // Return status to caller + // return Status; } Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -328,41 +328,3 @@ } return(Status); } - -/* PUBLIC FUNCTIONS ***********************************************************/ - -/* - * @implemented - */ -BOOLEAN -NTAPI -MmIsAddressValid(IN PVOID VirtualAddress) -{ - MEMORY_AREA* MemoryArea; - PMMSUPPORT AddressSpace; - - DPRINT1("WARNING: %s returns bogus result\n", __FUNCTION__); - - if (VirtualAddress >= MmSystemRangeStart) - { - AddressSpace = MmGetKernelAddressSpace(); - } - else - { - AddressSpace = &PsGetCurrentProcess()->Vm; - } - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, - VirtualAddress); - - if (MemoryArea == NULL || MemoryArea->DeleteInProgress) - { - MmUnlockAddressSpace(AddressSpace); - return(FALSE); - } - MmUnlockAddressSpace(AddressSpace); - return(TRUE); -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Nov 4 23:40:18 2009 @@ -203,43 +203,78 @@ // And now, ReactOS paged pool // BaseAddress = MmPagedPoolBase; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC, - &BaseAddress, - MmPagedPoolSize, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC, + &BaseAddress, + MmPagedPoolSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); // // Next, the KPCR // BaseAddress = (PVOID)PCR; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE * KeNumberProcessors, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE * KeNumberProcessors, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); // // Now the KUSER_SHARED_DATA // BaseAddress = (PVOID)KI_USER_SHARED_DATA; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // + // And the debugger mapping + // + BaseAddress = MI_DEBUG_MAPPING; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + +#if defined(_X86_) + // + // Finally, reserve the 2 pages we currently make use of for HAL mappings + // + BaseAddress = (PVOID)0xFFC00000; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE * 2, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); +#endif } VOID @@ -347,6 +382,12 @@ // Initialize ARMÂ³ in phase 1 // MmArmInitSystem(1, KeLoaderBlock); + + // + // Everything required for the debugger to read and write + // physical memory is now set up + // + MiDbgReadyForPhysical = TRUE; /* Put the paged pool after the loaded modules */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart +

1 0

[ablackmann] 43959: Refactoring and cleanup. Start fleshing out the output phase. Start handling exit correctly. Fix a bug in DoLAYOUT. Nothing new to see here...
by ablackmann＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: ablackmann Date: Wed Nov 4 23:07:29 2009 New Revision: 43959 URL: http://svn.reactos.org/svn/reactos?rev=43959&view=rev Log: Refactoring and cleanup. Start fleshing out the output phase. Start handling exit correctly. Fix a bug in DoLAYOUT. Nothing new to see here... Added: trunk/reactos/tools/kbdtool/data.c (with props) trunk/reactos/tools/kbdtool/kbdtool.h (with props) Modified: trunk/reactos/tools/kbdtool/kbdtool.rbuild trunk/reactos/tools/kbdtool/main.c trunk/reactos/tools/kbdtool/output.c trunk/reactos/tools/kbdtool/parser.c Added: trunk/reactos/tools/kbdtool/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/data.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/data.c (added) +++ trunk/reactos/tools/kbdtool/data.c [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -1,0 +1,174 @@ +/* + * PROJECT: ReactOS Build Tools [Keyboard Layout Compiler] + * LICENSE: BSD - See COPYING.BSD in the top level directory + * FILE: tools/kbdtool/data.c + * PURPOSE: Internal Keyboard (Scancode/Virtual Key) Tables + * PROGRAMMERS: ReactOS Foundation + */ + +/* INCLUDES *******************************************************************/ + +#include "kbdtool.h" + +/* GLOBALS ********************************************************************/ + +/* Table of Virtual Key Names */ +VKNAME VKName[] = +{ + {0x08, "BACK"}, + {0x03, "CANCEL"}, + {0x1b, "ESCAPE"}, + {0x0d, "RETURN"}, + {0x20, "SPACE"}, + {0x6e, "DECIMAL"}, + {0xba, "OEM_1"}, + {0xbb, "OEM_PLUS"}, + {0xbc, "OEM_COMMA"}, + {0xbd, "OEM_MINUS"}, + {0xbe, "OEM_PERIOD"}, + {0xbf, "OEM_2"}, + {0xc0, "OEM_3"}, + {0xdb, "OEM_4"}, + {0xdc, "OEM_5"}, + {0xdd, "OEM_6"}, + {0xde, "OEM_7"}, + {0xdf, "OEM_8"}, + {0xe2, "OEM_102"}, + {0xc1, "ABNT_C1"}, + {0xc2, "ABNT_C2"}, + {0x10, "SHIFT"}, + {0xa0, "LSHIFT"}, + {0xa1, "RSHIFT"}, + {0x12, "MENU"}, + {0xa4, "LMENU"}, + {0xa5, "RMENU"}, + {0x11, "CONTROL"}, + {0xa2, "LCONTROL"}, + {0xa3, "RCONTROL"}, + {0x6c, "SEPARATOR"}, + {0xe4, "ICO_00"}, + {0x2e, "DELETE"}, + {0x2d, "INSERT"}, + {0xe5, "GROUPSHIFT"}, + {0xe6, "RGROUPSHIFT"} +}; + +/* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ +SCVK ScVk[] = +{ + {0x02, '1', NULL, FALSE}, + {0x03, '2', NULL, FALSE}, + {0x04, '3', NULL, FALSE}, + {0x05, '4', NULL, FALSE}, + {0x06, '5', NULL, FALSE}, + {0x07, '6', NULL, FALSE}, + {0x08, '7', NULL, FALSE}, + {0x09, '8', NULL, FALSE}, + {0x0a, '9', NULL, FALSE}, + {0x0b, '0', NULL, FALSE}, + {0x0c, 0xbd, NULL, FALSE}, + {0x0d, 0xbb, NULL, FALSE}, + {0x10, 'Q', NULL, FALSE}, + {0x11, 'W', NULL, FALSE}, + {0x12, 'E', NULL, FALSE}, + {0x13, 'R', NULL, FALSE}, + {0x14, 'T', NULL, FALSE}, + {0x15, 'Y', NULL, FALSE}, + {0x16, 'U', NULL, FALSE}, + {0x17, 'I', NULL, FALSE}, + {0x18, 'O', NULL, FALSE}, + {0x19, 'P', NULL, FALSE}, + {0x1a, 0xdb, NULL, FALSE}, + {0x1b, 0xdd, NULL, FALSE}, + {0x1e, 'A', NULL, FALSE}, + {0x1f, 'S', NULL, FALSE}, + {0x20, 'D', NULL, FALSE}, + {0x21, 'F', NULL, FALSE}, + {0x22, 'G', NULL, FALSE}, + {0x23, 'H', NULL, FALSE}, + {0x24, 'J', NULL, FALSE}, + {0x25, 'K', NULL, FALSE}, + {0x26, 'L', NULL, FALSE}, + {0x27, 0xba, NULL, FALSE}, + {0x28, 0xde, NULL, FALSE}, + {0x29, 0xc0, NULL, FALSE}, + {0x2b, 0xdc, NULL, FALSE}, + {0x2c, 'Z', NULL, FALSE}, + {0x2d, 'X', NULL, FALSE}, + {0x2e, 'C', NULL, FALSE}, + {0x2f, 'V', NULL, FALSE}, + {0x30, 'B', NULL, FALSE}, + {0x31, 'N', NULL, FALSE}, + {0x32, 'M', NULL, FALSE}, + {0x33, 0xbc, NULL, FALSE}, + {0x34, 0xbe, NULL, FALSE}, + {0x35, 0xbf, NULL, FALSE}, + {0x53, 0x6e, NULL, FALSE}, + {0x56, 0xe2, NULL, FALSE}, + {0x73, 0xc1, NULL, FALSE}, + {0x7e, 0xc2, NULL, FALSE}, + {0xe010, 0xb1, "Speedracer: Previous Track", FALSE}, + {0xe019, 0xb0, "Speedracer: Next Track", FALSE}, + {0xe01d, 0xa3, "RControl", FALSE}, + {0xe020, 0xad, "Speedracer: Volume Mute", FALSE}, + {0xe021, 0xb7, "Speedracer: Launch App 2", FALSE}, + {0xe022, 0xb3, "Speedracer: Media Play/Pause", FALSE}, + {0xe024, 0xb2, "Speedracer: Media Stop", FALSE}, + {0xe02e, 0xae, "Speedracer: Volume Up", FALSE}, + {0xe030, 0xaf, "Speedracer: Volume Down", FALSE}, + {0xe032, 0xac, "Speedracer: Browser Home", FALSE}, + {0xe035, 0x6f, "Numpad Divide", FALSE}, + {0xe037, 0x2c, "Snapshot", FALSE}, + {0xe038, 0xa5, "RMenu", FALSE}, + {0xe047, 0x24, "Home", FALSE}, + {0xe048, 0x26, "Up", FALSE}, + {0xe049, 0x21, "Prior", FALSE}, + {0xe04b, 0x25, "Left", FALSE}, + {0xe04d, 0x27, "Right", FALSE}, + {0xe04f, 0x23, "End", FALSE}, + {0xe050, 0x28, "Down", FALSE}, + {0xe051, 0x22, "Next", FALSE}, + {0xe052, 0x2d, "Insert", FALSE}, + {0xe053, 0x2e, "Delete", FALSE}, + {0xe05b, 0x5b, "Left Win", FALSE}, + {0xe05c, 0x5c, "Right Win", FALSE}, + {0xe05d, 0x5d, "Application", FALSE}, + {0xe05e, 0xff, "Power", FALSE}, + {0xe05f, 0x5f, "Speedracer: Sleep", FALSE}, + {0xe060, 0xff, "BAD SCANCODE", FALSE}, + {0xe061, 0xff, "BAD SCANCODE", FALSE}, + {0xe065, 0xaa, "Speedracer: Browser Search", FALSE}, + {0xe066, 0xab, "Speedracer: Browser Favorites", FALSE}, + {0xe067, 0xa8, "Speedracer: Browser Refresh", FALSE}, + {0xe068, 0xa9, "Speedracer: Browser Stop", FALSE}, + {0xe069, 0xa7, "Speedracer: Browser Foward", FALSE}, + {0xe06a, 0xa6, "Speedracer: Browser Back", FALSE}, + {0xe06b, 0xb6, "Speedracer: Launch App 1", FALSE}, + {0xe06c, 0xb4, "Speedracer: Launch Mail", FALSE}, + {0xe06d, 0xb5, "Speedracer: Launch Media Selector", FALSE}, + {0x53, 0x6e, NULL, FALSE}, + {0x0e, 0x08, NULL, FALSE}, + {0x01, 0x1b, NULL, FALSE}, + {0xe01c, 0x0d, "Numpad Enter", FALSE}, + {0x1c, 0x0d, NULL, FALSE}, + {0x39, 0x20, NULL, FALSE}, + {0xe046, 0x03, "Break (Ctrl + Pause)", FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE}, + {0xFFFF, 0x00, NULL, FALSE} +}; + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/tools/kbdtool/data.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h (added) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -1,0 +1,75 @@ +/* + * PROJECT: ReactOS Build Tools [Keyboard Layout Compiler] + * LICENSE: BSD - See COPYING.BSD in the top level directory + * FILE: tools/kbdtool/kbdtool.h + * PURPOSE: Main Header File + * PROGRAMMERS: ReactOS Foundation + */ + +/* INCLUDES *******************************************************************/ + +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <getopt.h> +#include <host/typedefs.h> + +#define KEYWORD_COUNT 17 + +#define CHAR_NORMAL_KEY 0 +#define CHAR_DEAD_KEY 1 +#define CHAR_OTHER_KEY 2 +#define CHAR_INVALID_KEY 3 +#define CHAR_LIGATURE_KEY 4 + +typedef struct tagKEYNAME +{ + ULONG Code; + PCHAR Name; + struct tagKEYNAME* Next; +} KEYNAME, *PKEYNAME; + +typedef struct tagSCVK +{ + USHORT ScanCode; + USHORT VirtualKey; + PCHAR Name; + BOOLEAN Processed; +} SCVK, *PSCVK; + +typedef struct tagVKNAME +{ + ULONG VirtualKey; + PCHAR Name; +} VKNAME, *PVKNAME; + +typedef struct tagLAYOUTENTRY +{ + USHORT ScanCode; + UCHAR VirtualKey; + UCHAR OriginalVirtualKey; + ULONG Cap; + ULONG StateCount; + ULONG CharData[8]; + ULONG DeadCharData[8]; + ULONG OtherCharData[8]; + struct LAYOUTENTRY* CapData; + PCHAR Name; + ULONG Processed; + ULONG LineCount; +} LAYOUTENTRY, *PLAYOUTENTRY; + +typedef struct tagLAYOUT +{ + LAYOUTENTRY Entry[110]; +} LAYOUT, *PLAYOUT; + +extern BOOLEAN Verbose, UnicodeFile, SanityCheck, FallbackDriver; +extern PCHAR gpszFileName; +extern FILE* gfpInput; +extern VKNAME VKName[]; +extern SCVK ScVk[]; +extern LAYOUT g_Layout; + +/* EOF */ Propchange: trunk/reactos/tools/kbdtool/kbdtool.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/kbdtool/kbdtool.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.rbui… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.rbuild [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -1,7 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="kbdtool" type="buildtool"> - <file>main.c</file> + <file>data.c</file> + <file>main.c</file> <file>output.c</file> <file>parser.c</file> </module> Modified: trunk/reactos/tools/kbdtool/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/main.c?rev=4… ============================================================================== --- trunk/reactos/tools/kbdtool/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/main.c [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -8,21 +8,21 @@ /* INCLUDES *******************************************************************/ -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include "getopt.h" -#include <host/typedefs.h> +#include "kbdtool.h" /* GLOBALS ********************************************************************/ +/* Internal tool data */ ULONG gVersion = 3; ULONG gSubVersion = 40; + +/* Input file */ +PCHAR gpszFileName; +FILE* gfpInput; + +/* Command-line parameters */ BOOLEAN UnicodeFile, Verbose, NoLogo, FallbackDriver, SanityCheck, SourceOnly; ULONG BuildType; -PCHAR gpszFileName; -FILE* gfpInput; /* FUNCTIONS ******************************************************************/ @@ -53,7 +53,7 @@ printf("\t-i/-x/-m/-o-s will exhibit the same behavior when than one of them is specified.\n\n"); /* Quit */ - _exit(1); + exit(1); printf("should not be here"); } @@ -61,6 +61,7 @@ main(INT argc, PCHAR* argv) { + ULONG ErrorCode, FailureCode; CHAR Option; PCHAR OpenFlags; CHAR BuildOptions[16] = {0}; @@ -213,16 +214,27 @@ /* Now inform the user */ printf("Compiling layout information from '%s' for %s.\n", gpszFileName, BuildOptions); } - + /* Now parse the keywords */ - DoParsing(); - - /* We are done */ - fclose(gfpInput); - - /* Now do something... */ - printf("Like a rock...\n"); - exit(0); + FailureCode = DoParsing(); + + /* Should we build? */ + if (!(SourceOnly) && !(FallbackDriver)) ErrorCode = 0;//DoBuild(); + + /* Did everything work? */ + if (FailureCode == 0) + { + /* Tell the user, if he cares */ + if (!NoLogo) printf("All tasks completed successfully.\n"); + } + else + { + /* Print the failure code */ + printf("\n %13d\n", FailureCode); + } + + /* Return the error code */ + return ErrorCode; } /* EOF */ Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -8,14 +8,98 @@ /* INCLUDES *******************************************************************/ -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <host/typedefs.h> +#include "kbdtool.h" /* GLOBALS ********************************************************************/ /* FUNCTIONS ******************************************************************/ +BOOLEAN +kbd_h(IN PLAYOUT Layout) +{ + /* FIXME: Stub */ + return FALSE; +} + +BOOLEAN +kbd_rc(IN PKEYNAME DescriptionData, + IN PKEYNAME LanguageData) +{ + /* FIXME: Stub */ + return FALSE; +} + +BOOLEAN +kbd_def(VOID) +{ + /* FIXME: Stub */ + return FALSE; +} + +BOOLEAN +kbd_c(IN ULONG StateCount, + IN PULONG ShiftStates, + IN PVOID AttributeData, + IN PLAYOUT Layout, + IN PVOID DeadKeyData, + IN PVOID LigatureData, + IN PKEYNAME KeyNameData, + IN PKEYNAME KeyNameExtData, + IN PKEYNAME KeyNameDeadData) +{ + /* FIXME: Stub */ + return FALSE; +} + +ULONG +DoOutput(IN ULONG StateCount, + IN PULONG ShiftStates, + IN PKEYNAME DescriptionData, + IN PKEYNAME LanguageData, + IN PVOID AttributeData, + IN PVOID DeadKeyData, + IN PVOID LigatureData, + IN PKEYNAME KeyNameData, + IN PKEYNAME KeyNameExtData, + IN PKEYNAME KeyNameDeadData) +{ + ULONG FailureCode = 0; + + /* Check if this just a fallback driver*/ + if (!FallbackDriver) + { + /* It's not, create header file */ + if (!kbd_h(&g_Layout)) FailureCode = 1; + + /* Create the resource file */ + if (!kbd_rc(DescriptionData, LanguageData)) FailureCode = 2; + } + + /* Create the C file */ + if (!kbd_c(StateCount, + ShiftStates, + AttributeData, + &g_Layout, + DeadKeyData, + LigatureData, + KeyNameData, + KeyNameExtData, + KeyNameDeadData)) + { + /* Failed in C file generation */ + FailureCode = 3; + } + + /* Check if this just a fallback driver*/ + if (!FallbackDriver) + { + /* Generate the definition file */ + if (!kbd_def()) FailureCode = 4; + } + + /* Done */ + return FailureCode; +} + + /* EOF */ Modified: trunk/reactos/tools/kbdtool/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/parser.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/parser.c [iso-8859-1] Wed Nov 4 23:07:29 2009 @@ -8,61 +8,11 @@ /* INCLUDES *******************************************************************/ -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <host/typedefs.h> - -typedef struct tagKEYNAME -{ - ULONG Code; - PCHAR Name; - struct tagKEYNAME* Next; -} KEYNAME, *PKEYNAME; - -typedef struct tagSCVK -{ - USHORT ScanCode; - USHORT VirtualKey; - PCHAR Name; - BOOLEAN Processed; -} SCVK, *PSCVK; - -typedef struct tagVKNAME -{ - ULONG VirtualKey; - PCHAR Name; -} VKNAME, *PVKNAME; - -typedef struct tagLAYOUTENTRY -{ - USHORT ScanCode; - UCHAR VirtualKey; - UCHAR OriginalVirtualKey; - ULONG Cap; - ULONG StateCount; - ULONG CharData[8]; - ULONG DeadCharData[8]; - ULONG OtherCharData[8]; - struct LAYOUTENTRY* CapData; - PCHAR Name; - ULONG Processed; - ULONG LineCount; -} LAYOUTENTRY, *PLAYOUTENTRY; - -typedef struct tagLAYOUT -{ - LAYOUTENTRY Entry[110]; -} LAYOUT, *PLAYOUT; +#include "kbdtool.h" /* GLOBALS ********************************************************************/ -#define KEYWORD_COUNT 17 - -extern BOOLEAN Verbose, UnicodeFile, SanityCheck; -extern PCHAR gpszFileName; -extern FILE* gfpInput; +/* Internal parser data about everything that was parsed */ CHAR gBuf[256]; CHAR gKBDName[10]; CHAR gCopyright[256]; @@ -73,6 +23,8 @@ ULONG gKbdLayoutVersion; LAYOUT g_Layout; ULONG gLineCount; + +/* Table of keywords the parser recognizes */ PCHAR KeyWordList[KEYWORD_COUNT] = { "KBD", @@ -93,168 +45,6 @@ "LANGUAGENAMES", "ENDKBD", }; - -/* ISO 110-key Keyboard Scancode to Virtual Key Conversion Table */ -SCVK ScVk[] = -{ - {0x02, '1', NULL, FALSE}, - {0x03, '2', NULL, FALSE}, - {0x04, '3', NULL, FALSE}, - {0x05, '4', NULL, FALSE}, - {0x06, '5', NULL, FALSE}, - {0x07, '6', NULL, FALSE}, - {0x08, '7', NULL, FALSE}, - {0x09, '8', NULL, FALSE}, - {0x0a, '9', NULL, FALSE}, - {0x0b, '0', NULL, FALSE}, - {0x0c, 0xbd, NULL, FALSE}, - {0x0d, 0xbb, NULL, FALSE}, - {0x10, 'Q', NULL, FALSE}, - {0x11, 'W', NULL, FALSE}, - {0x12, 'E', NULL, FALSE}, - {0x13, 'R', NULL, FALSE}, - {0x14, 'T', NULL, FALSE}, - {0x15, 'Y', NULL, FALSE}, - {0x16, 'U', NULL, FALSE}, - {0x17, 'I', NULL, FALSE}, - {0x18, 'O', NULL, FALSE}, - {0x19, 'P', NULL, FALSE}, - {0x1a, 0xdb, NULL, FALSE}, - {0x1b, 0xdd, NULL, FALSE}, - {0x1e, 'A', NULL, FALSE}, - {0x1f, 'S', NULL, FALSE}, - {0x20, 'D', NULL, FALSE}, - {0x21, 'F', NULL, FALSE}, - {0x22, 'G', NULL, FALSE}, - {0x23, 'H', NULL, FALSE}, - {0x24, 'J', NULL, FALSE}, - {0x25, 'K', NULL, FALSE}, - {0x26, 'L', NULL, FALSE}, - {0x27, 0xba, NULL, FALSE}, - {0x28, 0xde, NULL, FALSE}, - {0x29, 0xc0, NULL, FALSE}, - {0x2b, 0xdc, NULL, FALSE}, - {0x2c, 'Z', NULL, FALSE}, - {0x2d, 'X', NULL, FALSE}, - {0x2e, 'C', NULL, FALSE}, - {0x2f, 'V', NULL, FALSE}, - {0x30, 'B', NULL, FALSE}, - {0x31, 'N', NULL, FALSE}, - {0x32, 'M', NULL, FALSE}, - {0x33, 0xbc, NULL, FALSE}, - {0x34, 0xbe, NULL, FALSE}, - {0x35, 0xbf, NULL, FALSE}, - {0x53, 0x6e, NULL, FALSE}, - {0x56, 0xe2, NULL, FALSE}, - {0x73, 0xc1, NULL, FALSE}, - {0x7e, 0xc2, NULL, FALSE}, - {0xe010, 0xb1, "Speedracer: Previous Track", FALSE}, - {0xe019, 0xb0, "Speedracer: Next Track", FALSE}, - {0xe01d, 0xa3, "RControl", FALSE}, - {0xe020, 0xad, "Speedracer: Volume Mute", FALSE}, - {0xe021, 0xb7, "Speedracer: Launch App 2", FALSE}, - {0xe022, 0xb3, "Speedracer: Media Play/Pause", FALSE}, - {0xe024, 0xb2, "Speedracer: Media Stop", FALSE}, - {0xe02e, 0xae, "Speedracer: Volume Up", FALSE}, - {0xe030, 0xaf, "Speedracer: Volume Down", FALSE}, - {0xe032, 0xac, "Speedracer: Browser Home", FALSE}, - {0xe035, 0x6f, "Numpad Divide", FALSE}, - {0xe037, 0x2c, "Snapshot", FALSE}, - {0xe038, 0xa5, "RMenu", FALSE}, - {0xe047, 0x24, "Home", FALSE}, - {0xe048, 0x26, "Up", FALSE}, - {0xe049, 0x21, "Prior", FALSE}, - {0xe04b, 0x25, "Left", FALSE}, - {0xe04d, 0x27, "Right", FALSE}, - {0xe04f, 0x23, "End", FALSE}, - {0xe050, 0x28, "Down", FALSE}, - {0xe051, 0x22, "Next", FALSE}, - {0xe052, 0x2d, "Insert", FALSE}, - {0xe053, 0x2e, "Delete", FALSE}, - {0xe05b, 0x5b, "Left Win", FALSE}, - {0xe05c, 0x5c, "Right Win", FALSE}, - {0xe05d, 0x5d, "Application", FALSE}, - {0xe05e, 0xff, "Power", FALSE}, - {0xe05f, 0x5f, "Speedracer: Sleep", FALSE}, - {0xe060, 0xff, "BAD SCANCODE", FALSE}, - {0xe061, 0xff, "BAD SCANCODE", FALSE}, - {0xe065, 0xaa, "Speedracer: Browser Search", FALSE}, - {0xe066, 0xab, "Speedracer: Browser Favorites", FALSE}, - {0xe067, 0xa8, "Speedracer: Browser Refresh", FALSE}, - {0xe068, 0xa9, "Speedracer: Browser Stop", FALSE}, - {0xe069, 0xa7, "Speedracer: Browser Foward", FALSE}, - {0xe06a, 0xa6, "Speedracer: Browser Back", FALSE}, - {0xe06b, 0xb6, "Speedracer: Launch App 1", FALSE}, - {0xe06c, 0xb4, "Speedracer: Launch Mail", FALSE}, - {0xe06d, 0xb5, "Speedracer: Launch Media Selector", FALSE}, - {0x53, 0x6e, NULL, FALSE}, - {0x0e, 0x08, NULL, FALSE}, - {0x01, 0x1b, NULL, FALSE}, - {0xe01c, 0x0d, "Numpad Enter", FALSE}, - {0x1c, 0x0d, NULL, FALSE}, - {0x39, 0x20, NULL, FALSE}, - {0xe046, 0x03, "Break (Ctrl + Pause)", FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE}, - {0xFFFF, 0x00, NULL, FALSE} -}; - -VKNAME VKName[] = -{ - {0x08, "BACK"}, - {0x03, "CANCEL"}, - {0x1b, "ESCAPE"}, - {0x0d, "RETURN"}, - {0x20, "SPACE"}, - {0x6e, "DECIMAL"}, - {0xba, "OEM_1"}, - {0xbb, "OEM_PLUS"}, - {0xbc, "OEM_COMMA"}, - {0xbd, "OEM_MINUS"}, - {0xbe, "OEM_PERIOD"}, - {0xbf, "OEM_2"}, - {0xc0, "OEM_3"}, - {0xdb, "OEM_4"}, - {0xdc, "OEM_5"}, - {0xdd, "OEM_6"}, - {0xde, "OEM_7"}, - {0xdf, "OEM_8"}, - {0xe2, "OEM_102"}, - {0xc1, "ABNT_C1"}, - {0xc2, "ABNT_C2"}, - {0x10, "SHIFT"}, - {0xa0, "LSHIFT"}, - {0xa1, "RSHIFT"}, - {0x12, "MENU"}, - {0xa4, "LMENU"}, - {0xa5, "RMENU"}, - {0x11, "CONTROL"}, - {0xa2, "LCONTROL"}, - {0xa3, "RCONTROL"}, - {0x6c, "SEPARATOR"}, - {0xe4, "ICO_00"}, - {0x2e, "DELETE"}, - {0x2d, "INSERT"}, - {0xe5, "GROUPSHIFT"}, - {0xe6, "RGROUPSHIFT"} -}; - -#define CHAR_NORMAL_KEY 0 -#define CHAR_DEAD_KEY 1 -#define CHAR_OTHER_KEY 2 -#define CHAR_INVALID_KEY 3 -#define CHAR_LIGATURE_KEY 4 /* FUNCTIONS ******************************************************************/ @@ -1081,10 +871,10 @@ } /* Skip what's left */ - return SkipLines(); -} - -VOID + return KeyWord; +} + +ULONG DoParsing(VOID) { ULONG KeyWords[KEYWORD_COUNT]; @@ -1119,8 +909,7 @@ printf("The '%s' keyword appeared multiple times.\n", KeyWordList[KeyWord]); } - - + /* Now parse this keyword */ switch (KeyWord) { @@ -1257,6 +1046,21 @@ default: break; } - } + } + + /* We are done */ + fclose(gfpInput); + + /* Now enter the output phase */ + return DoOutput(StateCount, + ShiftStates, + DescriptionData, + LanguageData, + AttributeData, + DeadKeyData, + LigatureData, + KeyNameData, + KeyNameExtData, + KeyNameDeadData); } /* EOF */

1 0

[sginsberg] 43958: - Finish the work around for the Pentium cmpxchg8b lock errata: We detected the errata and allocated the 7 first IDT entries on a write protected page, but the final piece of the work around, detecting the write fault ti the Invalid Opcode handler, was missing. Implemented this in the page fault handler to detect and dispatch the write fault to the Invalid Opcode handler. - Fix the "fix" of un-protecting the 7 IDT entries on P5 in HAL's BIOS call code when setting the custom I
by sginsberg＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: sginsberg Date: Wed Nov 4 22:57:32 2009 New Revision: 43958 URL: http://svn.reactos.org/svn/reactos?rev=43958&view=rev Log: - Finish the work around for the Pentium cmpxchg8b lock errata: We detected the errata and allocated the 7 first IDT entries on a write protected page, but the final piece of the work around, detecting the write fault ti the Invalid Opcode handler, was missing. Implemented this in the page fault handler to detect and dispatch the write fault to the Invalid Opcode handler. - Fix the "fix" of un-protecting the 7 IDT entries on P5 in HAL's BIOS call code when setting the custom Invalid Opcode handler. The IDT was unprotected but the write protection wasn't reapplied after the BIOS call, breaking the work around. Other: - KdDebuggerEnabled is a BOOLEAN, so don't do a dword compare in KeUpdateSystemTime. - Use better comment for the hack where we always allow page faults to be handled, even if they the fault occured with interrupts disabled. Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/ntoskrnl/ke/i386/systimer.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Wed Nov 4 22:57:32 2009 @@ -109,7 +109,11 @@ ULONG Handler; PHARDWARE_PTE IdtPte; - /* On i586, the first 7 entries of IDT are write-protected, unprotect them. */ // Nasty hto hack + /* + * On P5, the first 7 entries of the IDT are write protected to work around + * the cmpxchg8b lock errata. Unprotect them here so we can set our custom + * invalid op-code handler. + */ if (KeGetCurrentPrcb()->CpuType == 5) { IdtPte = GetPteAddress(((PKIPCR)KeGetPcr())->IDT); @@ -160,6 +164,8 @@ NTAPI HalpRestoreTrapHandlers(VOID) { + PHARDWARE_PTE IdtPte; + /* We're back, restore the handlers we over-wrote */ ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = (USHORT)((HalpGpfHandler >> 16) & 0xFFFF); @@ -167,6 +173,16 @@ ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = (USHORT)((HalpBopHandler >> 16) & 0xFFFF); ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)HalpBopHandler; + + /* On P5, restore the write protection for the first 7 IDT entries */ + if (KeGetCurrentPrcb()->CpuType == 5) + { + IdtPte = GetPteAddress(((PKIPCR)KeGetPcr())->IDT); + IdtPte->Write = 0; + + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); + } } VOID @@ -197,7 +213,7 @@ Pte = GetPteAddress((PVOID)i); Pte->Valid = 0; Pte->Write = 0; - //Pte->Owner = 0; // Missing this? + Pte->Owner = 0; Pte->PageFrameNumber = 0; } Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Wed Nov 4 22:57:32 2009 @@ -49,7 +49,7 @@ /* Enable warm reboot */ ((PUSHORT)ZeroPageMapping)[0x239] = 0x1234; - /* Lock CMOS Access */ + /* Lock CMOS Access (and disable interrupts) */ HalpAcquireSystemHardwareSpinLock(); /* Setup control register B */ Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Wed Nov 4 22:57:32 2009 @@ -114,7 +114,7 @@ /* Check if the debugger is enabled */ cmp byte ptr __KdDebuggerEnabled, 0 - je ResetDpcTime + jz ResetDpcTime /* Breakpoint */ call _DbgBreakPoint@0 @@ -338,7 +338,7 @@ DebugCheck: /* Check if the debugger is enabled */ - cmp dword ptr __KdDebuggerEnabled, 0 + cmp byte ptr __KdDebuggerEnabled, 0 jnz DebuggerEnabled /* Check if this was a full tick */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Wed Nov 4 22:57:32 2009 @@ -947,6 +947,7 @@ /* Enter V86 Trap */ V86_TRAP_PROLOG kit6_a, kit6_v +VdmOpCodeFault: /* Not yet supported (Invalid OPCODE from V86) */ UNHANDLED_PATH @@ -957,6 +958,7 @@ /* Enter trap */ TRAP_PROLOG kit6_a, kit6_t +DispatchLockErrata: /* Check if this happened in kernel mode */ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK jz KmodeOpcode @@ -1949,14 +1951,21 @@ NoFixUp: mov edi, cr2 - /* REACTOS Mm Hack of Doom */ + /* Check if this processor has the cmpxchg8b lock errata */ + cmp byte ptr _KiI386PentiumLockErrataPresent, 0 + jnz HandleLockErrata + +NotLockErrata: + /* HACK: Handle page faults with interrupts disabled */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK je HandlePf /* Enable interrupts and check if we got here with interrupts disabled */ sti - /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - jz IllegalState */ +#ifdef HACK_ABOVE_FIXED + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK + jz IllegalState +#endif HandlePf: /* Send trap frame and check if this is kernel-mode or usermode */ @@ -2075,6 +2084,33 @@ /* FIXME: NOT SUPPORTED */ UNHANDLED_PATH + +HandleLockErrata: + + /* Fail if this isn't a write fault */ + test word ptr [ebp+KTRAP_FRAME_ERROR_CODE], 0x4 + jnz NotLockErrata + + /* Also make sure the page fault is for IDT entry 6 */ + mov eax, PCR[KPCR_IDT] + add eax, 0x30 + cmp eax, edi + jne NotLockErrata + + /* + * This is a write fault to the Invalid Opcode handler entry. + * We assume this is the lock errata and not a real write fault. + */ + + /* Clear the error code */ + and dword ptr [ebp+KTRAP_FRAME_ERROR_CODE], 0 + + /* Check if this happened in V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz VdmOpCodeFault + + /* Dispatch this to the invalid opcode handler */ + jmp DispatchLockErrata .endfunc .func KiTrap0F

1 0

[tkreuzer] 43957: Fix rbuild file
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 22:34:46 2009 New Revision: 43957 URL: http://svn.reactos.org/svn/reactos?rev=43957&view=rev Log: Fix rbuild file Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Nov 4 22:34:46 2009 @@ -42,7 +42,6 @@ <file>crt0_c.c</file> <file>crtexe.c</file> <file>dllargv.c</file> - <file>ucrtexe.c</file> </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll"> <define name="_CRTBLD" /> @@ -52,13 +51,11 @@ <file>crt0_w.c</file> <file>crtexe.c</file> <file>dllargv.c</file> - <file>ucrtexe.c</file> </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> <file>crtdll.c</file> <file>dllargv.c</file> - <file>udllargc.c</file> </module> </group>

1 0

[tkreuzer] 43956: Sync mingw lib to version 4.4.1-1a
by tkreuzer＠svn.reactos.org 04 Nov '09

04 Nov '09

Author: tkreuzer Date: Wed Nov 4 22:22:53 2009 New Revision: 43956 URL: http://svn.reactos.org/svn/reactos?rev=43956&view=rev Log: Sync mingw lib to version 4.4.1-1a Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c (with props) Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -189,5 +189,15 @@ #define _CRT_UNUSED(x) (void)x #endif +#define __MINGW_USE_UNDERSCORE_PREFIX 1 + +#if __MINGW_USE_UNDERSCORE_PREFIX == 0 +#define __MINGW_IMP_SYMBOL(sym) _imp_##sym +#define __MINGW_USYMBOL(sym) sym +#else +#define __MINGW_IMP_SYMBOL(sym) _imp__##sym +#define __MINGW_USYMBOL(sym) _##sym +#endif + #endif /* !_INC_MINGW */ Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -22,7 +22,7 @@ typedef int (__cdecl *_PIFV)(void); typedef void (__cdecl *_PVFI)(int); -#if defined (SPECIAL_CRTEXE) && defined (_DLL) +#if defined (SPECIAL_CRTEXE) && (defined (_DLL) || defined (__GNUC__)) extern int _commode; #else _CRTIMP extern int _commode; @@ -31,12 +31,6 @@ #define __IOINFO_TM_ANSI 0 #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 - -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4214) -#pragma warning(disable:4820) -#endif typedef struct { intptr_t osfhnd; @@ -48,10 +42,6 @@ char unicode : 1; char pipech2[2]; } ioinfo; - -#ifdef _MSC_VER -#pragma warning(pop) -#endif #define IOINFO_ARRAY_ELTS (1 << 5) @@ -69,13 +59,13 @@ #define _tm_unicode_safe(i) (_pioinfo_safe(i)->unicode) #ifndef __badioinfo - extern ioinfo ** _imp____badioinfo[]; -#define __badioinfo (*_imp____badioinfo) + extern ioinfo ** __MINGW_IMP_SYMBOL(__badioinfo)[]; +#define __badioinfo (* __MINGW_IMP_SYMBOL(__badioinfo)) #endif #ifndef __pioinfo - extern ioinfo ** _imp____pioinfo[]; -#define __pioinfo (*_imp____pioinfo) + extern ioinfo ** __MINGW_IMP_SYMBOL(__pioinfo)[]; +#define __pioinfo (* __MINGW_IMP_SYMBOL(__pioinfo)) #endif #define _NO_CONSOLE_FILENO (intptr_t)-2 @@ -107,24 +97,24 @@ extern int _newmode; #ifndef __winitenv -extern wchar_t ***_imp____winitenv; -#define __winitenv (*_imp____winitenv) +extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); +#define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) #endif #ifndef __initenv -extern char ***_imp____initenv; -#define __initenv (*_imp____initenv) +extern char *** __MINGW_IMP_SYMBOL(__initenv); +#define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif #ifndef _acmdln -extern char **_imp___acmdln; -#define _acmdln (*_imp___acmdln) +extern char ** __MINGW_IMP_SYMBOL(_acmdln); +#define _acmdln (* __MINGW_IMP_SYMBOL(_acmdln)) /* _CRTIMP extern char *_acmdln; */ #endif #ifndef _wcmdln -extern char **_imp___wcmdln; -#define _wcmdln (*_imp___wcmdln) +extern char ** __MINGW_IMP_SYMBOL(_wcmdln); +#define _wcmdln (* __MINGW_IMP_SYMBOL(_wcmdln)) /* __CRTIMP extern wchar_t *_wcmdln; */ #endif @@ -169,7 +159,7 @@ #include <errno.h> void * __cdecl _encode_pointer(void *); - void * __cdecl _encoded_null(void); + void * __cdecl _encoded_null(); void * __cdecl _decode_pointer(void *); BOOL __cdecl _ValidateImageBase (PBYTE pImageBase); Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -30,11 +30,6 @@ #endif #endif -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4214) -#endif - typedef struct _FTIME { unsigned short twosecs : 5; @@ -51,10 +46,6 @@ unsigned short year : 7; } FDATE; -#ifdef _MSC_VER -#pragma warning(pop) -#endif - typedef FDATE *PFDATE; #endif Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -10,7 +10,7 @@ #define _ATTRIBUTES shared #endif -#if defined(_MSC_VER) +#if 0 /* Reference list of existing section for msvcrt. */ #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) @@ -55,14 +55,6 @@ #pragma section(".rtc$IZZ",long,read) #pragma section(".rtc$TAA",long,read) #pragma section(".rtc$TZZ",long,read) -#pragma section(".tls",long,read,write) -#pragma section(".tls$ZZZ",long,read,write) #endif -#if defined(_MSC_VER) -#define _CRTALLOC(x) __declspec(allocate(x)) -#elif defined(__GNUC__) #define _CRTALLOC(x) __attribute__ ((section (x) )) -#else -#error -#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -4,17 +4,9 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ +void _fpreset (void); + void _fpreset (void) -{ -#ifdef __GNUC__ - __asm__ ("fninit" ); -#else - __asm fninit; -#endif -} + { __asm__ ("fninit" ) ;} -#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); -#else -void fpreset(void) { _fpreset(); } -#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -4,12 +4,14 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -extern void (*_imp___fpreset)(void) ; +#include <_mingw.h> + +extern void (* __MINGW_IMP_SYMBOL(_fpreset))(void); +void _fpreset (void); + void _fpreset (void) -{ (*_imp___fpreset)(); } +{ + (* __MINGW_IMP_SYMBOL(_fpreset))(); +} -#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); -#else -void fpreset(void) { _fpreset(); } -#endif Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,17 @@ +/* + * CRT_glob.c + * This file has no copyright is assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * Include this object file to set _dowildcard to a state that will turn on + * command line globbing by default. (wildcard.o which goes into libmingw32.a + * has a default state of off.) + * + * To use this object include the object file in your link command: + * gcc -o foo.exe foo.o CRT_glob.o + * + */ + +int _dowildcard = -1; + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -25,10 +25,11 @@ _PVFV *__onexitend; extern _CRTIMP _onexit_t __dllonexit (_onexit_t, _PVFV**, _PVFV**); -extern _onexit_t (__cdecl *_imp___onexit) (_onexit_t func); +extern _onexit_t (__cdecl * __MINGW_IMP_SYMBOL(_onexit)) (_onexit_t func); -#if 0 /* Choose a different name to prevent name conflicts. The CRT one works fine. */ +_onexit_t __cdecl mingw_onexit(_onexit_t func); + _onexit_t __cdecl mingw_onexit(_onexit_t func) { _PVFV *onexitbegin; @@ -38,7 +39,7 @@ onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); if (onexitbegin == (_PVFV *) -1) - return (*_imp___onexit) (func); + return (* __MINGW_IMP_SYMBOL(_onexit)) (func); _lock (_EXIT_LOCK1); onexitbegin = (_PVFV *) _decode_pointer (__onexitbegin); onexitend = (_PVFV *) _decode_pointer (__onexitend); @@ -56,4 +57,3 @@ { return (mingw_onexit((_onexit_t)func) == NULL) ? -1 : 0; } -#endif Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,10 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#define SPECIAL_CRTEXE + +#include <fcntl.h> +#include <stdlib.h> Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -6,7 +6,15 @@ #include <windows.h> -int main (int flags, char **cmdline, char **inst) +extern HINSTANCE __mingw_winmain_hInstance; +extern LPSTR __mingw_winmain_lpCmdLine; +extern DWORD __mingw_winmain_nShowCmd; + +/*ARGSUSED*/ +int main (int flags __attribute__ ((__unused__)), + char **cmdline __attribute__ ((__unused__)), + char **inst __attribute__ ((__unused__))) { - return (int) WinMain ((HINSTANCE) inst, NULL, (LPSTR) cmdline,(DWORD) flags); + return (int) WinMain (__mingw_winmain_hInstance, NULL, + __mingw_winmain_lpCmdLine, __mingw_winmain_nShowCmd); } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -3,14 +3,23 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ - #include <windows.h> -extern void __main(void); - +/* Do the UNICODE prototyping of WinMain. Be aware that in winbase.h WinMain is a macro + defined to wWinMain. */ int WINAPI wWinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPWSTR lpCmdLine,int nShowCmd); -int wmain (int flags, wchar_t **cmdline, wchar_t **inst) +extern HINSTANCE __mingw_winmain_hInstance; +extern LPWSTR __mingw_winmain_lpCmdLine; +extern DWORD __mingw_winmain_nShowCmd; + +int wmain (int, wchar_t **, wchar_t **); + +/*ARGSUSED*/ +int wmain (int flags __attribute__ ((__unused__)), + wchar_t **cmdline __attribute__ ((__unused__)), + wchar_t **inst __attribute__ ((__unused__))) { - return (int) wWinMain ((HINSTANCE) inst, NULL, (LPWSTR) cmdline,(DWORD) flags); + return (int) wWinMain (__mingw_winmain_hInstance, NULL, + __mingw_winmain_lpCmdLine, __mingw_winmain_nShowCmd); } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,177 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <windows.h> +#include <excpt.h> +#include <string.h> +#include <stdlib.h> +#include <malloc.h> +#include <memory.h> +#include <signal.h> +#include <stdio.h> + +#if defined (_WIN64) && defined (__ia64__) +#error FIXME: Unsupported __ImageBase implementation. +#else +#define __ImageBase _image_base__ +/* This symbol is defined by the linker. */ +extern IMAGE_DOS_HEADER __ImageBase; +#endif + +#pragma pack(push,1) +typedef struct _UNWIND_INFO { + BYTE VersionAndFlags; + BYTE PrologSize; + BYTE CountOfUnwindCodes; + BYTE FrameRegisterAndOffset; + ULONG AddressOfExceptionHandler; +} UNWIND_INFO,*PUNWIND_INFO; +#pragma pack(pop) + +PIMAGE_SECTION_HEADER _FindPESectionByName (const char *); +PIMAGE_SECTION_HEADER _FindPESectionExec (size_t); +PBYTE _GetPEImageBase (void); + +int __mingw_init_ehandler (void); + +#ifdef _WIN64 +EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +#define MAX_PDATA_ENTRIES 32 +static RUNTIME_FUNCTION emu_pdata[MAX_PDATA_ENTRIES]; +static UNWIND_INFO emu_xdata[MAX_PDATA_ENTRIES]; + +int +__mingw_init_ehandler (void) +{ + static int was_here = 0; + size_t e = 0; + PIMAGE_SECTION_HEADER pSec; + PBYTE _ImageBase = _GetPEImageBase (); + + if (was_here || !_ImageBase) + return was_here; + was_here = 1; + if (_FindPESectionByName (".pdata") != NULL) + return 1; + + /* Allocate # of e tables and entries. */ + memset (emu_pdata, 0, sizeof (RUNTIME_FUNCTION) * MAX_PDATA_ENTRIES); + memset (emu_xdata, 0, sizeof (UNWIND_INFO) * MAX_PDATA_ENTRIES); + + e = 0; + /* Fill tables and entries. */ + while (e < MAX_PDATA_ENTRIES && (pSec = _FindPESectionExec (e)) != NULL) + { + emu_xdata[e].VersionAndFlags = 9; /* UNW_FLAG_EHANDLER | UNW_VERSION */ + emu_xdata[e].AddressOfExceptionHandler = + (DWORD)(size_t) ((LPBYTE)__mingw_SEH_error_handler - _ImageBase); + emu_pdata[e].BeginAddress = pSec->VirtualAddress; + emu_pdata[e].EndAddress = pSec->VirtualAddress + pSec->Misc.VirtualSize; + emu_pdata[e].UnwindData = + (DWORD)(size_t)((LPBYTE)&emu_xdata[e] - _ImageBase); + ++e; + } +#ifdef _DEBUG_CRT + if (!e || e > MAX_PDATA_ENTRIES) + abort (); +#endif + /* RtlAddFunctionTable. */ + if (e != 0) + RtlAddFunctionTable (emu_pdata, e, (DWORD64)_ImageBase); + return 1; +} + +extern void _fpreset (void); + +EXCEPTION_DISPOSITION +__mingw_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord, + void *EstablisherFrame __attribute__ ((unused)), + struct _CONTEXT* ContextRecord __attribute__ ((unused)), + void *DispatcherContext __attribute__ ((unused))) +{ + EXCEPTION_DISPOSITION action = EXCEPTION_CONTINUE_SEARCH; + void (*old_handler) (int); + int reset_fpu = 0; + + switch (ExceptionRecord->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + /* test if the user has set SIGSEGV */ + old_handler = signal (SIGSEGV, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGSEGV, SIG_IGN); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGSEGV); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: + /* test if the user has set SIGILL */ + old_handler = signal (SIGILL, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGILL, SIG_IGN); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGILL); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_OVERFLOW: + case EXCEPTION_FLT_UNDERFLOW: + case EXCEPTION_FLT_INEXACT_RESULT: + reset_fpu = 1; + /* fall through. */ + + case EXCEPTION_INT_DIVIDE_BY_ZERO: + /* test if the user has set SIGFPE */ + old_handler = signal (SIGFPE, SIG_DFL); + if (old_handler == SIG_IGN) + { + signal (SIGFPE, SIG_IGN); + if (reset_fpu) + _fpreset (); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGFPE); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_INVALID_HANDLE: + /*case EXCEPTION_POSSIBLE_DEADLOCK: */ + action = EXCEPTION_CONTINUE_EXECUTION; + break; + default: + break; + } + return action; +} + +#endif Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -110,10 +110,9 @@ } if (! nested) { - InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - } - if (__dyn_tls_init_callback != NULL && - _IsNonwritableInCurrentImage ((PBYTE) &__dyn_tls_init_callback)) + (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); + } + if (__dyn_tls_init_callback != NULL) { __dyn_tls_init_callback (hDllHandle, DLL_THREAD_ATTACH, lpreserved); } @@ -143,7 +142,7 @@ __onexitbegin = __onexitend = (_PVFV *) NULL; } __native_startup_state = __uninitialized; - InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); + (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); } } return TRUE; @@ -151,13 +150,19 @@ static BOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID); +BOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID); +int __mingw_init_ehandler (void); + BOOL WINAPI -DllMainCRTStartup(HANDLE hDllHandle,DWORD dwReason,LPVOID lpreserved) +DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { mingw_app_type = 0; if (dwReason == DLL_PROCESS_ATTACH) { __security_init_cookie (); +#ifdef _WIN64 + __mingw_init_ehandler (); +#endif } return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved); } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -20,16 +20,15 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> -#include <intrin.h> #ifndef __winitenv -extern wchar_t ***_imp____winitenv; -#define __winitenv (*_imp____winitenv) +extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); +#define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv)) #endif #ifndef __initenv -extern char ***_imp____initenv; -#define __initenv (*_imp____initenv) +extern char *** __MINGW_IMP_SYMBOL(__initenv); +#define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif /* Hack, for bug in ld. Will be removed soon. */ @@ -43,20 +42,16 @@ __declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); -extern int *_imp___fmode; -extern int *_imp___commode; +extern int * __MINGW_IMP_SYMBOL(_fmode); +extern int * __MINGW_IMP_SYMBOL(_commode); #undef _fmode extern int _fmode; -extern int *_imp___commode; -#define _commode (*_imp___commode) +extern int * __MINGW_IMP_SYMBOL(_commode); +#define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; -#if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; -#else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; -#endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -73,6 +68,10 @@ extern _PVFV *__onexitend; extern int mingw_app_type; + +HINSTANCE __mingw_winmain_hInstance; +_TCHAR *__mingw_winmain_lpCmdLine; +DWORD __mingw_winmain_nShowCmd; static int argc; #ifdef WPRFLAG @@ -89,10 +88,10 @@ static int managedapp; static int has_cctor = 0; static _startupinfo startinfo; +static LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler = NULL; extern void _pei386_runtime_relocator (void); static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); -//static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); #else @@ -101,7 +100,7 @@ static int __cdecl pre_c_init (void); static void __cdecl pre_cpp_init (void); - +static void __cdecl __mingw_prepare_except_for_msvcr80_and_higher (void); _CRTALLOC(".CRT$XIAA") _PIFV mingw_pcinit = pre_c_init; _CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; @@ -115,8 +114,8 @@ __set_app_type (_CONSOLE_APP); __onexitbegin = __onexitend = (_PVFV *) _encode_pointer ((_PVFV *)(-1)); - *_imp___fmode = _fmode; - *_imp___commode = _commode; + * __MINGW_IMP_SYMBOL(_fmode) = _fmode; + * __MINGW_IMP_SYMBOL(_commode) = _commode; #ifdef WPRFLAG _wsetargv(); @@ -152,6 +151,8 @@ static int __tmainCRTStartup (void); +int WinMainCRTStartup (void); + int WinMainCRTStartup (void) { mingw_app_type = 1; @@ -159,6 +160,12 @@ return __tmainCRTStartup (); } +int mainCRTStartup (void); + +#ifdef _WIN64 +int __mingw_init_ehandler (void); +#endif + int mainCRTStartup (void) { mingw_app_type = 0; @@ -166,7 +173,7 @@ return __tmainCRTStartup (); } - +static __declspec(noinline) int __tmainCRTStartup (void) { @@ -174,7 +181,7 @@ STARTUPINFO StartupInfo; BOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - + if (mingw_app_type) GetStartupInfo (&StartupInfo); { @@ -211,18 +218,17 @@ _ASSERTE(__native_startup_state == __initialized); if (! nested) (VOID)InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - - if (__dyn_tls_init_callback != NULL && _IsNonwritableInCurrentImage ((PBYTE) &__dyn_tls_init_callback)) + + if (__dyn_tls_init_callback != NULL) __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL); - + _pei386_runtime_relocator (); - -#if defined(__i386__) || defined(_M_IX86) - __writefsdword(0, 0xffffffff); -#endif - //AddVectoredExceptionHandler (0, (PVECTORED_EXCEPTION_HANDLER)__mingw_vex); - SetUnhandledExceptionFilter (_gnu_exception_handler); - + __mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler); +#ifdef _WIN64 + __mingw_init_ehandler (); +#endif + __mingw_prepare_except_for_msvcr80_and_higher (); + _fpreset (); if (mingw_app_type) @@ -239,7 +245,7 @@ #ifdef _MBCS if (_ismbblead (*lpszCommandLine)) { - if (lpszCommandLine) + if (*lpszCommandLine) lpszCommandLine++; } #endif @@ -248,21 +254,11 @@ while (*lpszCommandLine && (*lpszCommandLine <= SPACECHAR)) lpszCommandLine++; -#ifdef WPRFLAG - /* C++ initialization. - gcc inserts this call automatically for a function called main, but not for wmain. */ - __main (); - mainret = wmain ( - (int) (StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? StartupInfo.wShowWindow : SW_SHOWDEFAULT), - (wchar_t **) lpszCommandLine, (wchar_t **) (HINSTANCE) &__ImageBase); -#else - mainret = main ( - (int) (StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? StartupInfo.wShowWindow : SW_SHOWDEFAULT), - (char **) lpszCommandLine, (char **) (HINSTANCE) &__ImageBase); -#endif + __mingw_winmain_hInstance = (HINSTANCE) &__ImageBase; + __mingw_winmain_lpCmdLine = lpszCommandLine; + __mingw_winmain_nShowCmd = StartupInfo.dwFlags & STARTF_USESHOWWINDOW ? + StartupInfo.wShowWindow : SW_SHOWDEFAULT; } - else - { duplicate_ppstrings (argc, &argv); #ifdef WPRFLAG __winitenv = envp; @@ -274,7 +270,6 @@ __initenv = envp; mainret = main (argc, argv, envp); #endif - } if (!managedapp) exit (mainret); @@ -328,7 +323,7 @@ } static long CALLBACK -_gnu_exception_handler (EXCEPTION_POINTERS * exception_data) +_gnu_exception_handler (EXCEPTION_POINTERS *exception_data) { void (*old_handler) (int); long action = EXCEPTION_CONTINUE_SEARCH; @@ -399,42 +394,26 @@ action = EXCEPTION_CONTINUE_EXECUTION; } break; - +#ifdef _WIN64 + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_INVALID_HANDLE: + /*case EXCEPTION_POSSIBLE_DEADLOCK: */ + action = EXCEPTION_CONTINUE_EXECUTION; + break; +#endif default: break; } + + if (action == EXCEPTION_CONTINUE_SEARCH && __mingw_oldexcpt_handler) + action = (*__mingw_oldexcpt_handler)(exception_data); return action; } -#if 0 -static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data) -{ - /* TODO this is not chainablem, therefore need rewrite. Disabled the ill code. */ - #if 0 - #ifdef _WIN64 - __asm__ __volatile__ ( - "movq %gs:0,%rax" "\n\t" - "orq %rax,%rax\n\t" - "jz l1\n\t" - "jmp *8(%rax)\n\r" - "l1:\n\t" - "nop\n"); -#else - __asm__ __volatile__ ( - "movl %fs:0,%eax" "\n\t" - "orl %eax,%eax\n\t" - "jz l1\n\t" - "jmp *4(%eax)\n\r" - "l1:\n\t" - "nop\n"); -#endif -#endif - return _gnu_exception_handler(exception_data); -} -#endif - -#ifdef WPRFLAG - +#ifdef WPRFLAG static size_t wbytelen(const wchar_t *p) { size_t ret = 1; @@ -465,7 +444,7 @@ char **avl; int i; char **n = (char **) malloc (sizeof (char *) * (ac + 1)); - + avl=*av; for (i=0; i < ac; i++) { @@ -477,3 +456,35 @@ *av = n; } #endif + +static void +__mingw_invalidParameterHandler (const wchar_t *expression __attribute__ ((__unused__)), + const wchar_t *function __attribute__ ((__unused__)), + const wchar_t *file __attribute__ ((__unused__)), + unsigned int line __attribute__ ((__unused__)), + uintptr_t pReserved __attribute__ ((__unused__))) +{ +#ifdef __MINGW_SHOW_INVALID_PARAMETER_EXCEPTION + wprintf(L"Invalid parameter detected in function %s. File: %s Line: %d\n", function, file, line); + wprintf(L"Expression: %s\n", expression); +#endif +} + +static void __cdecl +__mingw_prepare_except_for_msvcr80_and_higher (void) +{ + _invalid_parameter_handler (*fIPH)(_invalid_parameter_handler) = NULL; + HMODULE hmsv = GetModuleHandleA ("msvcr80.dll"); + if(!hmsv) + hmsv = GetModuleHandleA ("msvcr70.dll"); + if (!hmsv) + hmsv = GetModuleHandleA ("msvcrt.dll"); + if (!hmsv) + hmsv = LoadLibraryA ("msvcrt.dll"); + if (!hmsv) + return; + fIPH = (_invalid_parameter_handler (*)(_invalid_parameter_handler)) + GetProcAddress (hmsv, "_set_invalid_parameter_handler"); + if (fIPH) + (*fIPH)(__mingw_invalidParameterHandler); +} Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,25 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#ifdef CRTDLL +#undef CRTDLL +#endif + +#include <internal.h> + +extern int _dowildcard; + +#ifdef WPRFLAG +int __CRTDECL +__wsetargv (void) +#else +int __CRTDECL +__setargv (void) +#endif +{ + _dowildcard = 1; + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -8,7 +8,11 @@ #define _DECL_DLLMAIN #include <process.h> -BOOL WINAPI DllEntryPoint(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) +BOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); + +BOOL WINAPI DllEntryPoint (HANDLE hDllHandle __attribute__ ((__unused__)), + DWORD dwReason __attribute__ ((__unused__)), + LPVOID lpreserved __attribute__ ((__unused__))) { return TRUE; } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -2,7 +2,9 @@ #define _DECL_DLLMAIN #include <process.h> -BOOL WINAPI DllMain(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) +BOOL WINAPI DllMain (HANDLE hDllHandle __attribute__ ((__unused__)), + DWORD dwReason __attribute__ ((__unused__)), + LPVOID lpreserved __attribute__ ((__unused__))) { return TRUE; } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,146 @@ +/* + * mthr_stub.c + * + * Implement Mingw-w64 thread-support. + * + * This file is used by if gcc is built with --enable-threads=win32. + * + * Based on version created by Mumit Khan <khan(a)nanotech.wisc.edu> + * + */ + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> +#include <stdlib.h> + +BOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); +int ___w64_mingwthr_remove_key_dtor (DWORD key); +int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); + +/* To protect the thread/key association data structure modifications. */ +static CRITICAL_SECTION __mingwthr_cs; +static volatile int __mingwthr_cs_init = 0; + +typedef struct __mingwthr_key __mingwthr_key_t; + +/* The list of threads active with key/dtor pairs. */ +struct __mingwthr_key { + DWORD key; + void (*dtor)(void *); + __mingwthr_key_t volatile *next; +}; + + +static __mingwthr_key_t volatile *key_dtor_list; + +int +___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)) +{ + __mingwthr_key_t *new_key; + + if (__mingwthr_cs_init == 0) + return 0; + new_key = (__mingwthr_key_t *) calloc (1, sizeof (__mingwthr_key_t)); + if (new_key == NULL) + return -1; + + new_key->key = key; + new_key->dtor = dtor; + + EnterCriticalSection (&__mingwthr_cs); + + new_key->next = key_dtor_list; + key_dtor_list = new_key; + + LeaveCriticalSection (&__mingwthr_cs); + return 0; +} + +int +___w64_mingwthr_remove_key_dtor (DWORD key) +{ + __mingwthr_key_t volatile *prev_key; + __mingwthr_key_t volatile *cur_key; + + if (__mingwthr_cs_init == 0) + return 0; + + EnterCriticalSection (&__mingwthr_cs); + + prev_key = NULL; + cur_key = key_dtor_list; + + while (cur_key != NULL) + { + if ( cur_key->key == key) + { + if (prev_key == NULL) + key_dtor_list = cur_key->next; + else + prev_key->next = cur_key->next; + + free ((void*)cur_key); + break; + } + prev_key = cur_key; + cur_key = cur_key->next; + } + + LeaveCriticalSection (&__mingwthr_cs); + return 0; +} + +static void +__mingwthr_run_key_dtors (void) +{ + __mingwthr_key_t volatile *keyp; + + if (__mingwthr_cs_init == 0) + return; + EnterCriticalSection (&__mingwthr_cs); + + for (keyp = key_dtor_list; keyp; ) + { + LPVOID value = TlsGetValue (keyp->key); + if (GetLastError () == ERROR_SUCCESS) + { + if (value) + (*keyp->dtor) (value); + } + keyp = keyp->next; + } + + LeaveCriticalSection (&__mingwthr_cs); +} + +BOOL +__mingw_TLScallback (HANDLE hDllHandle __attribute__ ((__unused__)), + DWORD reason, + LPVOID reserved __attribute__ ((__unused__))) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + if (__mingwthr_cs_init == 0) + InitializeCriticalSection (&__mingwthr_cs); + __mingwthr_cs_init = 1; + break; + case DLL_PROCESS_DETACH: + __mingwthr_run_key_dtors(); + if (__mingwthr_cs_init == 1) + { + __mingwthr_cs_init = 0; + DeleteCriticalSection (&__mingwthr_cs); + } + break; + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: + __mingwthr_run_key_dtors(); + break; + } + return TRUE; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -13,10 +13,15 @@ extern func_ptr __DTOR_LIST__[]; static HMODULE hMsvcrt = NULL; +static int free_Msvcrt = 0; typedef void __cdecl flongjmp(jmp_buf _Buf,int _Value); flongjmp *fctMsvcrtLongJmp = NULL; + +void __do_global_dtors (void); +void __do_global_ctors (void); +void __main (void); void __do_global_dtors (void) @@ -28,8 +33,9 @@ (*(p)) (); p++; } - if (hMsvcrt) + if (free_Msvcrt && hMsvcrt) { + free_Msvcrt = 0; FreeLibrary (hMsvcrt); hMsvcrt = NULL; } @@ -42,7 +48,15 @@ unsigned long i; if (!hMsvcrt) { - hMsvcrt = LoadLibrary ("msvcrt.dll"); + hMsvcrt = GetModuleHandleA ("msvcr80.dll"); + if (!hMsvcrt) + hMsvcrt = GetModuleHandleA ("msvcr70.dll"); + if (!hMsvcrt) + hMsvcrt = GetModuleHandleA ("msvcrt.dll"); + if (!hMsvcrt) { + hMsvcrt = LoadLibraryA ("msvcrt.dll"); + free_Msvcrt = 1; + } fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -43,6 +43,8 @@ DECLSPEC_SELECTANY UINT_PTR __security_cookie = DEFAULT_SECURITY_COOKIE; DECLSPEC_SELECTANY UINT_PTR __security_cookie_complement = ~(DEFAULT_SECURITY_COOKIE); +void __cdecl __security_init_cookie (void); + void __cdecl __security_init_cookie (void) { @@ -86,6 +88,8 @@ __security_cookie_complement = ~cookie; } +__declspec(noreturn) void __cdecl __report_gsfailure (ULONGLONG); + __declspec(noreturn) void __cdecl __report_gsfailure (ULONGLONG StackCookie) { @@ -108,22 +112,12 @@ else #endif { -#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; -#endif -#else -#ifdef _WIN64 - GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); - GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); -#else - GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); - GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); -#endif #endif } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -8,21 +8,28 @@ <library>kernel32</library> <file>_newmode.c</file> <file>atonexit.c</file> + <file>binmode.c</file> <file>charmax.c</file> <file>cinitexe.c</file> <file>CRT_fp10.c</file> <file>CRT_fp8.c</file> + <file>CRT_glob.c</file> + <file>crt_handler.c</file> <file>dllentry.c</file> + <file>dummy_mingwthrd.c</file> <file>gccmain.c</file> - <file>getopt.c</file> +  <file>gs_support.c</file> <file>merr.c</file> +  <file>mingw_helpers.c</file> + <file>mingwthrd_nomt.c</file> <file>natstart.c</file> <file>pesect.c</file> <file>pseudo-reloc.c</file> <file>pseudo-reloc-list.c</file> <file>tlssup.c</file> + <file>txtmode.c</file> <file>wildcard.c</file> <file>xncommod.c</file> <file>xthdloc.c</file> @@ -35,6 +42,7 @@ <file>crt0_c.c</file> <file>crtexe.c</file> <file>dllargv.c</file> + <file>ucrtexe.c</file> </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll"> <define name="_CRTBLD" /> @@ -44,11 +52,13 @@ <file>crt0_w.c</file> <file>crtexe.c</file> <file>dllargv.c</file> + <file>ucrtexe.c</file> </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> <include base="ReactOS">include/reactos/mingw-w64</include> <file>crtdll.c</file> <file>dllargv.c</file> + <file>udllargc.c</file> </module> </group> Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,16 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <_mingw.h> +#include "../revstamp.h" + +const char *__mingw_get_crt_info (void) +{ + return "MinGW-W64 Runtime " __MINGW64_VERSION_STR " (" + __MINGW64_VERSION_STATE " - " + "rev. " __MINGW_W64_REV ") " __MINGW_W64_REV_STAMP; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,30 @@ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> +#include <stdlib.h> + +/* We support TLS cleanup code in any case. If shared version of libgcc is used _CRT_MT has value 1, otherwise + we do tls cleanup in runtime and _CRT_MT has value 2. */ +int _CRT_MT = 2; + +int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *)); +int __mingwthr_remove_key_dtor (DWORD key); + +extern int ___w64_mingwthr_remove_key_dtor (DWORD key); +extern int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); + +int +__mingwthr_remove_key_dtor (DWORD key) +{ + return ___w64_mingwthr_remove_key_dtor (key); +} + +int +__mingwthr_key_dtor (DWORD key, void (*dtor)(void *)) +{ + if (dtor) + return ___w64_mingwthr_add_key_dtor (key, dtor); + + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -5,6 +5,7 @@ */ #include <windows.h> +#include <string.h> #if defined (_WIN64) && defined (__ia64__) #error FIXME: Unsupported __ImageBase implementation. @@ -14,6 +15,8 @@ /* This symbol is defined by the linker. */ extern IMAGE_DOS_HEADER __ImageBase; #endif + +BOOL _ValidateImageBase (PBYTE); BOOL _ValidateImageBase (PBYTE pImageBase) @@ -33,6 +36,8 @@ return FALSE; return TRUE; } + +PIMAGE_SECTION_HEADER _FindPESection (PBYTE, DWORD_PTR); PIMAGE_SECTION_HEADER _FindPESection (PBYTE pImageBase, DWORD_PTR rva) @@ -54,6 +59,80 @@ return NULL; } +PIMAGE_SECTION_HEADER _FindPESectionByName (const char *); + +PIMAGE_SECTION_HEADER +_FindPESectionByName (const char *pName) +{ + PBYTE pImageBase; + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_SECTION_HEADER pSection; + unsigned int iSection; + + /* Long names aren't supported. */ + if (strlen (pName) > IMAGE_SIZEOF_SHORT_NAME) + return NULL; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + for (iSection = 0, pSection = IMAGE_FIRST_SECTION (pNTHeader); + iSection < pNTHeader->FileHeader.NumberOfSections; + ++iSection,++pSection) + { + if (!strncmp ((char *) &pSection->Name[0], pName, IMAGE_SIZEOF_SHORT_NAME)) + return pSection; + } + return NULL; +} + +PIMAGE_SECTION_HEADER _FindPESectionExec (size_t); + +PIMAGE_SECTION_HEADER +_FindPESectionExec (size_t eNo) +{ + PBYTE pImageBase; + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_SECTION_HEADER pSection; + unsigned int iSection; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + for (iSection = 0, pSection = IMAGE_FIRST_SECTION (pNTHeader); + iSection < pNTHeader->FileHeader.NumberOfSections; + ++iSection,++pSection) + { + if ((pSection->Characteristics & IMAGE_SCN_MEM_EXECUTE) != 0) + { + if (!eNo) + return pSection; + --eNo; + } + } + return NULL; +} + +PBYTE _GetPEImageBase (void); + +PBYTE +_GetPEImageBase (void) +{ + PBYTE pImageBase; + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + return pImageBase; +} + +BOOL _IsNonwritableInCurrentImage (PBYTE); + BOOL _IsNonwritableInCurrentImage (PBYTE pTarget) { Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -2,12 +2,17 @@ * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. + * + * Contributed by Egor Duda <deo(a)logos-m.ru> + * Modified by addition of runtime_pseudo_reloc version 2 + * by Kai Tietz <kai.tietz(a)onevision.com> */ #include <windows.h> #include <stdio.h> #include <stdlib.h> #include <memory.h> +#include <assert.h> extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; @@ -31,15 +36,14 @@ } runtime_pseudo_reloc_v2; static void -__write_memory (void *addr,const void *src,size_t len) +__write_memory (void *addr, const void *src, size_t len) { MEMORY_BASIC_INFORMATION b; DWORD oldprot; if (!len) return; - if (!VirtualQuery (addr, &b, sizeof(b))) - abort (); - // Protect + assert (VirtualQuery (addr, &b, sizeof(b))); + /* Temporarily allow write access to read-only protected memory. */ if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) VirtualProtect (b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, &oldprot); @@ -52,7 +56,7 @@ #define RP_VERSION_V2 1 static void -do_pseudo_reloc (void* start,void *end,void *base) +do_pseudo_reloc (void *start, void *end, void *base) { ptrdiff_t addr_imp, reldata; ptrdiff_t reloc_target = (ptrdiff_t) ((char *)end - (char*)start); @@ -81,8 +85,10 @@ /* Check if this is a known version. */ if (v2_hdr->version != RP_VERSION_V2) { +#ifdef DEBUG fprintf (stderr, "pseudo_relocation protocol version %d is unknown to this runtime.\n", (int) v2_hdr->version); +#endif return; } /* Walk over header. */ @@ -120,7 +126,9 @@ #endif default: reldata=0; +#ifdef DEBUG fprintf(stderr, "Unknown pseudo relocation bit size %d\n",(int) (r->flags & 0xff)); +#endif break; } reldata -= ((ptrdiff_t) base + r->sym); @@ -145,8 +153,10 @@ } } +void _pei386_runtime_relocator (void); + void -_pei386_runtime_relocator () +_pei386_runtime_relocator (void) { static int was_init = 0; if (was_init) Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -14,6 +14,8 @@ #include <malloc.h> #include <crtdbg.h> +extern BOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); + #define FUNCS_PER_NODE 30 typedef struct TlsDtorNode { @@ -24,20 +26,21 @@ ULONG _tls_index = 0; -_CRTALLOC(".tls") char _tls_start = 0; +/* TLS raw template data start and end. */ +_CRTALLOC(".tls$AAA") char _tls_start = 0; _CRTALLOC(".tls$ZZZ") char _tls_end = 0; _CRTALLOC(".CRT$XLA") PIMAGE_TLS_CALLBACK __xl_a = 0; _CRTALLOC(".CRT$XLZ") PIMAGE_TLS_CALLBACK __xl_z = 0; #ifdef _WIN64 -_CRTALLOC(".rdata$T") const IMAGE_TLS_DIRECTORY64 _tls_used = { - (ULONGLONG) &_tls_start, (ULONGLONG) &_tls_end, (ULONGLONG) &_tls_index, +_CRTALLOC(".tls") const IMAGE_TLS_DIRECTORY64 _tls_used = { + (ULONGLONG) &_tls_start+1, (ULONGLONG) &_tls_end, (ULONGLONG) &_tls_index, (ULONGLONG) (&__xl_a+1), (ULONG) 0, (ULONG) 0 }; #else -_CRTALLOC(".rdata$T") const IMAGE_TLS_DIRECTORY _tls_used = { - (ULONG)(ULONG_PTR) &_tls_start, (ULONG)(ULONG_PTR) &_tls_end, +_CRTALLOC(".tls") const IMAGE_TLS_DIRECTORY _tls_used = { + (ULONG)(ULONG_PTR) &_tls_start+1, (ULONG)(ULONG_PTR) &_tls_end, (ULONG)(ULONG_PTR) &_tls_index, (ULONG)(ULONG_PTR) (&__xl_a+1), (ULONG) 0, (ULONG) 0 }; @@ -47,38 +50,59 @@ #ifdef HAVE_ATTRIBUTE_THREAD #define __CRT_THREAD __declspec(thread) #else -#define __CRT_THREAD +#define __CRT_THREAD __thread #endif #endif +#define DISABLE_MS_TLS 1 + static _CRTALLOC(".CRT$XDA") _PVFV __xd_a = 0; static _CRTALLOC(".CRT$XDZ") _PVFV __xd_z = 0; + +#if !defined (DISABLE_MS_TLS) static __CRT_THREAD TlsDtorNode *dtor_list; static __CRT_THREAD TlsDtorNode dtor_list_head; +#endif + +extern int _CRT_MT; + +BOOL WINAPI __dyn_tls_init (HANDLE, DWORD, LPVOID); BOOL WINAPI __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { _PVFV *pfunc; + /* We don't let us trick here. */ + if (_CRT_MT != 2) + _CRT_MT = 2; + if (dwReason != DLL_THREAD_ATTACH) - return TRUE; + { + if (dwReason == DLL_PROCESS_ATTACH) + __mingw_TLScallback (hDllHandle, dwReason, lpreserved); + return TRUE; + } for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc) { if (*pfunc != NULL) (*pfunc)(); } - return TRUE; } const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback = (const PIMAGE_TLS_CALLBACK) __dyn_tls_init; _CRTALLOC(".CRT$XLC") PIMAGE_TLS_CALLBACK __xl_c = (PIMAGE_TLS_CALLBACK) __dyn_tls_init; +int __cdecl __tlregdtor (_PVFV); + int __cdecl __tlregdtor (_PVFV func) { + if (!func) + return 0; +#if !defined (DISABLE_MS_TLS) if (dtor_list == NULL) { dtor_list = &dtor_list_head; @@ -96,29 +120,42 @@ dtor_list->count = 0; } dtor_list->funcs[dtor_list->count++] = func; +#endif return 0; } static BOOL WINAPI __dyn_tls_dtor (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { +#if !defined (DISABLE_MS_TLS) TlsDtorNode *pnode, *pnext; int i; +#endif if (dwReason != DLL_THREAD_DETACH && dwReason != DLL_PROCESS_DETACH) return TRUE; - - for (pnode = dtor_list; pnode != NULL; pnode = pnext) + /* As TLS variables are detroyed already by DLL_THREAD_DETACH + call, we have to avoid access on the possible DLL_PROCESS_DETACH + call the already destroyed TLS vars. + TODO: The used local thread based variables have to be handled + manually, so that we can control their lifetime here. */ +#if !defined (DISABLE_MS_TLS) + if (dwReason != DLL_PROCESS_DETACH) { - for (i = pnode->count - 1; i >= 0; --i) - { - if (pnode->funcs[i] != NULL) - (*pnode->funcs[i])(); - } - pnext = pnode->next; - if (pnext != NULL) - free ((void *) pnode); + for (pnode = dtor_list; pnode != NULL; pnode = pnext) + { + for (i = pnode->count - 1; i >= 0; --i) + { + if (pnode->funcs[i] != NULL) + (*pnode->funcs[i])(); + } + pnext = pnode->next; + if (pnext != NULL) + free ((void *) pnode); + } } +#endif + __mingw_TLScallback (hDllHandle, dwReason, lpreserved); return TRUE; } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -1,0 +1,13 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <fcntl.h> + +/* Set default file mode to text */ + +/* Is this correct? Default value of _fmode in msvcrt.dll is 0. */ + +int _fmode = _O_TEXT; Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c [iso-8859-1] Wed Nov 4 22:22:53 2009 @@ -4,4 +4,16 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ +/* _dowildcard is an int that controls the globbing of the command line. + * If _dowildcard is non-zero, the command line will be globbed: *.* + * will be expanded to be all files in the startup directory. + * In the mingw-w64 library the _dowildcard variable is defined as being + * 0, therefore command line globbing is DISABLED by default. To turn it + * on and to leave wildcard command line processing MS's globbing code, + * include a line in one of your source modules defining _dowildcard and + * setting it to -1, like so: + * int _dowildcard = -1; + */ + int _dowildcard = 0; +

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