Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 56931: [WIN32SS/USER] - Handle transferring buffer to user mode in WH_CALLWNDPROC(RET) hooks if lParam is a pointer. This fixes the gallium3d opengl ICD, so newest VMWare opengl Driver sh...
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 22:59:41 2012 New Revision: 56931 URL: http://svn.reactos.org/svn/reactos?rev=56931&view=rev Log: [WIN32SS/USER] - Handle transferring buffer to user mode in WH_CALLWNDPROC(RET) hooks if lParam is a pointer. This fixes the gallium3d opengl ICD, so newest VMWare opengl Driver should now work. Please TEST! Modified: trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -13,6 +13,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserCallback); + /* CALLBACK MEMORY MANAGEMENT ************************************************/ typedef struct _INT_CALLBACK_HEADER @@ -115,8 +116,8 @@ /* Calls ClientLoadLibrary in user32 */ HMODULE -co_IntClientLoadLibrary(PUNICODE_STRING pstrLibName, - PUNICODE_STRING pstrInitFunc, +co_IntClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, BOOL Unload, BOOL ApiHook) { @@ -139,7 +140,7 @@ } if(pstrInitFunc) { - pInitFuncBuffer = ArgumentLength; + pInitFuncBuffer = ArgumentLength; ArgumentLength += pstrInitFunc->Length + sizeof(WCHAR); } @@ -443,6 +444,7 @@ PWND pWnd; PMSG pMsg = NULL; BOOL Hit = FALSE; + UINT lParamSize = 0; ASSERT(Proc); @@ -509,11 +511,21 @@ ArgumentLength += sizeof(MOUSEHOOKSTRUCT); break; case WH_CALLWNDPROC: + { + CWPSTRUCT* pCWP = (CWPSTRUCT*) lParam; ArgumentLength += sizeof(CWPSTRUCT); - break; + lParamSize = lParamMemorySize(pCWP->message, pCWP->wParam, pCWP->lParam); + ArgumentLength += lParamSize; + break; + } case WH_CALLWNDPROCRET: + { + CWPRETSTRUCT* pCWPR = (CWPRETSTRUCT*) lParam; ArgumentLength += sizeof(CWPRETSTRUCT); - break; + lParamSize = lParamMemorySize(pCWPR->message, pCWPR->wParam, pCWPR->lParam); + ArgumentLength += lParamSize; + break; + } case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: @@ -583,12 +595,25 @@ Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; case WH_CALLWNDPROC: + /* For CALLWNDPROC and CALLWNDPROCRET, we must be wary of the fact that + * lParam could be a pointer to a buffer. This buffer must be exported + * to user space too */ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + if(lParamSize) + { + RtlCopyMemory(Extra + sizeof(CWPSTRUCT), (PVOID)((CWPSTRUCT*)lParam)->lParam, lParamSize); + ((CWPSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + } break; case WH_CALLWNDPROCRET: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPRETSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + if(lParamSize) + { + RtlCopyMemory(Extra + sizeof(CWPRETSTRUCT), (PVOID)((CWPRETSTRUCT*)lParam)->lParam, lParamSize); + ((CWPRETSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + } break; case WH_MSGFILTER: case WH_SYSMSGFILTER: Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -223,6 +223,13 @@ return Size; } +UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PMSGMEMORY MsgMemory = FindMsgMemory(Msg); + if(MsgMemory == NULL) return 0; + return MsgMemorySize(MsgMemory, wParam, lParam); +} + static NTSTATUS PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL NonPagedPoolNeeded) { @@ -2143,7 +2150,7 @@ } else { - ERR("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); + ERR("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); Ret = FALSE; } UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -296,4 +296,6 @@ BOOL ForceChange); DWORD APIENTRY IntGetQueueStatus(DWORD); + +UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -216,7 +216,7 @@ ClientInfo = GetWin32ClientInfo(); if (!ClientInfo->phkCurrent) return 0; - + pHook = DesktopPtrToUser(ClientInfo->phkCurrent); if (!pHook->phkNext) return 0; // Nothing to do.... @@ -240,7 +240,7 @@ NtUserMessageCall( pCWP->hwnd, pCWP->message, pCWP->wParam, - pCWP->lParam, + pCWP->lParam, (ULONG_PTR)&lResult, FNID_CALLWNDPROC, phkNext->Ansi); @@ -254,7 +254,7 @@ NtUserMessageCall( pCWPR->hwnd, pCWPR->message, pCWPR->wParam, - pCWPR->lParam, + pCWPR->lParam, (ULONG_PTR)&lResult, FNID_CALLWNDPROCRET, phkNext->Ansi); @@ -427,8 +427,8 @@ return IntSetWindowsHook(idHook, lpfn, hMod, dwThreadId, FALSE); } -HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName, - PUNICODE_STRING pstrInitFunc, +HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, BOOL Unload, BOOL ApiHook) { @@ -440,7 +440,7 @@ TRACE("ClientLoadLibrary: pid: %d, strLibraryName: %S, " "strInitFuncName: %S, Unload: %d, ApiHook:%d\n", - GetCurrentProcessId(), + GetCurrentProcessId(), pstrLibName->Buffer, pstrInitFunc->Buffer, Unload, @@ -467,7 +467,7 @@ /* Initialize the user api hook */ ASSERT(pstrInitFunc->Buffer); - /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, + /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, pstrInitFunc, TRUE); @@ -539,7 +539,7 @@ } /* Call the implementation of the callback */ - Result = ClientLoadLibrary(&Argument->strLibraryName, + Result = ClientLoadLibrary(&Argument->strLibraryName, &Argument->strInitFuncName, Argument->Unload, Argument->ApiHook); @@ -558,9 +558,9 @@ MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; MSG *pcMsg, *pMsg; PMOUSEHOOKSTRUCT pMHook; - CWPSTRUCT CWP, *pCWP; - CWPRETSTRUCT CWPR, *pCWPR; - PRECTL prl; + CWPSTRUCT *pCWP; + CWPRETSTRUCT *pCWPR; + PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; WPARAM wParam = 0; LPARAM lParam = 0; @@ -631,7 +631,7 @@ switch(Common->Code) { case HCBT_CREATEWND: - CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; + CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; CbtCreatewndExtra->Cs.x = CbtCreatewndw.lpcs->x; CbtCreatewndExtra->Cs.y = CbtCreatewndw.lpcs->y; CbtCreatewndExtra->Cs.cx = CbtCreatewndw.lpcs->cx; @@ -666,14 +666,34 @@ break; case WH_CALLWNDPROC: // ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); - pCWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); - RtlCopyMemory(&CWP, pCWP, sizeof(CWPSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWP); + pCWP = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); + RtlCopyMemory(pCWP, (PCHAR) Common + Common->lParam, sizeof(CWPSTRUCT)); + /* If more memory is reserved, then lParam is a pointer. + * Size of the buffer is stocked in the lParam member, and its content + * is at the end of the argument buffer */ + if(ArgumentLength > (sizeof(CWPSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + { + RtlCopyMemory((PCHAR)pCWP + sizeof(CWPSTRUCT), + (PCHAR)Common + Common->lParam + sizeof(CWPSTRUCT), + pCWP->lParam); + pCWP->lParam = (LPARAM)((PCHAR)pCWP + sizeof(CWPSTRUCT)); + } + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + HeapFree(GetProcessHeap(), 0, pCWP); break; case WH_CALLWNDPROCRET: - pCWPR = (PCWPRETSTRUCT)((PCHAR) Common + Common->lParam); - RtlCopyMemory(&CWPR, pCWPR, sizeof(CWPRETSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWPR); + /* Almost the same as WH_CALLWNDPROC */ + pCWPR = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); + RtlCopyMemory(pCWPR, (PCHAR) Common + Common->lParam, sizeof(CWPRETSTRUCT)); + if(ArgumentLength > (sizeof(CWPRETSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + { + RtlCopyMemory((PCHAR)pCWPR + sizeof(CWPRETSTRUCT), + (PCHAR)Common + Common->lParam + sizeof(CWPRETSTRUCT), + pCWPR->lParam); + pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT)); + } + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + HeapFree(GetProcessHeap(), 0, pCWPR); break; case WH_MSGFILTER: /* All SEH support */ case WH_SYSMSGFILTER: @@ -698,7 +718,7 @@ case WH_KEYBOARD: case WH_SHELL: Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); - break; + break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ _SEH2_TRY {

