Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 38050: - Update _makepath and _wmakepath to allow in place operation and separated extension processing, based on wine code - Fixes all 14 msvcrt dir winetests
by gschneider＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: gschneider Date: Sat Dec 13 15:06:47 2008 New Revision: 38050 URL: http://svn.reactos.org/svn/reactos?rev=38050&view=rev Log: - Update _makepath and _wmakepath to allow in place operation and separated extension processing, based on wine code - Fixes all 14 msvcrt dir winetests Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath.c trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c Modified: trunk/reactos/lib/sdk/crt/stdlib/makepath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/makepat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/makepath.c [iso-8859-1] Sat Dec 13 15:06:47 2008 @@ -1,3 +1,16 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/makepath.c + * PURPOSE: Creates a path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * + */ + /* $Id$ */ #include <precomp.h> @@ -9,29 +22,36 @@ */ void _makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext) { - int dir_len; + char *p = path; - if ((drive != NULL) && (*drive)) { - path[0] = *drive; - path[1] = ':'; - path[2] = 0; - } else { - (*path)=0; + if ( !path ) + return; + + if (drive && drive[0]) + { + *p++ = drive[0]; + *p++ = ':'; } - - if (dir != NULL) { - strcat(path, dir); - dir_len = strlen(dir); - if (dir_len && *(dir + dir_len - 1) != '\\') - strcat(path, "\\"); + if (dir && dir[0]) + { + unsigned int len = strlen(dir); + memmove(p, dir, len); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } - - if (fname != NULL) { - strcat(path, fname); - if (ext != NULL && *ext != 0) { - if (*ext != '.') - strcat(path, "."); - strcat(path, ext); - } + if (fname && fname[0]) + { + unsigned int len = strlen(fname); + memmove(p, fname, len); + p += len; } + if (ext && ext[0]) + { + if (ext[0] != '.') + *p++ = '.'; + strcpy(p, ext); + } + else + *p = '\0'; } Modified: trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wmakpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/wmakpath.c [iso-8859-1] Sat Dec 13 15:06:47 2008 @@ -1,11 +1,14 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crt/?????? - * PURPOSE: Unknown - * PROGRAMER: gdalsnes - * UPDATE HISTORY: - * 25/11/05: Added license header + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/wmakpath.c + * PURPOSE: Creates a unicode path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * */ /* $Id$ @@ -17,29 +20,36 @@ */ void _wmakepath(wchar_t* path, const wchar_t* drive, const wchar_t* dir, const wchar_t* fname, const wchar_t* ext) { - int dir_len; + wchar_t *p = path; - if ((drive != NULL) && (*drive)) { - path[0] = *drive; - path[1] = L':'; - path[2] = 0; - } else { - (*path) = 0; + if ( !path ) + return; + + if (drive && drive[0]) + { + *p++ = drive[0]; + *p++ = ':'; } - - if (dir != NULL) { - wcscat(path, dir); - dir_len = wcslen(dir); - if (dir_len && *(dir + dir_len - 1) != L'\\') - wcscat(path, L"\\"); + if (dir && dir[0]) + { + unsigned int len = strlenW(dir); + memmove(p, dir, len * sizeof(wchar_t)); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } - - if (fname != NULL) { - wcscat(path, fname); - if (ext != NULL && *ext != 0) { - if (*ext != L'.') - wcscat(path, L"."); - wcscat(path, ext); - } + if (fname && fname[0]) + { + unsigned int len = strlenW(fname); + memmove(p, fname, len * sizeof(wchar_t)); + p += len; } + if (ext && ext[0]) + { + if (ext[0] != '.') + *p++ = '.'; + strcpyW(p, ext); + } + else + *p = '\0'; }

1 0

[tkreuzer] 38049: fix build
by tkreuzer＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: tkreuzer Date: Sat Dec 13 13:47:24 2008 New Revision: 38049 URL: http://svn.reactos.org/svn/reactos?rev=38049&view=rev Log: fix build Added: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c (props changed) - copied unchanged from r38046, trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c Removed: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c Propchange: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32api/tests/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:mergeinfo = Removed: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (removed) @@ -1,396 +1,0 @@ - -INT -Test_GetSystemMetrics(PTESTINFO pti) -{ - INT ret; - HDC hDC; - BOOL BoolVal; - UINT UintVal; - RECT rect; - - SetLastError(0); - hDC = GetDC(0); - - ret = GetSystemMetrics(0); - TEST(ret > 0); - - ret = GetSystemMetrics(64); - TEST(ret == 0); - ret = GetSystemMetrics(65); - TEST(ret == 0); - ret = GetSystemMetrics(66); - TEST(ret == 0); - - - ret = GetSystemMetrics(SM_CXSCREEN); - TEST(ret == GetDeviceCaps(hDC, HORZRES)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSCREEN); - TEST(ret == GetDeviceCaps(hDC, VERTRES)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXVSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYHSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYCAPTION); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDLGFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDLGFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVTHUMB); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXHTHUMB); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXCURSOR); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYCURSOR); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENU); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); - ret = GetSystemMetrics(SM_CXFULLSCREEN); - TEST(ret == rect.right); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFULLSCREEN); - TEST(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION)); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYKANJIWINDOW); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MOUSEPRESENT); - TEST(ret == 1); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXHSCROLL); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_DEBUG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SWAPBUTTON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED1); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED2); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED3); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_RESERVED4); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMIN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMIN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFRAME); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDOUBLECLK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDOUBLECLK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXICONSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYICONSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_PENWINDOWS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_DBCSENABLED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CMOUSEBUTTONS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - -#if(WINVER >= 0x0400) - ret = GetSystemMetrics(SM_SECURE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXEDGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYEDGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINSPACING); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSMICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMICON); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMCAPTION); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXSMSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYSMSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMENUSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENUSIZE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_ARRANGE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMINIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMINIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMAXTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMAXTRACK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMAXIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMAXIMIZED); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_NETWORK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CLEANBOOT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXDRAG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYDRAG); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SHOWSOUNDS); - SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); - TEST(ret == BoolVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXMENUCHECK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYMENUCHECK); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SLOWMACHINE); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MIDEASTENABLED); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) - ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(WINVER >= 0x0500) - ret = GetSystemMetrics(SM_XVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_YVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CMONITORS); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0500) - ret = GetSystemMetrics(SM_IMMENABLED); - TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0501) - ret = GetSystemMetrics(SM_CXFOCUSBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CYFOCUSBORDER); - SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); - TEST(ret == UintVal); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_TABLETPC); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_MEDIACENTER); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_STARTER); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_SERVERR2); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - -#if(_WIN32_WINNT >= 0x0600) - ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); -// TEST(ret == 0); - TEST(GetLastError() == 0); - - ret = GetSystemMetrics(SM_CXPADDEDBORDER); -// TEST(ret == 0); - TEST(GetLastError() == 0); -#endif - - return APISTATUS_NORMAL; -}

1 0

[fireball] 38048: - Add missing PSHARED_CACHE_MAP.
by fireball＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: fireball Date: Sat Dec 13 13:31:40 2008 New Revision: 38048 URL: http://svn.reactos.org/svn/reactos?rev=38048&view=rev Log: - Add missing PSHARED_CACHE_MAP. Modified: trunk/reactos/include/ndk/cctypes.h Modified: trunk/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cctypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cctypes.h [iso-8859-1] Sat Dec 13 13:31:40 2008 @@ -129,7 +129,7 @@ KEVENT Event; EX_PUSH_LOCK VacbPushLock; PRIVATE_CACHE_MAP PrivateCacheMap; -} SHARED_CACHE_MAP; +} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ #endif /* NTOS_MODE_USER */