1 0

[jgardou] 56930: [APITESTS/CRT] - Test errno value on failure
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 20:15:12 2012 New Revision: 56930 URL: http://svn.reactos.org/svn/reactos?rev=56930&view=rev Log: [APITESTS/CRT] - Test errno value on failure Modified: trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/_vsnwprintf.c Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Sat Jul 21 20:15:12 2012 @@ -7,6 +7,7 @@ #include <stdio.h> #include <wine/test.h> #include <tchar.h> +#include <errno.h> static void call_varargs(int expected_ret, LPCSTR formatString, ...) { @@ -26,4 +27,5 @@ call_varargs(11, "%u cookies", 100); /* Test NULL argument */ call_varargs(-1, NULL); + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); } Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Sat Jul 21 20:15:12 2012 @@ -7,6 +7,7 @@ #include <stdio.h> #include <wine/test.h> #include <tchar.h> +#include <errno.h> static void call_varargs(int expected_ret, LPCWSTR formatString, ...) { @@ -27,4 +28,7 @@ /* Test NULL argument */ call_varargs(-1, NULL); +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); +#endif } Modified: trunk/rostests/apitests/crt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Sat Jul 21 20:15:12 2012 @@ -41,6 +41,9 @@ #else EndSeh(STATUS_SUCCESS); #endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); +#endif /* This one is no better */ StartSeh() call_varargs(NULL, 0, -1, "%s it really work?", "does"); @@ -48,6 +51,9 @@ EndSeh(STATUS_ACCESS_VIOLATION); #else EndSeh(STATUS_SUCCESS); +#endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); #endif /* One more NULL checks */ StartSeh() @@ -57,4 +63,7 @@ #else EndSeh(STATUS_SUCCESS); #endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); +#endif } Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sat Jul 21 20:15:12 2012 @@ -41,6 +41,9 @@ #else EndSeh(STATUS_SUCCESS); #endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); +#endif /* This one is no better */ StartSeh() call_varargs(NULL, 0, -1, L"%s it really work?", L"does"); @@ -48,6 +51,9 @@ EndSeh(STATUS_ACCESS_VIOLATION); #else EndSeh(STATUS_SUCCESS); +#endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); #endif /* One more NULL checks */ StartSeh() @@ -57,4 +63,7 @@ #else EndSeh(STATUS_SUCCESS); #endif +#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ + ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); +#endif }

1 0