1 0

[fireball] 38047: - Sync with Wine.
by fireball＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: fireball Date: Sat Dec 13 13:30:38 2008 New Revision: 38047 URL: http://svn.reactos.org/svn/reactos?rev=38047&view=rev Log: - Sync with Wine. Modified: trunk/reactos/include/reactos/wine/exception.h Modified: trunk/reactos/include/reactos/wine/exception.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/excep… ============================================================================== --- trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/exception.h [iso-8859-1] Sat Dec 13 13:30:38 2008 @@ -24,6 +24,10 @@ #include <setjmp.h> #include <windef.h> #include <excpt.h> + +#ifdef __cplusplus +extern "C" { +#endif /* The following definitions allow using exceptions in Wine and Winelib code * @@ -87,6 +91,12 @@ #define __attribute__(x) /* nothing */ #endif +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__REACTOS__) +#define sigjmp_buf jmp_buf +#define sigsetjmp(buf,sigs) setjmp(buf) +#define siglongjmp(buf,val) longjmp(buf,val) +#endif + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ @@ -101,7 +111,7 @@ } else { \ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -112,7 +122,7 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_page_fault; \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -123,7 +133,7 @@ break; \ } else { \ __f.frame.Handler = __wine_exception_handler_all; \ - if (setjmp( __f.jmp )) { \ + if (sigsetjmp( __f.jmp, 0 )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -153,9 +163,6 @@ typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); -#define WINE_EXCEPTION_FILTER(func) LONG WINAPI func( EXCEPTION_POINTERS *__eptr ) -#define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal ) - #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -172,7 +179,7 @@ /* finally data */ __WINE_FINALLY finally_func; } u; - jmp_buf jmp; + sigjmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord; @@ -180,7 +187,7 @@ #endif /* USE_COMPILER_EXCEPTIONS */ -static __inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) EXCEPTION_REGISTRATION_RECORD *prev; @@ -191,13 +198,13 @@ return prev; #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - frame->Prev = (void *)teb->ExceptionList; - teb->ExceptionList = (void *)frame; + frame->Prev = teb->ExceptionList; + teb->ExceptionList = frame; return frame->Prev; #endif } -static __inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" @@ -206,12 +213,55 @@ #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); - teb->ExceptionList = (void *)frame->Prev; + teb->ExceptionList = frame->Prev; return frame->Prev; #endif } +/* Exception handling flags - from OS/2 2.0 exception handling */ + +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 + +/* Wine-specific exceptions codes */ + +#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ +#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ + +/* unhandled return status from vm86 mode */ +#define EXCEPTION_VM86_INTx 0x80000110 +#define EXCEPTION_VM86_STI 0x80000111 +#define EXCEPTION_VM86_PICRETURN 0x80000112 + +extern void __wine_enter_vm86( CONTEXT *context ); + #ifndef USE_COMPILER_EXCEPTIONS + +/* wrapper for RtlUnwind since it clobbers registers on Windows */ +static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record ) +{ +#if defined(__GNUC__) && defined(__i386__) + int dummy1, dummy2, dummy3; + __asm__ __volatile__("pushl %%ebp\n\t" + "pushl %%ebx\n\t" + "pushl $0\n\t" + "pushl %2\n\t" + "pushl $0\n\t" + "pushl %1\n\t" + "call *%0\n\t" + "popl %%ebx\n\t" + "popl %%ebp" + : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) + : "0" (RtlUnwind), "1" (frame), "2" (record) + : "ecx", "edx", "memory" ); +#else + RtlUnwind( frame, 0, record, 0 ); +#endif +} static inline void DECLSPEC_NORETURN __wine_unwind_frame( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame ) @@ -222,65 +272,36 @@ wine_frame->ExceptionCode = record->ExceptionCode; wine_frame->ExceptionRecord = wine_frame; -#if defined(__GNUC__) && defined(__i386__) - { - /* RtlUnwind clobbers registers on Windows */ - int dummy1, dummy2, dummy3; - __asm__ __volatile__("pushl %%ebp\n\t" - "pushl %%ebx\n\t" - "pushl $0\n\t" - "pushl %2\n\t" - "pushl $0\n\t" - "pushl %1\n\t" - "call *%0\n\t" - "popl %%ebx\n\t" - "popl %%ebp" - : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3) - : "0" (RtlUnwind), "1" (frame), "2" (record) - : "ecx", "edx", "memory" ); - } -#else - RtlUnwind( frame, 0, record, 0 ); -#endif + __wine_rtl_unwind( frame, record ); __wine_pop_frame( frame ); - longjmp( wine_frame->jmp, 1 ); + siglongjmp( wine_frame->jmp, 1 ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) return ExceptionContinueSearch; - if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter( &ptrs )) { - if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) - return ExceptionContinueSearch; - } - else if (wine_frame->u.filter) - { - EXCEPTION_POINTERS ptrs; - ptrs.ExceptionRecord = record; - ptrs.ContextRecord = context; - switch(wine_frame->u.filter( &ptrs )) - { - case EXCEPTION_CONTINUE_SEARCH: - return ExceptionContinueSearch; - case EXCEPTION_CONTINUE_EXECUTION: - return ExceptionContinueExecution; - case EXCEPTION_EXECUTE_HANDLER: - break; - default: - break; - } + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; } __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler_page_fault( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -291,7 +312,7 @@ __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_exception_handler_all( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -300,7 +321,7 @@ __wine_unwind_frame( record, frame ); } -static __inline EXCEPTION_DISPOSITION +static inline EXCEPTION_DISPOSITION __wine_finally_handler( struct _EXCEPTION_RECORD *record, void *frame, struct _CONTEXT *context, void *pdispatcher ) { @@ -314,32 +335,8 @@ #endif /* USE_COMPILER_EXCEPTIONS */ -/* Exception handling flags - from OS/2 2.0 exception handling */ - -/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - -/* Wine-specific exceptions codes */ - -#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ -#define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ - -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - -extern void __wine_enter_vm86( CONTEXT *context ); - -static __inline WINE_EXCEPTION_FILTER(__wine_pagefault_filter) -{ - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return EXCEPTION_CONTINUE_SEARCH; - return EXCEPTION_EXECUTE_HANDLER; -} +#ifdef __cplusplus +} +#endif #endif /* __WINE_WINE_EXCEPTION_H */

1 0