[jgardou] 56929: [OOPS] - Forgot some files
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 20:05:18 2012 New Revision: 56929 URL: http://svn.reactos.org/svn/reactos?rev=56929&view=rev Log: [OOPS] - Forgot some files Added: trunk/reactos/lib/sdk/crt/printf/_vscprintf.c (with props) trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c (with props) Added: trunk/reactos/lib/sdk/crt/printf/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vscprintf.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_vscprintf.c [iso-8859-1] Sat Jul 21 20:05:18 2012 @@ -1,0 +1,28 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_vscprintf.c + * PURPOSE: Implementation of _vscprintf + */ + +#include <stdio.h> +#include <stdarg.h> + +int _cdecl streamout(FILE *stream, const char *format, va_list argptr); + +int _vscprintf( + const char *format, + va_list argptr +) +{ + int ret; + FILE* nulfile = fopen("nul", "w"); + if(nulfile == NULL) + { + /* This should never happen... */ + return -1; + } + ret = streamout(nulfile, format, argptr); + fclose(nulfile); + return ret; +} Propchange: trunk/reactos/lib/sdk/crt/printf/_vscprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscwpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c [iso-8859-1] Sat Jul 21 20:05:18 2012 @@ -1,0 +1,37 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/_vscprintf.c + * PURPOSE: Implementation of _vscprintf + */ + +#include <stdio.h> +#include <stdarg.h> + +#ifdef _LIBCNT_ +#include <ntddk.h> +#endif + +int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); + +int _vscwprintf( + const wchar_t *format, + va_list argptr +) +{ + int ret; +#ifndef _LIBCNT_ + FILE* nulfile; + nulfile = fopen("nul", "w"); + if(nulfile == NULL) + { + /* This should never happen... */ + return -1; + } + ret = wstreamout(nulfile, format, argptr); + fclose(nulfile); +#else + ret = -1; +#endif + return ret; +} Propchange: trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 56928: [APITESTS/CRT] - Add more tests for _vsnprintf - Add tests for _vsnwprintf, _vscprintf, _vscwprintf
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 20:00:56 2012 New Revision: 56928 URL: http://svn.reactos.org/svn/reactos?rev=56928&view=rev Log: [APITESTS/CRT] - Add more tests for _vsnprintf - Add tests for _vsnwprintf, _vscprintf, _vscwprintf Added: trunk/rostests/apitests/crt/_vscprintf.c (with props) trunk/rostests/apitests/crt/_vscwprintf.c (with props) trunk/rostests/apitests/crt/_vsnwprintf.c (with props) Modified: trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Added: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c (added) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -1,0 +1,29 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for _vscprintf + */ + +#include <stdio.h> +#include <wine/test.h> +#include <tchar.h> + +static void call_varargs(int expected_ret, LPCSTR formatString, ...) +{ + va_list args; + int ret; + /* Test the basic functionality */ + va_start(args, formatString); + ret = _vscprintf(formatString, args); + ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); +} + +START_TEST(_vscprintf) +{ + /* Here you can mix wide and ANSI strings */ + call_varargs(12, "%S world!", L"hello"); + call_varargs(12, "%s world!", "hello"); + call_varargs(11, "%u cookies", 100); + /* Test NULL argument */ + call_varargs(-1, NULL); +} Propchange: trunk/rostests/apitests/crt/_vscprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c (added) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -1,0 +1,30 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for _vscprintf + */ + +#include <stdio.h> +#include <wine/test.h> +#include <tchar.h> + +static void call_varargs(int expected_ret, LPCWSTR formatString, ...) +{ + va_list args; + int ret; + /* Test the basic functionality */ + va_start(args, formatString); + ret = _vscwprintf(formatString, args); + ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); +} + +START_TEST(_vscwprintf) +{ + /* Lesson of the day: don't mix wide and ansi char */ + call_varargs(19, L"%s world!", "hello"); + call_varargs(12, L"%s world!", L"hello"); + call_varargs(17, L"Jack ate %u pies", 100); + + /* Test NULL argument */ + call_varargs(-1, NULL); +} Propchange: trunk/rostests/apitests/crt/_vscwprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -15,7 +15,7 @@ #define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { #define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) -void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) +static void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) { va_list args; int ret; @@ -29,8 +29,10 @@ { char buffer[255]; NTSTATUS ExceptionStatus; - /* Test basic functionality */ + /* Here you can mix wide and ANSI strings */ + call_varargs(buffer, 255, 12, "%S world!", L"hello"); call_varargs(buffer, 255, 12, "%s world!", "hello"); + call_varargs(buffer, 255, 11, "%u cookies", 100); /* This is how WINE implements _vcsprintf, and they are obviously wrong */ StartSeh() call_varargs(NULL, INT_MAX, -1, "%s it really work?", "does"); @@ -40,11 +42,19 @@ EndSeh(STATUS_SUCCESS); #endif /* This one is no better */ - StartSeh() + StartSeh() call_varargs(NULL, 0, -1, "%s it really work?", "does"); #if defined(TEST_CRTDLL) || defined(TEST_USER32) EndSeh(STATUS_ACCESS_VIOLATION); #else EndSeh(STATUS_SUCCESS); #endif + /* One more NULL checks */ + StartSeh() + call_varargs(buffer, 255, -1, NULL); +#if defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif } Added: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c (added) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -1,0 +1,60 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for _vsnprintf + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +static void call_varargs(wchar_t* buf, size_t buf_size, int expected_ret, LPCWSTR formatString, ...) +{ + va_list args; + int ret; + /* Test the basic functionality */ + va_start(args, formatString); + ret = _vsnwprintf(buf, 255, formatString, args); + ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); +} + +START_TEST(_vsnwprintf) +{ + wchar_t buffer[255]; + NTSTATUS ExceptionStatus; + /* Test basic functionality */ + call_varargs(buffer, 255, 19, L"%s world!", "hello"); + call_varargs(buffer, 255, 12, L"%s world!", L"hello"); + call_varargs(buffer, 255, 11, L"%u cookies", 100); + /* This is how WINE implements _vcsprintf, and they are obviously wrong */ + StartSeh() + call_varargs(NULL, INT_MAX, -1, L"%s it really work?", L"does"); +#if defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + /* This one is no better */ + StartSeh() + call_varargs(NULL, 0, -1, L"%s it really work?", L"does"); +#if defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + /* One more NULL checks */ + StartSeh() + call_varargs(buffer, 255, -1, NULL); +#if defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif +} Propchange: trunk/rostests/apitests/crt/_vsnwprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -315,7 +315,7 @@ # _unloaddll.c # _utime.c _vsnprintf.c -# _vsnwprintf.c + _vsnwprintf.c # _wcsdup.c # _wcsicmp.c # _wcsicoll.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -826,10 +826,10 @@ # _vprintf_p_l # _vprintf_s_l # _utime.c -# _vscprintf.c + _vscprintf.c # _vscprintf_l # _vscprintf_p_l -# _vscwprintf.c + _vscwprintf.c # _vscwprintf_l # _vscwprintf_p_l _vsnprintf.c @@ -838,7 +838,7 @@ # _vsnprintf_l.c # _vsnprintf_s.c # _vsnprintf_s_l.c -# _vsnwprintf.c + _vsnwprintf.c # _vsnwprintf_l.c # _vsnwprintf_s.c # _vsnwprintf_s_l.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -33,9 +33,9 @@ # _ui64tow.c # _ultoa.c # _ultow.c -# _vscwprintf.c + _vscwprintf.c _vsnprintf.c -# _vsnwprintf.c + _vsnwprintf.c # _wcsicmp.c # _wcslwr.c # _wcsnicmp.c Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Jul 21 20:00:56 2012 @@ -5,13 +5,22 @@ #define STANDALONE #include "wine/test.h" +#if defined(TEST_MSVCRT) +extern void func__vscprintf(void); +extern void func__vscwprintf(void); +#endif +#if defined(TEST_NTDLL) +extern void func__vscwprintf(void); +#endif extern void func__vsnprintf(void); +extern void func__vsnwprintf(void); extern void func_sprintf(void); extern void func_strcpy(void); const struct test winetest_testlist[] = { { "_vsnprintf", func__vsnprintf }, + { "_vsnwprintf", func__vsnwprintf }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) @@ -22,7 +31,10 @@ #endif #if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) + { "_vscprintf", func__vscprintf }, + { "_vscwprintf", func__vscwprintf }, #elif defined(TEST_NTDLL) + { "_vscwprintf", func__vscwprintf }, #elif defined(TEST_CRTDLL) #endif { 0, 0 }

1 0

[jgardou] 56927: [CRT] - Implement _vsc(w)printf for msvcrt
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 19:59:47 2012 New Revision: 56927 URL: http://svn.reactos.org/svn/reactos?rev=56927&view=rev Log: [CRT] - Implement _vsc(w)printf for msvcrt Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jul 21 19:59:47 2012 @@ -1343,7 +1343,7 @@ @ cdecl _ui64tow(double ptr long) @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) -;@ cdecl _vscwprintf +@ cdecl _vscwprintf(wstr ptr) @ cdecl _vsnprintf(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) @ cdecl _wcsicmp(wstr wstr) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Jul 21 19:59:47 2012 @@ -975,10 +975,10 @@ # stub _vprintf_p_l # stub _vprintf_s_l @ cdecl _utime(str ptr) -# @ cdecl _vscprintf(str ptr) +@ cdecl _vscprintf(str ptr) # stub _vscprintf_l # stub _vscprintf_p_l -# @ cdecl _vscwprintf(wstr ptr) +@ cdecl _vscwprintf(wstr ptr) # stub _vscwprintf_l # stub _vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Jul 21 19:59:47 2012 @@ -136,6 +136,8 @@ printf/_snwprintf.c printf/_vcprintf.c printf/_vcwprintf.c + printf/_vscprintf.c + printf/_vscwprintf.c printf/_vsnprintf.c printf/_vsnwprintf.c printf/_vsprintf_p.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sat Jul 21 19:59:47 2012 @@ -13,6 +13,7 @@ printf/_snprintf.c printf/_snwprintf.c printf/_vcprintf.c + printf/_vscwprintf.c printf/_vsnprintf.c printf/_vsnwprintf.c printf/sprintf.c

1 0