[tkreuzer] 38046: Add 101 tests for GetSystemMetrics
by tkreuzer＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: tkreuzer Date: Sat Dec 13 11:55:44 2008 New Revision: 38046 URL: http://svn.reactos.org/svn/reactos?rev=38046&view=rev Log: Add 101 tests for GetSystemMetrics Added: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (with props) Modified: trunk/rostests/apitests/user32api/testlist.c Modified: trunk/rostests/apitests/user32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/testli… ============================================================================== --- trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32api/testlist.c [iso-8859-1] Sat Dec 13 11:55:44 2008 @@ -6,6 +6,7 @@ #include "user32api.h" /* include the tests */ +#include "tests/GetSystemMetrics.c" #include "tests/InitializeLpkHooks.c" #include "tests/ScrollDC.c" #include "tests/ScrollWindowEx.c" @@ -14,6 +15,7 @@ /* The List of tests */ TESTENTRY TestList[] = { + { L"GetSystemMetrics", Test_GetSystemMetrics }, { L"InitializeLpkHooks", Test_InitializeLpkHooks }, { L"ScrollDC", Test_ScrollDC }, { L"ScrollWindowEx", Test_ScrollWindowEx }, Added: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32api/tests/… ============================================================================== --- trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c (added) +++ trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c [iso-8859-1] Sat Dec 13 11:55:44 2008 @@ -1,0 +1,396 @@ + +INT +Test_GetSystemMetrics(PTESTINFO pti) +{ + INT ret; + HDC hDC; + BOOL BoolVal; + UINT UintVal; + RECT rect; + + SetLastError(0); + hDC = GetDC(0); + + ret = GetSystemMetrics(0); + TEST(ret > 0); + + ret = GetSystemMetrics(64); + TEST(ret == 0); + ret = GetSystemMetrics(65); + TEST(ret == 0); + ret = GetSystemMetrics(66); + TEST(ret == 0); + + + ret = GetSystemMetrics(SM_CXSCREEN); + TEST(ret == GetDeviceCaps(hDC, HORZRES)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSCREEN); + TEST(ret == GetDeviceCaps(hDC, VERTRES)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXVSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYHSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYCAPTION); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDLGFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDLGFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVTHUMB); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXHTHUMB); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXCURSOR); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYCURSOR); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENU); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); + ret = GetSystemMetrics(SM_CXFULLSCREEN); + TEST(ret == rect.right); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFULLSCREEN); + TEST(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION)); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYKANJIWINDOW); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MOUSEPRESENT); + TEST(ret == 1); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXHSCROLL); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_DEBUG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SWAPBUTTON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED1); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED2); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED3); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_RESERVED4); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMIN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMIN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFRAME); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDOUBLECLK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDOUBLECLK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXICONSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYICONSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_PENWINDOWS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_DBCSENABLED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CMOUSEBUTTONS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + +#if(WINVER >= 0x0400) + ret = GetSystemMetrics(SM_SECURE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXEDGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYEDGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINSPACING); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSMICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMICON); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMCAPTION); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXSMSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYSMSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMENUSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENUSIZE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_ARRANGE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMINIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMINIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMAXTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMAXTRACK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMAXIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMAXIMIZED); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_NETWORK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CLEANBOOT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXDRAG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYDRAG); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SHOWSOUNDS); + SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); + TEST(ret == BoolVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXMENUCHECK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYMENUCHECK); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SLOWMACHINE); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MIDEASTENABLED); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(WINVER >= 0x0500) + ret = GetSystemMetrics(SM_XVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_YVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CMONITORS); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0500) + ret = GetSystemMetrics(SM_IMMENABLED); + TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0501) + ret = GetSystemMetrics(SM_CXFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CYFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + TEST(ret == UintVal); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_TABLETPC); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_MEDIACENTER); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_STARTER); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_SERVERR2); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + +#if(_WIN32_WINNT >= 0x0600) + ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); +// TEST(ret == 0); + TEST(GetLastError() == 0); + + ret = GetSystemMetrics(SM_CXPADDEDBORDER); +// TEST(ret == 0); + TEST(GetLastError() == 0); +#endif + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/user32api/tests/GetSystemmetrics.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 38045: Add DumpMem function to apitests lib for debugging purposes
by tkreuzer＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: tkreuzer Date: Sat Dec 13 10:52:49 2008 New Revision: 38045 URL: http://svn.reactos.org/svn/reactos?rev=38045&view=rev Log: Add DumpMem function to apitests lib for debugging purposes Modified: trunk/rostests/apitests/apitest.c trunk/rostests/apitests/apitest.h Modified: trunk/rostests/apitests/apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.c?rev=38… ============================================================================== --- trunk/rostests/apitests/apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.c [iso-8859-1] Sat Dec 13 10:52:49 2008 @@ -78,6 +78,36 @@ WriteFile(hFile, szLine, strlen(szLine), lpdwBytesWritten, NULL); return TRUE; +} + +static CHAR +GetDisplayChar(CHAR c) +{ + if (c < 32) return '.'; + return c; +} + +VOID +DumpMem(PVOID pData, ULONG cbSize, ULONG nWidth) +{ + ULONG cLines = (cbSize + nWidth - 1) / nWidth; + ULONG cbLastLine = cbSize % nWidth; + INT i,j; + + for (i = 0; i <= cLines; i++) + { + printf("%08lx: ", i*nWidth); + for (j = 0; j < (i == cLines? cbLastLine : nWidth); j++) + { + printf("%02x ", ((BYTE*)pData)[i*nWidth + j]); + } + printf(" "); + for (j = 0; j < (i == cLines? cbLastLine : nWidth); j++) + { + printf("%c", GetDisplayChar(((CHAR*)pData)[i*nWidth + j])); + } + printf("\n"); + } } int Modified: trunk/rostests/apitests/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/apitest.h?rev=38… ============================================================================== --- trunk/rostests/apitests/apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/apitest.h [iso-8859-1] Sat Dec 13 10:52:49 2008 @@ -91,5 +91,6 @@ extern TESTENTRY TestList[]; INT NumTests(void); BOOL IsFunctionPresent(LPWSTR lpszFunction); +VOID DumpMem(PVOID pData, ULONG cbSize, ULONG nWidth); #endif /* _APITEST_H */

1 0

[tkreuzer] 38044: Add tests for NtGdiCombineRgn (14), NtGdiCreateCompatibleDC (4), NtGdiDoPalette (1), NtGdiFlushUserBatch (10), NtGdiPolyPolyDraw (60), NtGdiselectBitmap (4), NtGdiSelectPen (6), NtGdiSetDIBitsToDeviceInternal (2), NtUserEnumDisplayMonitors (7), NtUserGetClassInfo (15), NtUserProcessConnect (1), NtUserSelectPalette (13), NtUserSystemParametersInfo (1) (= 138 new tests)
by tkreuzer＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: tkreuzer Date: Sat Dec 13 10:48:01 2008 New Revision: 38044 URL: http://svn.reactos.org/svn/reactos?rev=38044&view=rev Log: Add tests for NtGdiCombineRgn (14), NtGdiCreateCompatibleDC (4), NtGdiDoPalette (1), NtGdiFlushUserBatch (10), NtGdiPolyPolyDraw (60), NtGdiselectBitmap (4), NtGdiSelectPen (6), NtGdiSetDIBitsToDeviceInternal (2), NtUserEnumDisplayMonitors (7), NtUserGetClassInfo (15), NtUserProcessConnect (1), NtUserSelectPalette (13), NtUserSystemParametersInfo (1) (= 138 new tests) Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCombineRgn.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiPolyPolyDraw.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplayMonitors.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserProcessConnect.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserSelectPalette.c (with props) trunk/rostests/apitests/w32knapi/ntuser/NtUserSetTimer.c (with props) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCombineRgn.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCombineRgn.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,49 @@ + +INT +Test_NtGdiCombineRgn(PTESTINFO pti) +{ + HRGN hRgnDest, hRgn1, hRgn2; +// test what params are accepted for what operations +// 0? invalid? are params maybe ignored in some cases? +// LastError + + /* Preparation */ + hRgnDest = CreateRectRgn(0,0,1,1); + hRgn1 = CreateRectRgn(1,1,4,4); + hRgn2 = CreateRectRgn(2,2,6,3); + + /* RGN_AND = 1, RGN_OR = 2, RGN_XOR = 3, RGN_DIFF = 4, RGN_COPY = 5 */ + + TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 0) == ERROR); + TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, 6) == ERROR); + + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCombineRgn(hRgnDest, 0, 0, RGN_AND) == ERROR); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCombineRgn(hRgnDest, hRgn1, 0, RGN_AND) == ERROR); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCombineRgn(hRgnDest, 0, hRgn1, RGN_AND) == ERROR); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + SetLastError(ERROR_SUCCESS); + TEST(NtGdiCombineRgn(0, hRgn1, hRgn2, RGN_AND) == ERROR); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + /* Create intersection */ + TEST(NtGdiCombineRgn(hRgnDest, hRgn1, hRgn2, RGN_AND) == SIMPLEREGION); + SetRectRgn(hRgn1, 2, 2, 4, 3); + TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR) == NULLREGION); + + /* Create intersection with itself */ + SetRectRgn(hRgnDest, 2, 2, 4, 3); + TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgnDest, RGN_AND) == SIMPLEREGION); + SetRectRgn(hRgn1, 2, 2, 4, 3); + TEST(NtGdiCombineRgn(hRgnDest, hRgnDest, hRgn1, RGN_XOR) == NULLREGION); + + + /* What if 2 regions are the same */ + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCombineRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,27 @@ + +INT +Test_NtGdiCreateCompatibleDC(PTESTINFO pti) +{ + HDC hDC; + HGDIOBJ hObj; + + /* Test if aa NULL DC is accepted */ + hDC = NtGdiCreateCompatibleDC(NULL); + TEST(hDC != NULL); + + /* We select a nwe palette. Note: SelectObject doesn't work with palettes! */ + hObj = SelectPalette(hDC, GetStockObject(DEFAULT_PALETTE), 0); + /* The old palette should be GetStockObject(DEFAULT_PALETTE) */ + TEST(hObj == GetStockObject(DEFAULT_PALETTE)); + + /* The default bitmap should be GetStockObject(21) */ + hObj = SelectObject(hDC, GetStockObject(21)); + TEST(hObj == GetStockObject(21)); + + /* The default pen should be GetStockObject(BLACK_PEN) */ + hObj = SelectObject(hDC, GetStockObject(WHITE_PEN)); + TEST(hObj == GetStockObject(BLACK_PEN)); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateCompatibleDC.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -102,7 +102,8 @@ INT Test_NtGdiDoPalette_GdiPalSetEntries(PTESTINFO pti) { - HPALETTE hPal; + HDC hDC; + HPALETTE hPal, hOldPal; PALETTEENTRY palEntries[5] = { {0,0,0,0}, {0xff,0xff,0xff,0}, @@ -156,6 +157,13 @@ /* Test that the buffer was not changed */ + + /* Test with palette selected into dc */ + hDC = CreateCompatibleDC(NULL); + hOldPal = SelectPalette(hDC, hPal, 0); + RTEST(NtGdiDoPalette(hPal, 0, 4, palEntries, GdiPalSetEntries, TRUE) == 4); + SelectPalette(hDC, hOldPal, 0); + /* Test pEntries = NULL */ RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, TRUE) == 0); Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,35 @@ + +INT +Test_NtGdiFlushUserBatch(PTESTINFO pti) +{ + PVOID pRet; + PTEB pTeb; + + pTeb = NtCurrentTeb(); + ASSERT(pTeb); + + pRet = (PVOID)NtGdiFlushUserBatch(); + + TEST(pRet != 0); + TEST(pRet == &pTeb->RealClientId); + + TEST(pTeb->GdiBatchCount == 0); + TEST(pTeb->GdiTebBatch.Offset == 0); + TEST(pTeb->GdiTebBatch.HDC == 0); + + /* Set up some bullshit */ + pTeb->InDbgPrint = 1; + pTeb->GdiBatchCount = 12; + pTeb->GdiTebBatch.Offset = 21; + pTeb->GdiTebBatch.HDC = (HDC)123; + + pRet = (PVOID)NtGdiFlushUserBatch(); + TEST(pRet == &pTeb->RealClientId); + + TEST(pTeb->InDbgPrint == 0); + TEST(pTeb->GdiBatchCount == 12); + TEST(pTeb->GdiTebBatch.Offset == 0); + TEST(pTeb->GdiTebBatch.HDC == 0); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiPolyPolyDraw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiPolyPolyDraw.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiPolyPolyDraw.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,208 @@ + + +static +INT +Test_Params(PTESTINFO pti) +{ + ULONG_PTR ret; + ULONG Count1[4] = {3, 2, 4, 3}; + ULONG Count2[2] = {0, 3}; + ULONG Count3[2] = {0, 0}; + ULONG Count4[2] = {1, 3}; + ULONG Count5[2] = {0x80000001, 0x80000001}; + POINT Points[6] = {{0,0}, {1,1}, {3,-3}, {-2,2}, {4,2}, {2,4}}; + HDC hDC; + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 0); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 2); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 3); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 4); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 5); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(NULL, NULL, NULL, 0, 6); + TEST(ret == 0); + TEST(GetLastError() == 0); + +//////////////////////////////////////////////////////////////////////////////// + + /* Test with an invalid DC */ + + SetLastError(0); + ret = NtGdiPolyPolyDraw(0, Points, Count1, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + hDC = (HDC)0x12345; + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 0); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 2); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 3); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 4); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 5); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 6); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw((HDC)1, Points, Count1, 1, 6); + TEST((ret & GDI_HANDLE_BASETYPE_MASK) == GDI_OBJECT_TYPE_REGION); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw((HDC)0, Points, Count1, 1, 6); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 0, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count2, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, NULL, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, (PVOID)0x81000000, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, NULL, Count1, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, (PVOID)0x81000000, Count1, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + +//////////////////////////////////////////////////////////////////////////////// + + /* Test with a valid DC */ + + hDC = CreateCompatibleDC(NULL); + ASSERT(hDC); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 0); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 1); + TEST(ret == 1); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 2); + TEST(ret == 1); + TEST(GetLastError() == 0); + +#if 0 + SetLastError(0); + // better don't do this on win xp!!! (random crashes) +// ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 3); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(0); + // better don't do this on win xp!!! (random crashes) +// ret = NtGdiPolyPolyDraw(hDC, Points, Count1, 2, 4); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + +#endif + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count2, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count3, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 0); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count4, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(0); + ret = NtGdiPolyPolyDraw(hDC, Points, Count5, 2, 1); + TEST(ret == 0); + TEST(GetLastError() == 87); + + return APISTATUS_NORMAL; +} + + + + +INT +Test_NtGdiPolyPolyDraw(PTESTINFO pti) +{ + Test_Params(pti); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiPolyPolyDraw.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -3,11 +3,25 @@ { HDC hDC; HBITMAP hBmp, hOldBmp; + HPALETTE hOldPalette, hPalette; + LOGPALETTE logpal = {0x300, 1, {{12,13,14,15}}}; + + hBmp = CreateBitmap(2,2,1,1,NULL); + ASSERT(hBmp); + + /* We cannot select a bitmap into a display DC */ + hDC = GetDC(NULL); + ASSERT(hDC); + hOldBmp = NtGdiSelectBitmap(hDC, hBmp); + TEST(hOldBmp == NULL); hDC = CreateCompatibleDC(GetDC(NULL)); ASSERT(hDC); - hBmp = CreateBitmap(2,2,1,1,NULL); + /* Check the palette before we mess it up*/ + hPalette = CreatePalette(&logpal); + hOldPalette = SelectPalette(hDC, hPalette, 0); + TEST(hOldPalette == GetStockObject(DEFAULT_PALETTE)); /* Test NULL DC */ SetLastError(ERROR_SUCCESS); @@ -27,20 +41,30 @@ TEST(hOldBmp == NULL); TEST(GetLastError() == ERROR_SUCCESS); - /* Test NULL bitmap */ + /* Test bitmap with only index */ SetLastError(ERROR_SUCCESS); hOldBmp = NtGdiSelectBitmap(hDC, (HBITMAP)((ULONG_PTR)hBmp & 0x0000ffff)); TEST(hOldBmp == NULL); TEST(GetLastError() == ERROR_SUCCESS); - /* Test invalid bitmap */ + /* Test valid bitmap */ SetLastError(ERROR_SUCCESS); hOldBmp = NtGdiSelectBitmap(hDC, hBmp); TEST(hOldBmp != NULL); + /* The default bitmap should be GetStockObject(21) */ + TEST(hOldBmp == GetStockObject(21)); + + /* Check the palette */ + hOldPalette = SelectPalette(hDC, hOldPalette, 0); + TEST(hOldPalette == hPalette); + DeleteObject(hPalette); + + /* Select the old one again and check */ hOldBmp = NtGdiSelectBitmap(hDC, hOldBmp); TEST(hOldBmp == hBmp); TEST(GetLastError() == ERROR_SUCCESS); + /* cleanup */ DeleteObject(hBmp); DeleteDC(hDC); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -3,8 +3,10 @@ { HDC hDC; HPEN hPen, hOldPen; + LOGBRUSH logbrush; - hDC = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + hDC = GetDC(NULL); + ASSERT(hDC); hPen = GetStockObject(WHITE_PEN); @@ -26,19 +28,42 @@ TEST(hOldPen == NULL); TEST(GetLastError() == ERROR_SUCCESS); - /* Test NULL pen */ + /* Test invalid pen */ SetLastError(ERROR_SUCCESS); hOldPen = NtGdiSelectPen(hDC, (HPEN)((ULONG_PTR)hPen & 0x0000ffff)); TEST(hOldPen == NULL); TEST(GetLastError() == ERROR_SUCCESS); + /* Test valid pen */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(hDC, hPen); + TEST(hOldPen == GetStockObject(BLACK_PEN)); + hOldPen = NtGdiSelectPen(hDC, hOldPen); + TEST(hOldPen == hPen); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test extpen */ + SetLastError(ERROR_SUCCESS); + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(0x12,0x34,0x56); + hPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &logbrush, 0, NULL); + ASSERT(hPen); hOldPen = NtGdiSelectPen(hDC, hPen); TEST(hOldPen != NULL); hOldPen = NtGdiSelectPen(hDC, hOldPen); TEST(hOldPen == hPen); TEST(GetLastError() == ERROR_SUCCESS); + /* Test deleting pen */ + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(hDC, hPen); + TEST(DeleteObject(hPen) == 1); + hOldPen = NtGdiSelectPen(hDC, hOldPen); + TEST(hOldPen == hPen); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test that fallback pen is BLACK_PEN */ DeleteDC(hDC); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSetDIBitsToDeviceInternal.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,8 +1,25 @@ + +void +ReadBits(HDC hDC, PDWORD OutBits) +{ + int x,y; + + for (y = 0; y < 8; y++) + { + DWORD Row = 0; + for (x = 0; x < 8; x++) + Row |= (0x80 & GetPixel(hDC, 2 + x, 3 + y)) >> x; + OutBits[y] = Row; + } +} + + INT Test_NtGdiSetDIBitsToDeviceInternal(PTESTINFO pti) { static const DWORD InBits[8] = { 0x81, 0x7E, 0x5A, 0x7E, 0x7E, 0x42, 0x7E, 0x81 }; DWORD OutBits[8]; + XFORM xform; HWND hWnd = CreateWindowW(L"Static", NULL, WS_VISIBLE, 100, 100, 200, 200, @@ -36,6 +53,27 @@ sizeof(InBits), sizeof(bmi), TRUE, NULL)); /* Now get the data from the screen, and see if it matches */ + ReadBits(hDC, OutBits); + + TEST(memcmp(InBits, OutBits, sizeof(InBits)) == 0); + + /* Change transformation */ + GetWorldTransform(hDC, &xform); + xform.eM11 = 2; + xform.eM22 = 2; + xform.eDx = 10; + SetWorldTransform(hDC, &xform); + + TEST(NtGdiSetDIBitsToDeviceInternal(hDC, 2, 3, 8, 8, 0, 0, 0, 8, + (PVOID)InBits, (BITMAPINFO *)&bmi, DIB_RGB_COLORS, + sizeof(InBits), sizeof(bmi), TRUE, NULL)); + + xform.eM11 = 1; + xform.eM22 = 1; + xform.eDx = 0; + SetWorldTransform(hDC, &xform); + + /* Now get the data from the screen, and see if it matches */ for (y = 0; y < 8; y++) { DWORD Row = 0; @@ -43,7 +81,9 @@ Row |= (0x80 & GetPixel(hDC, 2 + x, 3 + y)) >> x; OutBits[y] = Row; } + TEST(memcmp(InBits, OutBits, sizeof(InBits)) == 0); + ReleaseDC(hWnd, hDC); DestroyWindow(hWnd); Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallOneParam.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -39,6 +39,7 @@ hMenu = CreateMenu(); pObject = NtUserCallOneParam((DWORD)hMenu, _ONEPARAM_ROUTINE_MAPDEKTOPOBJECT); + DestroyMenu(hMenu); TEST(pObject > 0); TEST(pObject < 0x80000000); Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplayMonitors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplayMonitors.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplayMonitors.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,52 @@ + +ULONG gMonitorCount = 0; +HDC ghdcMonitor = 0; +RECT grcMonitor = {0}; + +BOOL +NTAPI +NtUserEnumDisplayMonitors1( + HDC hDC, + LPCRECT lprcClip, + MONITORENUMPROC lpfnEnum, + LPARAM dwData) +{ + return (INT)Syscall(L"NtUserEnumDisplayMonitors", 4, &hDC); +} + +BOOL CALLBACK +MonitorEnumProc( + HMONITOR hMonitor, + HDC hdcMonitor, + LPRECT lprcMonitor, + LPARAM dwData) +{ + gMonitorCount++; + if (gMonitorCount == 1) + { + ghdcMonitor = hdcMonitor; + grcMonitor = *lprcMonitor; + } + return TRUE; +} + +INT +Test_NtUserEnumDisplayMonitors(PTESTINFO pti) +{ + BOOL ret; + + // WILL crash! +// TEST(NtUserEnumDisplayMonitors1(NULL, NULL, NULL, 0) == 0); + + ret = NtUserEnumDisplayMonitors1(0, NULL, MonitorEnumProc, 0); + TEST(ret == TRUE); + TEST(gMonitorCount > 0); + TEST(ghdcMonitor == 0); + TEST(grcMonitor.left == 0); + TEST(grcMonitor.right > 0); + TEST(grcMonitor.top == 0); + TEST(grcMonitor.bottom > 0); + + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserEnumDisplayMonitors.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,58 @@ +BOOL +NTAPI +NtUserGetClassInfo2( + HINSTANCE hInstance, + PUNICODE_STRING ClassName, + LPWNDCLASSEXW wcex, + LPWSTR *ppwstr, + BOOL Ansi) +{ + return (BOOL)Syscall(L"NtUserGetClassInfo", 5, &hInstance); +} + +INT +Test_NtUserGetClassInfo(PTESTINFO pti) +{ + WNDCLASSEXW wclex, wclex2 = {0}; + UNICODE_STRING us; + PWSTR pwstr; + + us.Length = 8; + us.MaximumLength = 8; + us.Buffer = L"test"; + + wclex.cbSize = sizeof(WNDCLASSEXW); + wclex.style = 0; + wclex.lpfnWndProc = NULL; + wclex.cbClsExtra = 2; + wclex.cbWndExtra = 4; + wclex.hInstance = g_hInstance; + wclex.hIcon = NULL; + wclex.hCursor = NULL; + wclex.hbrBackground = CreateSolidBrush(RGB(4,7,5)); + wclex.lpszMenuName = L"MyMenu"; + wclex.lpszClassName = us.Buffer; + wclex.hIconSm = NULL; + + ASSERT(RegisterClassExW(&wclex) != 0); + + TEST(GetClassInfoExW(g_hInstance, us.Buffer, &wclex) != 0); + wclex2.cbSize = sizeof(WNDCLASSEXW); + TEST(NtUserGetClassInfo2(g_hInstance, &us, &wclex2, &pwstr, 0) != 0); + + TEST(pwstr == wclex.lpszMenuName); + TEST(wclex2.cbSize == wclex.cbSize); + TEST(wclex2.style == wclex.style); + TEST(wclex2.lpfnWndProc == wclex.lpfnWndProc); + TEST(wclex2.cbClsExtra == wclex.cbClsExtra); + TEST(wclex2.cbWndExtra == wclex.cbWndExtra); + TEST(wclex2.hInstance == wclex.hInstance); + TEST(wclex2.hIcon == wclex.hIcon); + TEST(wclex2.hCursor == wclex.hCursor); + TEST(wclex2.hbrBackground == wclex.hbrBackground); + TEST(wclex2.lpszMenuName == 0); + TEST(wclex2.lpszClassName == 0); + TEST(wclex2.hIconSm == wclex.hIconSm); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserProcessConnect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserProcessConnect.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserProcessConnect.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,24 @@ + +INT +Test_NtUserProcessConnect(PTESTINFO pti) +{ + HANDLE hProcess; + NTSTATUS Status; + USERCONNECT UserConnect = {0}; + + hProcess = GetCurrentProcess(); + + UserConnect.ulVersion = MAKELONG(0, 5); + Status = NtUserProcessConnect(hProcess, (USERCONNECT*)&UserConnect, sizeof(USERCONNECT)); + TEST(NT_SUCCESS(Status)); + + printf("UserConnect.ulVersion = 0x%lx\n", UserConnect.ulVersion); + printf("UserConnect.ulCurrentVersion = 0x%lx\n", UserConnect.ulCurrentVersion); + printf("UserConnect.dwDispatchCount = 0x%lx\n", UserConnect.dwDispatchCount); + printf("UserConnect.siClient.psi = 0x%p\n", UserConnect.siClient.psi); + printf("UserConnect.siClient.aheList = 0x%p\n", UserConnect.siClient.aheList); + printf("UserConnect.siClient.pDispInfo = 0x%p\n", UserConnect.siClient.pDispInfo); + printf("UserConnect.siClient.ulSharedDelta = 0x%lx\n", UserConnect.siClient.ulSharedDelta); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserProcessConnect.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserSelectPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSelectPalette.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSelectPalette.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,92 @@ + + +FORCEINLINE +PALETTEENTRY +PALENTRY(BYTE r, BYTE g, BYTE b) +{ + PALETTEENTRY ret; + + ret.peRed = r; + ret.peGreen = g; + ret.peBlue = b; + ret.peFlags = 0; + return ret; +} + +INT +Test_NtUserSelectPalette(PTESTINFO pti) +{ + HPALETTE hPal, hOldPal; + HWND hWnd; + HDC hDC, hCompDC; + struct + { + LOGPALETTE logpal; + PALETTEENTRY entry[20]; + } pal; + + ZeroMemory(&pal, sizeof(pal)); + + pal.logpal.palVersion = 0x300; + pal.logpal.palNumEntries = 6; + pal.entry[0] = PALENTRY(0,0,0); + pal.entry[1] = PALENTRY(255,255,255); + pal.entry[2] = PALENTRY(128,128,128); + pal.entry[3] = PALENTRY(128,0,0); + pal.entry[4] = PALENTRY(0,128,0); + pal.entry[5] = PALENTRY(0,0,128); + + hPal = CreatePalette(&pal.logpal); + ASSERT(hPal); + TEST(DeletePalette(hPal) == 1); + hPal = CreatePalette(&pal.logpal); + ASSERT(hPal); + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + hDC = GetDC(hWnd); + ASSERT(hDC); + hCompDC = CreateCompatibleDC(hDC); + ASSERT(hCompDC); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + hOldPal = NtUserSelectPalette(NULL, hPal, 0); + TEST(hOldPal == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + hOldPal = NtUserSelectPalette((HDC)-1, hPal, 0); + TEST(hOldPal == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL palette */ + SetLastError(ERROR_SUCCESS); + hOldPal = NtUserSelectPalette(hDC, NULL, 0); + TEST(hOldPal == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid palette */ + SetLastError(ERROR_SUCCESS); + hOldPal = NtUserSelectPalette(hDC, (HPALETTE)-1, 0); + TEST(hOldPal == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test valid palette */ + hOldPal = NtUserSelectPalette(hDC, hPal, 0); + TEST(hOldPal != 0); + TEST(hOldPal == GetStockObject(DEFAULT_PALETTE)); + + /* We cannot Delete the palette */ + TEST(DeletePalette(hPal) == 0); + + /* We can still select the Palette into a compatible DC */ + hOldPal = NtUserSelectPalette(hCompDC, hPal, 0); + TEST(hOldPal != 0); + + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserSelectPalette.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntuser/NtUserSetTimer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSetTimer.c (added) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSetTimer.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -1,0 +1,15 @@ + + + +INT +Test_NtUserSetTimer(PTESTINFO pti) +{ + + + // check valid argument + // check for replacement / new timers + // check when expiries are handled (msgs and calls) + + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntuser/NtUserSetTimer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserSystemParametersInfo.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -338,12 +338,28 @@ } INT +Test_SPI_GETSTICKYKEYS(PTESTINFO pti) +{ + STICKYKEYS sk; + + sk.cbSize = sizeof(STICKYKEYS)+1; + TEST(NtUserSystemParametersInfo(SPI_GETSTICKYKEYS, 0, &sk, 0) == 0); + + + sk.cbSize = sizeof(STICKYKEYS); + NtUserSystemParametersInfo(SPI_GETSTICKYKEYS, 0, &sk, 0); + printf("sk.dwFlags = %lx\n", sk.dwFlags); + + return APISTATUS_NORMAL; +} + +INT Test_NtUserSystemParametersInfo(PTESTINFO pti) { HWND hWnd; hWnd = CreateTestWindow(); -// ASSERT(hWnd); + ASSERT(hWnd); Test_NtUserSystemParametersInfo_Params(pti); Test_NtUserSystemParametersInfo_fWinIni(pti); @@ -351,6 +367,8 @@ Test_SPI_GETSETBEEP(pti); Test_SPI_SETDESKWALLPAPER(pti); + Test_SPI_GETSTICKYKEYS(pti); + Test_SPI_87_88(pti); DestroyWindow(hWnd); Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Sat Dec 13 10:48:01 2008 @@ -8,15 +8,20 @@ #include "ntgdi/NtGdiArcInternal.c" #include "ntgdi/NtGdiBitBlt.c" +#include "ntgdi/NtGdiCombineRgn.c" #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" +#include "ntgdi/NtGdiCreateCompatibleDC.c" #include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiEngCreatePalette.c" //#include "ntgdi/NtGdiEnumFontChunk.c" #include "ntgdi/NtGdiEnumFontOpen.c" +//#include "ntgdi/NtGdiExtCreatePen.c" +#include "ntgdi/NtGdiFlushUserBatch.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetFontResourceInfoInternalW.c" #include "ntgdi/NtGdiGetRandomRgn.c" +#include "ntgdi/NtGdiPolyPolyDraw.c" #include "ntgdi/NtGdiSelectBitmap.c" #include "ntgdi/NtGdiSelectBrush.c" #include "ntgdi/NtGdiSelectFont.c" @@ -36,13 +41,18 @@ #include "ntuser/NtUserCallOneParam.c" #include "ntuser/NtUserCountClipboardFormats.c" //#include "ntuser/NtUserCreateWindowEx.c" +#include "ntuser/NtUserEnumDisplayMonitors.c" #include "ntuser/NtUserEnumDisplaySettings.c" #include "ntuser/NtUserFindExistingCursorIcon.c" +#include "ntuser/NtUserGetClassInfo.c" +#include "ntuser/NtUserGetTitleBarInfo.c" +#include "ntuser/NtUserProcessConnect.c" #include "ntuser/NtUserRedrawWindow.c" #include "ntuser/NtUserScrollDC.c" +#include "ntuser/NtUserSelectPalette.c" +#include "ntuser/NtUserSetTimer.c" #include "ntuser/NtUserSystemParametersInfo.c" #include "ntuser/NtUserToUnicodeEx.c" -#include "ntuser/NtUserGetTitleBarInfo.c" /* The List of tests */ TESTENTRY TestList[] = @@ -55,15 +65,20 @@ /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiBitBlt", Test_NtGdiBitBlt }, + { L"NtGdiCombineRgn", Test_NtGdiCombineRgn }, { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, + { L"NtGdiCreateCompatibleDC", Test_NtGdiCreateCompatibleDC }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, // { L"NtGdiEnumFontChunk", Test_NtGdiEnumFontChunk }, { L"NtGdiEnumFontOpen", Test_NtGdiEnumFontOpen }, +// { L"NtGdiExtCreatePen", Test_NtGdiExtCreatePen }, + { L"NtGdiFlushUserBatch", Test_NtGdiFlushUserBatch }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetFontResourceInfoInternalW", Test_NtGdiGetFontResourceInfoInternalW }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, + { L"NtGdiPolyPolyDraw", Test_NtGdiPolyPolyDraw }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, { L"NtGdiSetDIBitsToDeviceInternal", Test_NtGdiSetDIBitsToDeviceInternal }, { L"NtGdiSelectBitmap", Test_NtGdiSelectBitmap }, @@ -84,13 +99,18 @@ { L"NtUserCallOneParam", Test_NtUserCallOneParam }, { L"NtUserCountClipboardFormats", Test_NtUserCountClipboardFormats }, // { L"NtUserCreateWindowEx", Test_NtUserCreateWindowEx }, + { L"NtUserEnumDisplayMonitors", Test_NtUserEnumDisplayMonitors }, { L"NtUserEnumDisplaySettings", TEST_NtUserEnumDisplaySettings }, { L"NtUserFindExistingCursorIcon", Test_NtUserFindExistingCursoricon }, + { L"NtUserGetClassInfo", Test_NtUserGetClassInfo }, + { L"NtUserGetTitleBarInfo", Test_NtUserGetTitleBarInfo }, + { L"NtUserProcessConnect", Test_NtUserProcessConnect }, { L"NtUserRedrawWindow", Test_NtUserRedrawWindow }, { L"NtUserScrollDC", Test_NtUserScrollDC }, + { L"NtUserSelectPalette", Test_NtUserSelectPalette }, + { L"NtUserSetTimer", Test_NtUserSetTimer }, { L"NtUserSystemParametersInfo", Test_NtUserSystemParametersInfo }, { L"NtUserToUnicodeEx", Test_NtUserToUnicodeEx }, - { L"NtUserGetTitleBarInfo", Test_NtUserGetTitleBarInfo } }; /* The function that gives us the number of tests */