[ion] 56926: [NTOSKRNL]: Add more support for session space, including mapping and unmapping views into it, as well as putting in the correct checks in the page fault handler for future work. [NTOS...
by ion＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: ion Date: Sat Jul 21 19:07:11 2012 New Revision: 56926 URL: http://svn.reactos.org/svn/reactos?rev=56926&view=rev Log: [NTOSKRNL]: Add more support for session space, including mapping and unmapping views into it, as well as putting in the correct checks in the page fault handler for future work. [NTOSKRNL]: Cleanup the page fault handler to help with debugging, fix a few bugs and missing perf counters. There's a lot of cut corners that need some love, will be slowly adding more asserts/sanity code to make sure things are working right. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Jul 21 19:07:11 2012 @@ -117,12 +117,6 @@ MmSessionSize - MmSessionImageSize - MM_ALLOCATION_GRANULARITY); - - /* Setup all starting addresses */ - DPRINT1("Session space: 0x%p\n", MmSessionSpace); - DPRINT1("Session Base: 0x%p, Session Image Size: 0x%lx, Session Image Start: 0x%p, Session ImageEnd: 0x%p\n", - MmSessionBase, MmSessionSize, MiSessionImageStart, MiSessionImageEnd); - DPRINT1("Session View start: 0x%p, Session View Size: 0x%lx\n", MiSessionViewStart, MmSessionViewSize); } VOID 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] Sat Jul 21 19:07:11 2012 @@ -1607,6 +1607,13 @@ IN PMMSESSION InputSession OPTIONAL ); +NTSTATUS +NTAPI +MiSessionCommitPageTables( + IN PVOID StartVa, + IN PVOID EndVa +); + ULONG NTAPI MiMakeProtectionMask( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Jul 21 19:07:11 2012 @@ -136,6 +136,11 @@ { PMMPDE PointerPde; NTSTATUS Status = STATUS_SUCCESS; + + if (MI_IS_SESSION_ADDRESS(Address)) + { + DPRINT1("Unexpected session fault: %p %p %p\n", Address, MmSessionBase, MiSessionSpaceEnd); + } /* No session support in ReactOS yet */ ASSERT(MI_IS_SESSION_ADDRESS(Address) == FALSE); @@ -874,95 +879,203 @@ PMMVAD Vad; PFN_NUMBER PageFrameIndex; ULONG Color; + BOOLEAN IsSessionAddress; + PMMPFN Pfn1; DPRINT("ARM3 FAULT AT: %p\n", Address); /* Check for page fault on high IRQL */ if (OldIrql > APC_LEVEL) { - // There are some special cases where this is okay, but not in ARM3 yet - DbgPrint("MM:***PAGE FAULT AT IRQL > 1 Va %p, IRQL %lx\n", - Address, - OldIrql); - ASSERT(OldIrql <= APC_LEVEL); - } - - /* Check for kernel fault address */ - if (Address >= MmSystemRangeStart) - { - /* Bail out, if the fault came from user mode */ - if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; - - /* PXEs and PPEs for kernel mode are mapped for everything we need */ -#if (_MI_PAGING_LEVELS >= 3) +#if (_MI_PAGING_LEVELS < 3) + /* Could be a page table for paged pool, which we'll allow */ + if (MI_IS_SYSTEM_PAGE_TABLE_ADDRESS(Address)) MiSynchronizeSystemPde((PMMPDE)PointerPte); + MiCheckPdeForPagedPool(Address); +#endif + /* Check if any of the top-level pages are invalid */ if ( #if (_MI_PAGING_LEVELS == 4) (PointerPxe->u.Hard.Valid == 0) || #endif - (PointerPpe->u.Hard.Valid == 0)) - { - /* The address is not from any pageable area! */ +#if (_MI_PAGING_LEVELS >= 3) + (PointerPpe->u.Hard.Valid == 0) || +#endif + (PointerPde->u.Hard.Valid == 0)) + { + /* This fault is not valid, printf out some debugging help */ + DbgPrint("MM:***PAGE FAULT AT IRQL > 1 Va %p, IRQL %lx\n", + Address, + OldIrql); + if (TrapInformation) + { + PKTRAP_FRAME TrapFrame = TrapInformation; + DbgPrint("MM:***EIP %p, EFL %p\n", TrapFrame->Eip, TrapFrame->EFlags); + DbgPrint("MM:***EAX %p, ECX %p EDX %p\n", TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); + DbgPrint("MM:***EBX %p, ESI %p EDI %p\n", TrapFrame->Ebx, TrapFrame->Esi, TrapFrame->Edi); + } + + /* Tell the trap handler to fail */ + return STATUS_IN_PAGE_ERROR | 0x10000000; + } + + /* Not yet implemented in ReactOS */ + ASSERT(MI_IS_PAGE_LARGE(PointerPde) == FALSE); + ASSERT(((StoreInstruction) && (PointerPte->u.Hard.CopyOnWrite)) == FALSE); + + /* Check if this was a write */ + if (StoreInstruction) + { + /* Was it to a read-only page? */ + Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); + if (!(PointerPte->u.Long & PTE_READWRITE) && + !(Pfn1->OriginalPte.u.Soft.Protection & MM_READWRITE)) + { + /* Crash with distinguished bugcheck code */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + PointerPte->u.Long, + (ULONG_PTR)TrapInformation, + 10); + } + } + + /* Nothing is actually wrong */ + DPRINT1("Fault at IRQL1 is ok\n"); + return STATUS_SUCCESS; + } + + /* Check for kernel fault address */ + if (Address >= MmSystemRangeStart) + { + /* Bail out, if the fault came from user mode */ + if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; + +#if (_MI_PAGING_LEVELS == 4) + /* AMD64 system, check if PXE is invalid */ + if (PointerPxe->u.Hard.Valid == 0) + { + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 7); + } +#endif +#if (_MI_PAGING_LEVELS == 4) + /* PAE/AMD64 system, check if PPE is invalid */ + if (PointerPpe->u.Hard.Valid == 0) + { + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 5); + } +#endif +#if (_MI_PAGING_LEVELS == 2) + if (MI_IS_SYSTEM_PAGE_TABLE_ADDRESS(Address)) MiSynchronizeSystemPde((PMMPDE)PointerPte); + MiCheckPdeForPagedPool(Address); +#endif + + /* Check if the PDE is invalid */ + if (PointerPde->u.Hard.Valid == 0) + { + /* PDE (still) not valid, kill the system */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, StoreInstruction, (ULONG_PTR)TrapInformation, 2); } -#endif - -#if (_MI_PAGING_LEVELS == 2) - /* Check if we have a situation that might need synchronization - of the PDE with the system page directory */ - if (MI_IS_SYSTEM_PAGE_TABLE_ADDRESS(Address)) - { - /* This could be a paged pool commit with an unsychronized PDE. - NOTE: This way it works on x86, verify for other architectures! */ - if (MiSynchronizeSystemPde((PMMPDE)PointerPte)) return STATUS_SUCCESS; - } -#endif - - /* Check if the PDE is invalid */ - if (PointerPde->u.Hard.Valid == 0) - { -#if (_MI_PAGING_LEVELS == 2) - /* Sync this PDE and check, if that made it valid */ - if (!MiSynchronizeSystemPde(PointerPde)) -#endif - { - /* PDE (still) not valid, kill the system */ - KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, - (ULONG_PTR)Address, - StoreInstruction, - (ULONG_PTR)TrapInformation, - 2); - } - } + + /* Not handling session faults yet */ + IsSessionAddress = MI_IS_SESSION_ADDRESS(Address); /* The PDE is valid, so read the PTE */ TempPte = *PointerPte; if (TempPte.u.Hard.Valid == 1) { - // - // Only two things can go wrong here: - // Executing NX page (we couldn't care less) - // Writing to a read-only page (the stuff ARM3 works with is write, - // so again, moot point). - // - - // - // Otherwise, the PDE was probably invalid, and all is good now - // - return STATUS_SUCCESS; + /* Check if this was system space or session space */ + if (!IsSessionAddress) + { + /* Check if the PTE is still valid under PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + TempPte = *PointerPte; + if (TempPte.u.Hard.Valid) + { + /* Check if this was a write */ + if (StoreInstruction) + { + /* Was it to a read-only page? */ + Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); + if (!(PointerPte->u.Long & PTE_READWRITE) && + !(Pfn1->OriginalPte.u.Soft.Protection & MM_READWRITE)) + { + /* Crash with distinguished bugcheck code */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + PointerPte->u.Long, + (ULONG_PTR)TrapInformation, + 11); + } + } + } + + /* Release PFN lock and return all good */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return STATUS_SUCCESS; + } + else + { + /* Not yet handled */ + ASSERT(FALSE); + } + } + + /* Check if this was a session PTE that needs to remap the session PDE */ + if (MI_IS_SESSION_PTE(Address)) + { + /* Not yet handled */ + ASSERT(FALSE); + } + + /* Check for a fault on the page table or hyperspace */ + if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) + { +#if (_MI_PAGING_LEVELS < 3) + /* Windows does this check but I don't understand why -- it's done above! */ + ASSERT(MiCheckPdeForPagedPool(Address) != STATUS_WAIT_1); +#endif + /* Handle this as a user mode fault */ + goto UserFault; } /* Get the current thread */ CurrentThread = PsGetCurrentThread(); - /* Check for a fault on the page table or hyperspace */ - if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) goto UserFault; - - /* Use the system working set */ - WorkingSet = &MmSystemCacheWs; - CurrentProcess = NULL; + /* What kind of address is this */ + if (!IsSessionAddress) + { + /* Use the system working set */ + WorkingSet = &MmSystemCacheWs; + CurrentProcess = NULL; + + /* Make sure we don't have a recursive working set lock */ + if ((CurrentThread->OwnsProcessWorkingSetExclusive) || + (CurrentThread->OwnsProcessWorkingSetShared) || + (CurrentThread->OwnsSystemWorkingSetExclusive) || + (CurrentThread->OwnsSystemWorkingSetShared) || + (CurrentThread->OwnsSessionWorkingSetExclusive) || + (CurrentThread->OwnsSessionWorkingSetShared)) + { + /* Fail */ + return STATUS_IN_PAGE_ERROR | 0x10000000; + } + } + else + { + /* Not yet handled */ + ASSERT(FALSE); + } /* Acquire the working set lock */ KeRaiseIrql(APC_LEVEL, &LockIrql); @@ -972,17 +1085,35 @@ TempPte = *PointerPte; if (TempPte.u.Hard.Valid == 1) { - // Only two things can go wrong here: - // Executing NX page (we couldn't care less) - // Writing to a read-only page (the stuff ARM3 works with is write, - // so again, moot point). - ASSERT(TempPte.u.Hard.Write == 1); + /* Check if this was a write */ + if (StoreInstruction) + { + /* Was it to a read-only page that is not copy on write? */ + Pfn1 = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); + if (!(TempPte.u.Long & PTE_READWRITE) && + !(Pfn1->OriginalPte.u.Soft.Protection & MM_READWRITE) && + !(TempPte.u.Hard.CopyOnWrite)) + { + /* Case not yet handled */ + ASSERT(!IsSessionAddress); + + /* Crash with distinguished bugcheck code */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 12); + } + } + + /* Case not yet handled */ + ASSERT(!IsSessionAddress); /* Release the working set */ MiUnlockWorkingSet(CurrentThread, WorkingSet); KeLowerIrql(LockIrql); - // Otherwise, the PDE was probably invalid, and all is good now + /* Otherwise, the PDE was probably invalid, and all is good now */ return STATUS_SUCCESS; } @@ -1007,6 +1138,9 @@ /* Get the prototype PTE! */ ProtoPte = MiProtoPteToPte(&TempPte); + + /* Case not yet handled */ + ASSERT(!IsSessionAddress); } else { @@ -1023,20 +1157,24 @@ (ULONG_PTR)TrapInformation, 1); } - - /* Check for demand page */ - if ((StoreInstruction) && !(TempPte.u.Hard.Valid)) - { - /* Get the protection code */ - if (!(TempPte.u.Soft.Protection & MM_READWRITE)) - { - /* Bugcheck the system! */ - KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, - (ULONG_PTR)Address, - TempPte.u.Long, - (ULONG_PTR)TrapInformation, - 14); - } + } + + /* Check for demand page */ + if ((StoreInstruction) && + !(ProtoPte) && + !(IsSessionAddress) && + !(TempPte.u.Hard.Valid)) + { + /* Get the protection code */ + ASSERT(TempPte.u.Soft.Transition == 0); + if (!(TempPte.u.Soft.Protection & MM_READWRITE)) + { + /* Bugcheck the system! */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 14); } } @@ -1067,10 +1205,6 @@ /* Lock the working set */ MiLockProcessWorkingSet(CurrentProcess, CurrentThread); - -#if (_MI_PAGING_LEVELS == 2) - ASSERT(PointerPde->u.Hard.LargePage == 0); -#endif #if (_MI_PAGING_LEVELS == 4) // Note to Timo: You should call MiCheckVirtualAddress and also check if it's zero pte @@ -1156,6 +1290,11 @@ ASSERT(KeAreAllApcsDisabled() == TRUE); ASSERT(PointerPde->u.Hard.Valid == 1); } + else + { + /* Not yet implemented in ReactOS */ + ASSERT(MI_IS_PAGE_LARGE(PointerPde) == FALSE); + } /* Now capture the PTE. Ignore virtual faults for now */ TempPte = *PointerPte; @@ -1175,141 +1314,125 @@ return STATUS_PAGE_FAULT_DEMAND_ZERO; } - /* Make sure it's not a prototype PTE */ - ASSERT(TempPte.u.Soft.Prototype == 0); - - /* Check if this address range belongs to a valid allocation (VAD) */ - ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); - if (ProtectionCode == MM_NOACCESS) - { + /* Check for zero PTE */ + if (TempPte.u.Long == 0) + { + /* Check if this address range belongs to a valid allocation (VAD) */ + ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); + if (ProtectionCode == MM_NOACCESS) + { #if (_MI_PAGING_LEVELS == 2) - /* Could be a page table for paged pool */ - MiCheckPdeForPagedPool(Address); -#endif - /* Has the code above changed anything -- is this now a valid PTE? */ - Status = (PointerPte->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; - - /* Either this was a bogus VA or we've fixed up a paged pool PDE */ - MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); - return Status; - } - - /* Check for non-demand zero PTE */ - if (TempPte.u.Long != 0) - { - /* This is a page fault */ - - /* FIXME: Run MiAccessCheck */ - - /* Dispatch the fault */ - Status = MiDispatchFault(StoreInstruction, - Address, - PointerPte, - NULL, - FALSE, - PsGetCurrentProcess(), - TrapInformation, - NULL); - - /* Return the status */ - ASSERT(NT_SUCCESS(Status)); - ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); - return Status; - } - - /* - * Check if this is a real user-mode address or actually a kernel-mode - * page table for a user mode address - */ - if (Address <= MM_HIGHEST_USER_ADDRESS) - { - /* Add an additional page table reference */ - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } - - /* No guard page support yet */ - ASSERT((ProtectionCode & MM_DECOMMIT) == 0); - - /* Did we get a prototype PTE back? */ - if (!ProtoPte) - { - /* Is this PTE actually part of the PDE-PTE self-mapping directory? */ - if (PointerPde == MiAddressToPde(PTE_BASE)) - { - /* Then it's really a demand-zero PDE (on behalf of user-mode) */ - MI_WRITE_INVALID_PTE(PointerPte, DemandZeroPde); - } - else - { - /* No, create a new PTE. First, write the protection */ - PointerPte->u.Soft.Protection = ProtectionCode; - } - - /* Lock the PFN database since we're going to grab a page */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Try to get a zero page */ - MI_SET_USAGE(MI_USAGE_PEB_TEB); - MI_SET_PROCESS2(CurrentProcess->ImageFileName); - Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); - PageFrameIndex = MiRemoveZeroPageSafe(Color); - if (!PageFrameIndex) - { - /* Grab a page out of there. Later we should grab a colored zero page */ - PageFrameIndex = MiRemoveAnyPage(Color); - ASSERT(PageFrameIndex); - - /* Release the lock since we need to do some zeroing */ + /* Could be a page table for paged pool */ + MiCheckPdeForPagedPool(Address); +#endif + /* Has the code above changed anything -- is this now a valid PTE? */ + Status = (PointerPte->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; + + /* Either this was a bogus VA or we've fixed up a paged pool PDE */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return Status; + } + + /* No guard page support yet */ + ASSERT((ProtectionCode & MM_DECOMMIT) == 0); + + /* + * Check if this is a real user-mode address or actually a kernel-mode + * page table for a user mode address + */ + if (Address <= MM_HIGHEST_USER_ADDRESS) + { + /* Add an additional page table reference */ + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } + + /* Did we get a prototype PTE back? */ + if (!ProtoPte) + { + /* Is this PTE actually part of the PDE-PTE self-mapping directory? */ + if (PointerPde == MiAddressToPde(PTE_BASE)) + { + /* Then it's really a demand-zero PDE (on behalf of user-mode) */ + MI_WRITE_INVALID_PTE(PointerPte, DemandZeroPde); + } + else + { + /* No, create a new PTE. First, write the protection */ + PointerPte->u.Soft.Protection = ProtectionCode; + } + + /* Lock the PFN database since we're going to grab a page */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Make sure we have enough pages */ + ASSERT(MmAvailablePages >= 32); + + /* Try to get a zero page */ + MI_SET_USAGE(MI_USAGE_PEB_TEB); + MI_SET_PROCESS2(CurrentProcess->ImageFileName); + Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); + PageFrameIndex = MiRemoveZeroPageSafe(Color); + if (!PageFrameIndex) + { + /* Grab a page out of there. Later we should grab a colored zero page */ + PageFrameIndex = MiRemoveAnyPage(Color); + ASSERT(PageFrameIndex); + + /* Release the lock since we need to do some zeroing */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Zero out the page, since it's for user-mode */ + MiZeroPfn(PageFrameIndex); + + /* Grab the lock again so we can initialize the PFN entry */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + + /* Initialize the PFN entry now */ + MiInitializePfn(PageFrameIndex, PointerPte, 1); + + /* And we're done with the lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* Zero out the page, since it's for user-mode */ - MiZeroPfn(PageFrameIndex); - - /* Grab the lock again so we can initialize the PFN entry */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - } - - /* Initialize the PFN entry now */ - MiInitializePfn(PageFrameIndex, PointerPte, 1); - - /* One more demand-zero fault */ - KeGetCurrentPrcb()->MmDemandZeroCount++; - - /* And we're done with the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - /* Fault on user PDE, or fault on user PTE? */ - if (PointerPte <= MiHighestUserPte) - { - /* User fault, build a user PTE */ - MI_MAKE_HARDWARE_PTE_USER(&TempPte, - PointerPte, - PointerPte->u.Soft.Protection, - PageFrameIndex); - } - else - { - /* This is a user-mode PDE, create a kernel PTE for it */ - MI_MAKE_HARDWARE_PTE(&TempPte, - PointerPte, - PointerPte->u.Soft.Protection, - PageFrameIndex); - } - - /* Write the dirty bit for writeable pages */ - if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); - - /* And now write down the PTE, making the address valid */ - MI_WRITE_VALID_PTE(PointerPte, TempPte); - ASSERT(MiGetPfnEntry(PageFrameIndex)->u1.Event == NULL); - - /* Demand zero */ - Status = STATUS_PAGE_FAULT_DEMAND_ZERO; - } - else - { + /* Increment the count of pages in the process */ + CurrentProcess->NumberOfPrivatePages++; + + /* One more demand-zero fault */ + InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); + + /* Fault on user PDE, or fault on user PTE? */ + if (PointerPte <= MiHighestUserPte) + { + /* User fault, build a user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameIndex); + } + else + { + /* This is a user-mode PDE, create a kernel PTE for it */ + MI_MAKE_HARDWARE_PTE(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameIndex); + } + + /* Write the dirty bit for writeable pages */ + if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); + + /* And now write down the PTE, making the address valid */ + MI_WRITE_VALID_PTE(PointerPte, TempPte); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + ASSERT(Pfn1->u1.Event == NULL); + + /* Demand zero */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_PAGE_FAULT_DEMAND_ZERO; + } + /* No guard page support yet */ ASSERT((ProtectionCode & MM_DECOMMIT) == 0); ASSERT(ProtectionCode != 0x100); @@ -1318,22 +1441,28 @@ TempPte = PrototypePte; TempPte.u.Soft.Protection = ProtectionCode; MI_WRITE_INVALID_PTE(PointerPte, TempPte); - - /* Handle the fault */ - Status = MiDispatchFault(StoreInstruction, - Address, - PointerPte, - ProtoPte, - FALSE, - CurrentProcess, - TrapInformation, - Vad); - ASSERT(Status == STATUS_PAGE_FAULT_TRANSITION); - ASSERT(PointerPte->u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.PageFrameNumber != 0); - } - - /* Release the working set */ + } + else + { + /* This path is not yet supported */ + ASSERT(FALSE); + } + + /* FIXME: Run MiAccessCheck */ + + /* Dispatch the fault */ + Status = MiDispatchFault(StoreInstruction, + Address, + PointerPte, + ProtoPte, + FALSE, + CurrentProcess, + TrapInformation, + Vad); + + /* Return the status */ + ASSERT(NT_SUCCESS(Status)); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return Status; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Jul 21 19:07:11 2012 @@ -243,7 +243,9 @@ ASSERT(AllocSize < PAGE_SIZE); /* Allocate and zero the view table */ - Session->SystemSpaceViewTable = ExAllocatePoolWithTag(NonPagedPool, + Session->SystemSpaceViewTable = ExAllocatePoolWithTag(Session == &MmSession ? + NonPagedPool : + PagedPool, AllocSize, TAG_MM); ASSERT(Session->SystemSpaceViewTable != NULL); @@ -264,9 +266,6 @@ PMMVIEW OldTable; PAGED_CODE(); - /* Only global mappings supported for now */ - ASSERT(Session == &MmSession); - /* Stay within 4GB */ ASSERT(Buckets < MI_SYSTEM_VIEW_BUCKET_SIZE); @@ -281,7 +280,10 @@ /* Save the old table and allocate a new one */ OldTable = Session->SystemSpaceViewTable; - Session->SystemSpaceViewTable = ExAllocatePoolWithTag(NonPagedPool, + Session->SystemSpaceViewTable = ExAllocatePoolWithTag(Session == + &MmSession ? + NonPagedPool : + PagedPool, HashSize * sizeof(MMVIEW), ' mM'); @@ -804,6 +806,111 @@ return Status; } + +NTSTATUS +NTAPI +MiSessionCommitPageTables(IN PVOID StartVa, + IN PVOID EndVa) +{ + KIRQL OldIrql; + ULONG Color, Index; + PMMPTE StartPde, EndPde; + MMPTE TempPte = ValidKernelPdeLocal; + PMMPFN Pfn1; + PFN_NUMBER PageCount = 0, ActualPages = 0, PageFrameNumber; + + /* Windows sanity checks */ + ASSERT(StartVa >= (PVOID)MmSessionBase); + ASSERT(EndVa < (PVOID)MiSessionSpaceEnd); + ASSERT(PAGE_ALIGN(EndVa) == EndVa); + + /* Get the start and end PDE, then loop each one */ + StartPde = MiAddressToPde(StartVa); + EndPde = MiAddressToPde((PVOID)((ULONG_PTR)EndVa - 1)); + Index = (ULONG_PTR)StartVa >> 22; + while (StartPde <= EndPde) + { + /* If we don't already have a page table for it, increment count */ + if (MmSessionSpace->PageTables[Index].u.Long == 0) PageCount++; + + /* Move to the next one */ + StartPde++; + Index++; + } + + /* If there's no page tables to create, bail out */ + if (PageCount == 0) return STATUS_SUCCESS; + + /* Reset the start PDE and index */ + StartPde = MiAddressToPde(StartVa); + Index = (ULONG_PTR)StartVa >> 22; + + /* Loop each PDE while holding the working set lock */ +// MiLockWorkingSet(PsGetCurrentThread(), +// &MmSessionSpace->GlobalVirtualAddress->Vm); + while (StartPde <= EndPde) + { + /* Check if we already have a page table */ + if (MmSessionSpace->PageTables[Index].u.Long == 0) + { + /* We don't, so the PDE shouldn't be ready yet */ + ASSERT(StartPde->u.Hard.Valid == 0); + + /* ReactOS check to avoid MiEnsureAvailablePageOrWait */ + ASSERT(MmAvailablePages >= 32); + + /* Acquire the PFN lock and grab a zero page */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Color = (++MmSessionSpace->Color) & MmSecondaryColorMask; + PageFrameNumber = MiRemoveZeroPage(Color); + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + MI_WRITE_VALID_PTE(StartPde, TempPte); + + /* Write the page table in session space structure */ + ASSERT(MmSessionSpace->PageTables[Index].u.Long == 0); + MmSessionSpace->PageTables[Index] = TempPte; + + /* Initialize the PFN */ + MiInitializePfnForOtherProcess(PageFrameNumber, + StartPde, + MmSessionSpace->SessionPageDirectoryIndex); + + /* And now release the lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Get the PFN entry and make sure there's no event for it */ + Pfn1 = MI_PFN_ELEMENT(PageFrameNumber); + ASSERT(Pfn1->u1.Event == NULL); + + /* Increment the number of pages */ + ActualPages++; + } + + /* Move to the next PDE */ + StartPde++; + Index++; + } + + /* Make sure we didn't do more pages than expected */ + ASSERT(ActualPages <= PageCount); + + /* Release the working set lock */ +// MiUnlockWorkingSet(PsGetCurrentThread(), +// &MmSessionSpace->GlobalVirtualAddress->Vm); + + + /* If we did at least one page... */ + if (ActualPages) + { + /* Update the performance counters! */ + InterlockedExchangeAddSizeT(&MmSessionSpace->NonPageablePages, ActualPages); + InterlockedExchangeAddSizeT(&MmSessionSpace->CommittedPages, ActualPages); + } + + /* Return status */ + return STATUS_SUCCESS; +} + NTSTATUS NTAPI MiMapViewInSystemSpace(IN PVOID Section, @@ -816,9 +923,6 @@ ULONG Buckets, SectionSize; NTSTATUS Status; PAGED_CODE(); - - /* Only global mappings for now */ - ASSERT(Session == &MmSession); /* Get the control area, check for any flags ARM3 doesn't yet support */ ControlArea = ((PSECTION)Section)->Segment->ControlArea; @@ -860,8 +964,21 @@ Base = MiInsertInSystemSpace(Session, Buckets, ControlArea); ASSERT(Base); - /* Create the PDEs needed for this mapping, and double-map them if needed */ - MiFillSystemPageDirectory(Base, Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE); + /* What's the underlying session? */ + if (Session == &MmSession) + { + /* Create the PDEs needed for this mapping, and double-map them if needed */ + MiFillSystemPageDirectory(Base, Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE); + Status = STATUS_SUCCESS; + } + else + { + /* Create the PDEs needed for this mapping */ + Status = MiSessionCommitPageTables(Base, + (PVOID)((ULONG_PTR)Base + + Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE)); + NT_ASSERT(NT_SUCCESS(Status)); + } /* Create the actual prototype PTEs for this mapping */ Status = MiAddMappedPtes(MiAddressToPte(Base), @@ -2213,6 +2330,7 @@ /* Use the system space API, but with the session view instead */ ASSERT(MmIsAddressValid(MmSessionSpace) == TRUE); + ASSERT(FALSE); return MiMapViewInSystemSpace(Section, &MmSessionSpace->Session, MappedBase,

1 0

[jgardou] 56925: [APITESTS] - Move _vsnprintf to crt tests, where it belongs, and make it pass for crtdll
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 17:15:08 2012 New Revision: 56925 URL: http://svn.reactos.org/svn/reactos?rev=56925&view=rev Log: [APITESTS] - Move _vsnprintf to crt tests, where it belongs, and make it pass for crtdll Added: trunk/rostests/apitests/crt/_vsnprintf.c - copied, changed from r56924, trunk/rostests/apitests/msvcrt/_vsnprintf.c Removed: trunk/rostests/apitests/msvcrt/_vsnprintf.c Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c trunk/rostests/apitests/msvcrt/CMakeLists.txt trunk/rostests/apitests/msvcrt/testlist.c Copied: trunk/rostests/apitests/crt/_vsnprintf.c (from r56924, trunk/rostests/apitests/msvcrt/_vsnprintf.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c… ============================================================================== --- trunk/rostests/apitests/msvcrt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -4,11 +4,16 @@ * PURPOSE: Test for _vsnprintf */ +#define WIN32_NO_STATUS +#include <stdio.h> #include <wine/test.h> -#include <stdio.h> -#include <stdlib.h> -#include <strings.h> -#include <stdarg.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) { @@ -23,10 +28,23 @@ START_TEST(_vsnprintf) { char buffer[255]; + NTSTATUS ExceptionStatus; /* Test basic functionality */ call_varargs(buffer, 255, 12, "%s world!", "hello"); /* This is how WINE implements _vcsprintf, and they are obviously wrong */ - call_varargs(NULL, INT_MAX, -1, "%s it really work?", "does"); + StartSeh() + call_varargs(NULL, INT_MAX, -1, "%s it really work?", "does"); +#if defined(TEST_CRTDLL) || defined(TEST_USER32) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif /* This one is no better */ - call_varargs(NULL, 0, -1, "%s it really work?", "does"); + StartSeh() + call_varargs(NULL, 0, -1, "%s it really work?", "does"); +#if defined(TEST_CRTDLL) || defined(TEST_USER32) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif } Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -314,7 +314,7 @@ # _unlink.c # _unloaddll.c # _utime.c -# _vsnprintf.c + _vsnprintf.c # _vsnwprintf.c # _wcsdup.c # _wcsicmp.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -832,7 +832,7 @@ # _vscwprintf.c # _vscwprintf_l # _vscwprintf_p_l -# _vsnprintf.c + _vsnprintf.c # _vsnprintf_c.c _vsnprintf # _vsnprintf_c_l.c _vsnprintf_l # _vsnprintf_l.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -34,7 +34,7 @@ # _ultoa.c # _ultow.c # _vscwprintf.c -# _vsnprintf.c + _vsnprintf.c # _vsnwprintf.c # _wcsicmp.c # _wcslwr.c Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -5,11 +5,13 @@ #define STANDALONE #include "wine/test.h" +extern void func__vsnprintf(void); extern void func_sprintf(void); extern void func_strcpy(void); const struct test winetest_testlist[] = { + { "_vsnprintf", func__vsnprintf }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeList… ============================================================================== --- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -2,7 +2,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE - _vsnprintf.c ieee.c splitpath.c testlist.c) Removed: trunk/rostests/apitests/msvcrt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/_vsnprint… ============================================================================== --- trunk/rostests/apitests/msvcrt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/_vsnprintf.c (removed) @@ -1,32 +1,0 @@ -/* - * PROJECT: ReactOS api tests - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for _vsnprintf - */ - -#include <wine/test.h> -#include <stdio.h> -#include <stdlib.h> -#include <strings.h> -#include <stdarg.h> - -void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) -{ - va_list args; - int ret; - /* Test the basic functionality */ - va_start(args, formatString); - ret = _vsnprintf(buf, 255, formatString, args); - ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); -} - -START_TEST(_vsnprintf) -{ - char buffer[255]; - /* Test basic functionality */ - call_varargs(buffer, 255, 12, "%s world!", "hello"); - /* This is how WINE implements _vcsprintf, and they are obviously wrong */ - call_varargs(NULL, INT_MAX, -1, "%s it really work?", "does"); - /* This one is no better */ - call_varargs(NULL, 0, -1, "%s it really work?", "does"); -} Modified: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Sat Jul 21 17:15:08 2012 @@ -5,13 +5,11 @@ #define STANDALONE #include "wine/test.h" -extern void func__vsnprintf(void); extern void func_ieee(void); extern void func_splitpath(void); const struct test winetest_testlist[] = { - { "_vsnprintf", func__vsnprintf}, { "ieee", func_ieee }, { "splitpath", func_splitpath },

1 0

[jgardou] 56924: [MSVCRT_APITEST] - add basic test for _vsnprintf This is mostly to verify if WINE's implementation of _vcsprintf is correct
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 16:31:03 2012 New Revision: 56924 URL: http://svn.reactos.org/svn/reactos?rev=56924&view=rev Log: [MSVCRT_APITEST] - add basic test for _vsnprintf This is mostly to verify if WINE's implementation of _vcsprintf is correct Added: trunk/rostests/apitests/msvcrt/_vsnprintf.c (with props) Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt trunk/rostests/apitests/msvcrt/testlist.c Modified: trunk/rostests/apitests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeList… ============================================================================== --- trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Sat Jul 21 16:31:03 2012 @@ -2,6 +2,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE + _vsnprintf.c ieee.c splitpath.c testlist.c) Added: trunk/rostests/apitests/msvcrt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/_vsnprint… ============================================================================== --- trunk/rostests/apitests/msvcrt/_vsnprintf.c (added) +++ trunk/rostests/apitests/msvcrt/_vsnprintf.c [iso-8859-1] Sat Jul 21 16:31:03 2012 @@ -1,0 +1,32 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for _vsnprintf + */ + +#include <wine/test.h> +#include <stdio.h> +#include <stdlib.h> +#include <strings.h> +#include <stdarg.h> + +void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) +{ + va_list args; + int ret; + /* Test the basic functionality */ + va_start(args, formatString); + ret = _vsnprintf(buf, 255, formatString, args); + ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); +} + +START_TEST(_vsnprintf) +{ + char buffer[255]; + /* Test basic functionality */ + call_varargs(buffer, 255, 12, "%s world!", "hello"); + /* This is how WINE implements _vcsprintf, and they are obviously wrong */ + call_varargs(NULL, INT_MAX, -1, "%s it really work?", "does"); + /* This one is no better */ + call_varargs(NULL, 0, -1, "%s it really work?", "does"); +} Propchange: trunk/rostests/apitests/msvcrt/_vsnprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Sat Jul 21 16:31:03 2012 @@ -5,11 +5,13 @@ #define STANDALONE #include "wine/test.h" +extern void func__vsnprintf(void); extern void func_ieee(void); extern void func_splitpath(void); const struct test winetest_testlist[] = { + { "_vsnprintf", func__vsnprintf}, { "ieee", func_ieee }, { "splitpath", func_splitpath },

1 0

[akhaldi] 56923: [REGEDIT] * Don't include these two headers twice for the resources.
by akhaldi＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: akhaldi Date: Sat Jul 21 15:01:13 2012 New Revision: 56923 URL: http://svn.reactos.org/svn/reactos?rev=56923&view=rev Log: [REGEDIT] * Don't include these two headers twice for the resources. Modified: trunk/reactos/base/applications/regedit/rsrc.rc Modified: trunk/reactos/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/rsrc.rc [iso-8859-1] Sat Jul 21 15:01:13 2012 @@ -17,10 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - -#include <windows.h> -#include "resource.h" - /* define language neutral resources */

1 0

[akhaldi] 56922: [WINE/CONFIG.H] * Don't automatically include buildno.h.
by akhaldi＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: akhaldi Date: Sat Jul 21 15:00:35 2012 New Revision: 56922 URL: http://svn.reactos.org/svn/reactos?rev=56922&view=rev Log: [WINE/CONFIG.H] * Don't automatically include buildno.h. Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sat Jul 21 15:00:35 2012 @@ -1,5 +1,3 @@ -#include "reactos/buildno.h" - #define __WINE_CONFIG_H /* Define to a function attribute for Microsoft hotpatch assembly prefix. */

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