1 0

[dgorbachev] 38043: Remove workaround for GCC 4.4.0 bug, it is already fixed.
by dgorbachev＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: dgorbachev Date: Sat Dec 13 09:49:41 2008 New Revision: 38043 URL: http://svn.reactos.org/svn/reactos?rev=38043&view=rev Log: Remove workaround for GCC 4.4.0 bug, it is already fixed. Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sat Dec 13 09:49:41 2008 @@ -612,11 +612,7 @@ REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - - /* Workaround for GCC 4.4.0 bug #38271 */ - UNICODE_STRING ValueNameCopy = { 0, 0, NULL }; - ValueNameCopy = *ValueName; - + UNICODE_STRING ValueNameCopy = *ValueName; PAGED_CODE(); /* Verify that the handle is valid and is a registry key */

1 0

[dgorbachev] 38042: - Remove DBCSCodePage field from NLS_FILE_HEADER structure. - Make RtlInitCodePageTable function slightly clearer. - Fix IntIsLeadByte function (thanks to Gregor Schneider, bug #3944).
by dgorbachev＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: dgorbachev Date: Sat Dec 13 09:42:56 2008 New Revision: 38042 URL: http://svn.reactos.org/svn/reactos?rev=38042&view=rev Log: - Remove DBCSCodePage field from NLS_FILE_HEADER structure. - Make RtlInitCodePageTable function slightly clearer. - Fix IntIsLeadByte function (thanks to Gregor Schneider, bug #3944). Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Sat Dec 13 09:42:56 2008 @@ -1067,13 +1067,13 @@ WINAPI IntIsLeadByte(PCPTABLEINFO TableInfo, BYTE Byte) { - UINT LeadByteNo; + UINT i; if (TableInfo->MaximumCharacterSize == 2) { - for (LeadByteNo = 0; LeadByteNo < MAXIMUM_LEADBYTES; LeadByteNo++) - { - if (TableInfo->LeadByte[LeadByteNo] == Byte) + for (i = 0; i < MAXIMUM_LEADBYTES && TableInfo->LeadByte[i]; i += 2) + { + if (Byte >= TableInfo->LeadByte[i] && Byte <= TableInfo->LeadByte[i+1]) return TRUE; } } Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sat Dec 13 09:42:56 2008 @@ -1242,7 +1242,6 @@ USHORT UniDefaultChar; USHORT TransDefaultChar; USHORT TransUniDefaultChar; - USHORT DBCSCodePage; UCHAR LeadByte[MAXIMUM_LEADBYTES]; } NLS_FILE_HEADER, *PNLS_FILE_HEADER; Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=38042&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sat Dec 13 09:42:56 2008 @@ -144,13 +144,12 @@ OUT PCPTABLEINFO CodePageTable) { PNLS_FILE_HEADER NlsFileHeader; - PUSHORT Ptr; - USHORT Offset; DPRINT("RtlInitCodePageTable() called\n"); NlsFileHeader = (PNLS_FILE_HEADER)TableBase; + /* Copy header fields first */ CodePageTable->CodePage = NlsFileHeader->CodePage; CodePageTable->MaximumCharacterSize = NlsFileHeader->MaximumCharacterSize; CodePageTable->DefaultChar = NlsFileHeader->DefaultChar; @@ -162,35 +161,30 @@ &NlsFileHeader->LeadByte, MAXIMUM_LEADBYTES); - /* Set Pointer to start of multi byte table */ - Ptr = (PUSHORT)((ULONG_PTR)TableBase + 2 * NlsFileHeader->HeaderSize); - - /* Get offset to the wide char table */ - Offset = (USHORT)(*Ptr++) + NlsFileHeader->HeaderSize + 1; - - /* Set pointer to the multi byte table */ - CodePageTable->MultiByteTable = Ptr; - - /* Skip ANSI and OEM table */ - Ptr += 256; - if (*Ptr++) - Ptr += 256; - - /* Set pointer to DBCS ranges */ - CodePageTable->DBCSRanges = (PUSHORT)Ptr; - - if (*Ptr > 0) + /* Offset to wide char table is after the header */ + CodePageTable->WideCharTable = TableBase + NlsFileHeader->HeaderSize + 1 + + TableBase[NlsFileHeader->HeaderSize]; + + /* Then multibyte table (256 wchars) follows */ + CodePageTable->MultiByteTable = TableBase + NlsFileHeader->HeaderSize + 1; + + /* Check the presence of glyph table (256 wchars) */ + if (!CodePageTable->MultiByteTable[256]) + CodePageTable->DBCSRanges = CodePageTable->MultiByteTable + 256 + 1; + else + CodePageTable->DBCSRanges = CodePageTable->MultiByteTable + 256 + 1 + 256; + + /* Is this double-byte code page? */ + if (*CodePageTable->DBCSRanges) { CodePageTable->DBCSCodePage = 1; - CodePageTable->DBCSOffsets = (PUSHORT)++Ptr; + CodePageTable->DBCSOffsets = CodePageTable->DBCSRanges + 1; } else { CodePageTable->DBCSCodePage = 0; - CodePageTable->DBCSOffsets = 0; - } - - CodePageTable->WideCharTable = (PVOID)((ULONG_PTR)TableBase + 2 * Offset); + CodePageTable->DBCSOffsets = NULL; + } }

1 0

[ekohl] 38041: Do not start LSASS as a service but as an ordinary process because: 1) LSASS and the NetLogon service are not the same. 2) The service manager must wait for LSASS to finish initialization. If LSASS is started as a service we will have a classic deadlock scenario.
by ekohl＠svn.reactos.org 13 Dec '08

13 Dec '08

Author: ekohl Date: Sat Dec 13 08:47:07 2008 New Revision: 38041 URL: http://svn.reactos.org/svn/reactos?rev=38041&view=rev Log: Do not start LSASS as a service but as an ordinary process because: 1) LSASS and the NetLogon service are not the same. 2) The service manager must wait for LSASS to finish initialization. If LSASS is started as a service we will have a classic deadlock scenario. Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Sat Dec 13 08:47:07 2008 @@ -37,23 +37,6 @@ #define NDEBUG #include <debug.h> -static VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv); - -static SERVICE_TABLE_ENTRY ServiceTable[2] = -{ - {TEXT("NetLogon"), ServiceMain}, - {NULL, NULL} -}; - -static VOID CALLBACK -ServiceMain( - IN DWORD argc, - IN LPWSTR *argv) -{ - DPRINT("ServiceMain() called\n"); -} - INT WINAPI wWinMain( IN HINSTANCE hInstance, @@ -86,8 +69,6 @@ /* FIXME: More initialization */ - StartServiceCtrlDispatcher(ServiceTable); - DPRINT(" Done...\n"); ByeBye: Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Dec 13 08:47:07 2008 @@ -89,70 +89,39 @@ return TRUE; } -static BOOL -StartCustomService( - IN LPCWSTR ServiceName) -{ - SC_HANDLE hSCManager = NULL; - SC_HANDLE hService = NULL; - BOOL ret = FALSE; - - hSCManager = OpenSCManager(NULL, NULL, 0); - if (!hSCManager) - { - ERR("WL: Failed to OpenSCManager\n"); - goto cleanup; - } - - hService = OpenServiceW(hSCManager, ServiceName, SERVICE_START); - if (!hService) - { - ERR("WL: Failed to open the service\n"); - goto cleanup; - } - if (!StartServiceW(hService, 0, NULL)) - { - ERR("WL: Failed to start the service\n"); - goto cleanup; - } - - ret = TRUE; - -cleanup: - if (hService) - CloseServiceHandle(hService); - if (hSCManager) - CloseServiceHandle(hSCManager); - return ret; -} static BOOL StartLsass(VOID) { - HANDLE LsassInitEvent; - - LsassInitEvent = CreateEventW( - NULL, - TRUE, + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInformation; + LPCWSTR ServiceString = L"lsass.exe"; + BOOL res; + + /* Start the service control manager (services.exe) */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + + TRACE("WL: Creating new process - %S\n", ServiceString); + + res = CreateProcessW( + ServiceString, + NULL, + NULL, + NULL, FALSE, - L"Global\\SECURITY_SERVICES_STARTED"); - if (!LsassInitEvent) - { - ERR("WL: Failed to create lsass notification event (error %lu)\n", GetLastError()); - return FALSE; - } - - /* Start the local security authority subsystem (Netlogon service) */ - if (!StartCustomService(L"Netlogon")) - { - ERR("WL: Failed to start NetLogon service (error %lu)\n", GetLastError()); - return FALSE; - } - - WaitForSingleObject(LsassInitEvent, INFINITE); - CloseHandle(LsassInitEvent); - - return TRUE; + DETACHED_PROCESS, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + + return res; } BOOL Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 13 08:47:07 2008 @@ -968,12 +968,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001 ; NetLogon -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,"Net Logon" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Sets up a secure channel to a domain controller for domain authentication" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 +;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","DisplayName",0x00000000,"Net Logon" +;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Description",0x00000000,"Sets up a secure channel to a domain controller for domain authentication" +;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" +;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 +;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 @@ -1127,6 +1127,6 @@ HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+lsasrv,+advapi" ; EOF Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sat Dec 13 08:47:07 2008 @@ -14,19 +14,39 @@ LsapInitLsa(VOID) { HANDLE hEvent; + DWORD dwError; TRACE("LsapInitLsa()\n"); + /* Start the RPC server */ LsarStartRpcServer(); - hEvent = OpenEventW(EVENT_MODIFY_STATE, - FALSE, - L"Global\\SECURITY_SERVICES_STARTED"); - if (hEvent != NULL) + /* Notify the service manager */ + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) { - SetEvent(hEvent); - CloseHandle(hEvent); + dwError = GetLastError(); + TRACE("Failed to create the notication event (Error %lu)\n", dwError); + + if (dwError == ERROR_ALREADY_EXISTS) + { + hEvent = OpenEventW(GENERIC_WRITE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent != NULL) + { + ERR("Could not open the notification event!"); + } + } } + + SetEvent(hEvent); + + /* NOTE: Do not close the event handle!!!! */ + return STATUS_SUCCESS; }

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