Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 30457: last fixes for changelog
by dreimer＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: dreimer Date: Thu Nov 15 13:31:45 2007 New Revision: 30457 URL: http://svn.reactos.org/svn/reactos?rev=30457&view=rev Log: last fixes for changelog Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Nov 15 13:31:45 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 1.0 Released -- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) +- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, Mike Nordell) - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) - Updated: NASM to 0.99.06 (Daniel Reimer) - Updated: You can now select the components you want to install. (Daniel Reimer) @@ -41,15 +41,15 @@ - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. (Peter Ward) -- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' (Peter Ward) +- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll*' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) - (yes you can still specify the full path if you like) -- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this (Peter Ward) + (yes you can still specify the full path if you like) (Peter Ward) +- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this file can also be used outside of the RosBE to initialize and GCC/MinGW - in the current directory. + in the current directory. (Peter Ward) - Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) - Added a minimal replacement for tee. (Peter Ward) - Added ccache 2.4 to RosBE. (Daniel Reimer)

1 0

[dreimer] 30456: Byebye, Trailing Spaces
by dreimer＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: dreimer Date: Thu Nov 15 11:05:51 2007 New Revision: 30456 URL: http://svn.reactos.org/svn/reactos?rev=30456&view=rev Log: Byebye, Trailing Spaces Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Thu Nov 15 11:05:51 2007 @@ -237,7 +237,7 @@ echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" read -p "[no] " answer echo - + if [ "$answer" != "yes" ]; then echo "Please enter another directory!" installdir="" @@ -358,26 +358,26 @@ if $process_binutils; then rm -rf "binutils" rm -rf "binutils-build" - + echo -n "Extracting binutils... " tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" checkrun "tar" - + echo -n "Configuring binutils... " mkdir "binutils-build" cd "binutils-build" ../binutils/configure --prefix="$installdir" --target=mingw32 --disable-nls --with-gcc \ --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" checkrun "configure" - + echo -n "Building binutils... " $makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Installing binutils... " $makecmd install >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Cleaning up binutils... " cd "$SOURCEDIR" rm -rf "binutils-build" @@ -389,11 +389,11 @@ if $process_gcc; then rm -rf "gcc" rm -rf "gcc-build" - + echo -n "Extracting gcc... " tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" checkrun "tar" - + echo -n "Configuring gcc... " mkdir "gcc-build" cd "gcc-build" @@ -403,15 +403,15 @@ --enable-threads=win32 --disable-win32-registry --disable-nls \ --disable-shared >& "$SCRIPTDIR/configure.log" checkrun "configure" - + echo -n "Building gcc... " $makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Installing gcc... " $makecmd install >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Cleaning up gcc... " cd "$SOURCEDIR" rm -rf "gcc-build" @@ -423,11 +423,11 @@ if $process_make; then rm -rf "make" rm -rf "make-build" - + echo -n "Extracting make... " tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" checkrun "tar" - + echo -n "Configuring make... " mkdir "make-build" cd "make-build" @@ -436,15 +436,15 @@ --enable-case-insensitive-file-system --disable-job-server --disable-rpath \ --program-prefix=mingw32- >& "$SCRIPTDIR/configure.log" checkrun "configure" - + echo -n "Building make... " $makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Installing make... " $makecmd install >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Cleaning up make... " cd "$SOURCEDIR" rm -rf "make-build" @@ -456,25 +456,25 @@ if $process_nasm; then rm -rf "nasm" rm -rf "nasm-build" - + echo -n "Extracting nasm... " tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" checkrun "tar" - + echo -n "Configuring nasm... " mkdir "nasm-build" cd "nasm-build" ../nasm/configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" checkrun "configure" - + echo -n "Building nasm... " $makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Installing nasm... " $makecmd install >& "$SCRIPTDIR/make.log" checkrun "make" - + echo -n "Cleaning up nasm... " cd "$SOURCEDIR" rm -rf "nasm-build" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Thu Nov 15 11:05:51 2007 @@ -335,7 +335,7 @@ fp = fopen(shortcutfile, "r"); if (!fp) - { + { if(access(rosbeappdata, F_OK) == -1) { // Directory does not exist, create it @@ -344,7 +344,7 @@ fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); } } - + fp = fopen(shortcutfile, "w"); if (!fp) {

1 0

[weiden] 30455: Dereference callproc handles without a system call
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 08:42:44 2007 New Revision: 30455 URL: http://svn.reactos.org/svn/reactos?rev=30455&view=rev Log: Dereference callproc handles without a system call Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Thu Nov 15 08:42:44 2007 @@ -45,8 +45,9 @@ BOOL FASTCALL IsMetaFile(HDC); extern PW32PROCESSINFO g_pi; +extern PW32PROCESSINFO g_kpi; -static PVOID __inline +static __inline PVOID SharedPtrToUser(PVOID Ptr) { ASSERT(Ptr != NULL); @@ -55,7 +56,7 @@ return (PVOID)((ULONG_PTR)Ptr - g_pi->UserHeapDelta); } -static PVOID __inline +static __inline PVOID DesktopPtrToUser(PVOID Ptr) { PW32THREADINFO ti = GetW32ThreadInfo(); @@ -65,3 +66,13 @@ return (PVOID)((ULONG_PTR)Ptr - ti->DesktopHeapDelta); } +static __inline PVOID +SharedPtrToKernel(PVOID Ptr) +{ + ASSERT(Ptr != NULL); + ASSERT(g_pi != NULL); + ASSERT(g_pi->UserHeapDelta != 0); + return (PVOID)((ULONG_PTR)Ptr + g_pi->UserHeapDelta); +} + +PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Thu Nov 15 08:42:44 2007 @@ -200,7 +200,12 @@ typedef struct _USER_HANDLE_ENTRY { void *ptr; /* pointer to object */ - PW32THREADINFO pti; // pointer to Win32ThreadInfo + union + { + PVOID pi; + PW32THREADINFO pti; // pointer to Win32ThreadInfo + PW32PROCESSINFO ppi; // pointer to W32ProcessInfo + }; unsigned short type; /* object type (0 if free) */ unsigned short generation; /* generation counter */ } USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; @@ -214,6 +219,7 @@ } USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; extern PUSER_HANDLE_TABLE gHandleTable; +extern PUSER_HANDLE_ENTRY gHandleEntries; PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE); PVOID FASTCALL ValidateHandle(HANDLE, UINT); Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Thu Nov 15 08:42:44 2007 @@ -5,7 +5,9 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; PUSER_HANDLE_TABLE gHandleTable = NULL; -PW32PROCESSINFO g_pi = NULL; +PUSER_HANDLE_ENTRY gHandleEntries = NULL; +PW32PROCESSINFO g_pi = NULL; /* User Mode Pointer */ +PW32PROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ PW32PROCESSINFO GetW32ProcessInfo(VOID); @@ -56,7 +58,9 @@ (PVOID)User32CallHookProcFromKernel; g_pi = GetW32ProcessInfo(); + g_kpi = SharedPtrToKernel(g_pi); gHandleTable = SharedPtrToUser(g_pi->UserHandleTable); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Thu Nov 15 08:42:44 2007 @@ -314,23 +314,23 @@ FASTCALL GetUser32Handle(HANDLE handle) { - PUSER_HANDLE_TABLE ht = gHandleTable; - USHORT generation; - - TRACE("Main Handle Table %x\n", ht); - - INT Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; - - if (Index < 0 || Index >= ht->nb_handles) return NULL; - - if (!ht->handles[Index].type) return NULL; - - generation = (UINT)handle >> 16; - - if (generation == ht->handles[Index].generation || !generation || generation == 0xffff) - return &ht->handles[Index]; - - return NULL; + INT Index; + USHORT generation; + + Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + + if (Index < 0 || Index >= gHandleTable->nb_handles) + return NULL; + + if (!gHandleEntries[Index].type || !gHandleEntries[Index].ptr) + return NULL; + + generation = (UINT)handle >> 16; + + if (generation == gHandleEntries[Index].generation || !generation || generation == 0xffff) + return &gHandleEntries[Index]; + + return NULL; } /* @@ -345,8 +345,8 @@ TRUE, /* VALIDATE_TYPE_MWPOS */ TRUE, /* VALIDATE_TYPE_HOOK */ FALSE, /* (not used) */ - FALSE, /* VALIDATE_TYPE_CALLPROC */ - FALSE, /* VALIDATE_TYPE_ACCEL */ + TRUE, /* VALIDATE_TYPE_CALLPROC */ + TRUE, /* VALIDATE_TYPE_ACCEL */ FALSE, /* (not used) */ FALSE, /* (not used) */ FALSE, /* (not used) */ @@ -361,6 +361,7 @@ ValidateHandle(HANDLE handle, UINT uType) { PVOID ret; + PUSER_HANDLE_ENTRY pEntry; PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(uType <= VALIDATE_TYPE_MONITOR); @@ -372,13 +373,13 @@ if (handle == ClientInfo->hWND) return ClientInfo->pvWND; } - PUSER_HANDLE_ENTRY pEntry = GetUser32Handle(handle); + pEntry = GetUser32Handle(handle); if (pEntry && uType == 0) uType = pEntry->type; // Must have an entry and must be the same type! - if ( (!pEntry) || (pEntry->type != uType) ) + if ( (!pEntry) || (pEntry->type != uType) || !pEntry->ptr ) { switch ( uType ) { // Test (with wine too) confirms these results! @@ -406,8 +407,6 @@ } return NULL; } - - if (!(NtUserValidateHandleSecure(handle, FALSE))) return NULL; if (g_ObjectHeapTypeShared[uType]) ret = SharedPtrToUser(pEntry->ptr); @@ -427,3 +426,17 @@ return ret; } + +// +// Validate callproc handle and return the pointer to the object. +// +PCALLPROC +FASTCALL +ValidateCallProc(HANDLE hCallProc) +{ + PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); + if (CallProc != NULL && CallProc->pi == g_kpi) + return CallProc; + + return NULL; +} Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Thu Nov 15 08:42:44 2007 @@ -1233,27 +1233,29 @@ WPARAM wParam, LPARAM lParam) { - WNDPROC_INFO wpInfo; - - if (lpPrevWndFunc == NULL) - { - WARN("CallWindowProcA: lpPrevWndFunc == NULL!\n"); - return 0; - } - - if (!IsCallProcHandle(lpPrevWndFunc)) - return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); - else - { - if (NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, - &wpInfo)) - return IntCallWindowProcA(!wpInfo.IsUnicode, wpInfo.WindowProc, - hWnd, Msg, wParam, lParam); - else - { - WARN("CallWindowProcA: can not dereference WndProcHandle\n"); - return 0; - } + PCALLPROC CallProc; + + if (lpPrevWndFunc == NULL) + { + WARN("CallWindowProcA: lpPrevWndFunc == NULL!\n"); + return 0; + } + + if (!IsCallProcHandle(lpPrevWndFunc)) + return IntCallWindowProcA(TRUE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + else + { + CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); + if (CallProc != NULL) + { + return IntCallWindowProcA(!CallProc->Unicode, CallProc->WndProc, + hWnd, Msg, wParam, lParam); + } + else + { + WARN("CallWindowProcA: can not dereference WndProcHandle\n"); + return 0; + } } } @@ -1268,29 +1270,31 @@ WPARAM wParam, LPARAM lParam) { - WNDPROC_INFO wpInfo; - - /* FIXME - can the first parameter be NULL? */ - if (lpPrevWndFunc == NULL) - { - WARN("CallWindowProcA: lpPrevWndFunc == NULL!\n"); - return 0; - } - - if (!IsCallProcHandle(lpPrevWndFunc)) - return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); - else - { - if (NtUserDereferenceWndProcHandle((HANDLE)lpPrevWndFunc, - &wpInfo)) - return IntCallWindowProcW(!wpInfo.IsUnicode, wpInfo.WindowProc, - hWnd, Msg, wParam, lParam); - else - { - WARN("CallWindowProcW: can not dereference WndProcHandle\n"); - return 0; - } - } + PCALLPROC CallProc; + + /* FIXME - can the first parameter be NULL? */ + if (lpPrevWndFunc == NULL) + { + WARN("CallWindowProcA: lpPrevWndFunc == NULL!\n"); + return 0; + } + + if (!IsCallProcHandle(lpPrevWndFunc)) + return IntCallWindowProcW(FALSE, lpPrevWndFunc, hWnd, Msg, wParam, lParam); + else + { + CallProc = ValidateCallProc((HANDLE)lpPrevWndFunc); + if (CallProc != NULL) + { + return IntCallWindowProcW(!CallProc->Unicode, CallProc->WndProc, + hWnd, Msg, wParam, lParam); + } + else + { + WARN("CallWindowProcW: can not dereference WndProcHandle\n"); + return 0; + } + } } Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h Thu Nov 15 08:42:44 2007 @@ -20,7 +20,12 @@ typedef struct _USER_HANDLE_ENTRY { void *ptr; /* pointer to object */ - PW32THREADINFO pti; // pointer to Win32ThreadInfo + union + { + PVOID pi; + PW32THREADINFO pti; // pointer to Win32ThreadInfo + PW32PROCESSINFO ppi; // pointer to W32ProcessInfo + }; unsigned short type; /* object type (0 if free) */ unsigned short generation; /* generation counter */ } USER_HANDLE_ENTRY, * PUSER_HANDLE_ENTRY; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Thu Nov 15 08:42:44 2007 @@ -108,12 +108,43 @@ ret = entry->ptr; entry->ptr = ht->freelist; entry->type = 0; - entry->pti = 0; + entry->pi = NULL; ht->freelist = entry; usedHandles--; return ret; +} + +static __inline PVOID +UserHandleOwnerByType(USER_OBJECT_TYPE type) +{ + PVOID pi; + + switch (type) + { + case otWindow: + pi = GetW32ThreadInfo(); + break; + + case otMenu: + case otCursorIcon: + case otHook: + case otCallProc: + case otAccel: + pi = GetW32ProcessInfo(); + break; + + case otMonitor: + pi = NULL; /* System */ + break; + + default: + pi = NULL; + break; + } + + return pi; } /* allocate a user handle for a given object */ @@ -124,8 +155,7 @@ return 0; entry->ptr = object; entry->type = type; - entry->pti = GetW32ThreadInfo(); - if (entry->pti->pi->UserHandleTable == NULL) GetW32ProcessInfo(); + entry->pi = UserHandleOwnerByType(type); if (++entry->generation >= 0xffff) entry->generation = 1; return entry_to_handle(ht, entry );

1 0

[weiden] 30454: Forgot to commit this
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 06:09:44 2007 New Revision: 30454 URL: http://svn.reactos.org/svn/reactos?rev=30454&view=rev Log: Forgot to commit this Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Thu Nov 15 06:09:44 2007 @@ -44,3 +44,24 @@ LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); +extern PW32PROCESSINFO g_pi; + +static PVOID __inline +SharedPtrToUser(PVOID Ptr) +{ + ASSERT(Ptr != NULL); + ASSERT(g_pi != NULL); + ASSERT(g_pi->UserHeapDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - g_pi->UserHeapDelta); +} + +static PVOID __inline +DesktopPtrToUser(PVOID Ptr) +{ + PW32THREADINFO ti = GetW32ThreadInfo(); + ASSERT(Ptr != NULL); + ASSERT(ti != NULL); + ASSERT(ti->DesktopHeapDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - ti->DesktopHeapDelta); +} +

1 0

[weiden] 30453: Translate pointers in ValidateHandle to the user mode mapping
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 06:08:46 2007 New Revision: 30453 URL: http://svn.reactos.org/svn/reactos?rev=30453&view=rev Log: Translate pointers in ValidateHandle to the user mode mapping Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Thu Nov 15 06:08:46 2007 @@ -5,7 +5,10 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; PUSER_HANDLE_TABLE gHandleTable = NULL; +PW32PROCESSINFO g_pi = NULL; +PW32PROCESSINFO +GetW32ProcessInfo(VOID); PUSER32_THREAD_DATA User32GetThreadData() @@ -51,11 +54,10 @@ (PVOID)User32SetupDefaultCursors; NtCurrentTeb()->ProcessEnvironmentBlock->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = (PVOID)User32CallHookProcFromKernel; - { - PW32THREADINFO ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; - PW32PROCESSINFO pi = ti->pi; - gHandleTable = (PUSER_HANDLE_TABLE) pi->UserHandleTable; - } + + g_pi = GetW32ProcessInfo(); + gHandleTable = SharedPtrToUser(g_pi->UserHandleTable); + /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); if (User32TlsIndex != TLS_OUT_OF_INDEXES) Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Thu Nov 15 06:08:46 2007 @@ -333,6 +333,26 @@ return NULL; } +/* + * Decide whether an object is located on the desktop or shared heap + */ +static const BOOL g_ObjectHeapTypeShared[VALIDATE_TYPE_MONITOR + 1] = +{ + FALSE, /* VALIDATE_TYPE_FREE (not used) */ + FALSE, /* VALIDATE_TYPE_WIN */ + TRUE, /* VALIDATE_TYPE_MENU */ + TRUE, /* VALIDATE_TYPE_CURSOR */ + TRUE, /* VALIDATE_TYPE_MWPOS */ + TRUE, /* VALIDATE_TYPE_HOOK */ + FALSE, /* (not used) */ + FALSE, /* VALIDATE_TYPE_CALLPROC */ + FALSE, /* VALIDATE_TYPE_ACCEL */ + FALSE, /* (not used) */ + FALSE, /* (not used) */ + FALSE, /* (not used) */ + TRUE /* VALIDATE_TYPE_MONITOR */ +}; + // // Validate Handle and return the pointer to the object. // @@ -340,14 +360,22 @@ FASTCALL ValidateHandle(HANDLE handle, UINT uType) { + PVOID ret; PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + ASSERT(uType <= VALIDATE_TYPE_MONITOR); + ASSERT(ClientInfo != NULL); + + /* See if we have the handle cached still */ if (uType == VALIDATE_TYPE_WIN) { if (handle == ClientInfo->hWND) return ClientInfo->pvWND; } PUSER_HANDLE_ENTRY pEntry = GetUser32Handle(handle); + + if (pEntry && uType == 0) + uType = pEntry->type; // Must have an entry and must be the same type! if ( (!pEntry) || (pEntry->type != uType) ) @@ -374,13 +402,28 @@ break; default: SetLastError(ERROR_INVALID_HANDLE); + break; } return NULL; } if (!(NtUserValidateHandleSecure(handle, FALSE))) return NULL; - return pEntry->ptr; -} - - + if (g_ObjectHeapTypeShared[uType]) + ret = SharedPtrToUser(pEntry->ptr); + else + ret = DesktopPtrToUser(pEntry->ptr); + + /* Update the cache */ +#if 0 + /* FIXME: To enable this win32k needs to check this information when destroying + the window handle and clear it out of the ClientInfo structure! */ + if (uType == VALIDATE_TYPE_WIN) + { + ClientInfo->hWND = handle; + ClientInfo->pvWND = ret; + } +#endif + + return ret; +}

1 0

[weiden] 30452: Expose the pointer to the shared heap and the delta to the user mode mapping
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 05:23:41 2007 New Revision: 30452 URL: http://svn.reactos.org/svn/reactos?rev=30452&view=rev Log: Expose the pointer to the shared heap and the delta to the user mode mapping Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Nov 15 05:23:41 2007 @@ -58,6 +58,8 @@ typedef struct _W32PROCESSINFO { PVOID UserHandleTable; + HANDLE hUserHeap; + ULONG_PTR UserHeapDelta; HINSTANCE hModUser; PWINDOWCLASS LocalClassList; PWINDOWCLASS GlobalClassList; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Thu Nov 15 05:23:41 2007 @@ -2494,6 +2494,9 @@ /* initialize it */ pi->UserHandleTable = gHandleTable; + pi->hUserHeap = W32Process->HeapMappings.KernelMapping; + pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - + (ULONG_PTR)W32Process->HeapMappings.UserMapping; if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, pi,

1 0

[jimtabor] 30451: Fix define from wine.
by jimtabor＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: jimtabor Date: Thu Nov 15 04:28:26 2007 New Revision: 30451 URL: http://svn.reactos.org/svn/reactos?rev=30451&view=rev Log: Fix define from wine. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Thu Nov 15 04:28:26 2007 @@ -258,6 +258,7 @@ UserDrawCaptionButton(&WindowRect, Style, ExStyle, hDC, bDown, Type); } +#define DCX_USESTYLE 0x00010000 /* * FIXME: * - Drawing of WS_BORDER after scrollbars @@ -276,7 +277,7 @@ Style = GetWindowLongW(hWnd, GWL_STYLE); - hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | 0x10000); + hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE); if (hDC == 0) { return 0;

1 0

[weiden] 30450: Delete all GLDCDATA structures in wglDeleteContext that share the same ICD
by weiden＠svn.reactos.org 15 Nov '07

15 Nov '07

Author: weiden Date: Thu Nov 15 03:13:57 2007 New Revision: 30450 URL: http://svn.reactos.org/svn/reactos?rev=30450&view=rev Log: Delete all GLDCDATA structures in wglDeleteContext that share the same ICD Modified: trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c Thu Nov 15 03:13:57 2007 @@ -521,11 +521,8 @@ return FALSE; /* FIXME: do we have to expect such an error and handle it? */ } - icd->refcount--; - if (icd->refcount == 0) -// if (0) + if (--icd->refcount == 0) ret = OPENGL32_UnloadDriver( icd ); - /* FIXME: InitializeICD crashes when called a second time */ /* release mutex */ if (!ReleaseMutex( OPENGL32_processdata.driver_mutex )) Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c Thu Nov 15 03:13:57 2007 @@ -122,7 +122,7 @@ */ static GLRC * -ROSGL_NewContext() +ROSGL_NewContext(void) { GLRC *glrc; @@ -136,6 +136,51 @@ return glrc; } +/*! \brief Delete all GLDCDATA with this IDC + * + * \param icd [IN] Pointer to a ICD + */ +static +VOID +ROSGL_DeleteDCDataForICD( GLDRIVERDATA *icd ) +{ + GLDCDATA *p, **pptr; + + /* synchronize */ + if (WaitForSingleObject( OPENGL32_processdata.dcdata_mutex, INFINITE ) == + WAIT_FAILED) + { + DBGPRINT( "Error: WaitForSingleObject() failed (%d)", GetLastError() ); + return; + } + + p = OPENGL32_processdata.dcdata_list; + pptr = &OPENGL32_processdata.dcdata_list; + while (p != NULL) + { + if (p->icd == icd) + { + *pptr = p->next; + OPENGL32_UnloadICD( p->icd ); + + if (!HeapFree( GetProcessHeap(), 0, p )) + DBGPRINT( "Warning: HeapFree() on GLDCDATA failed (%d)", + GetLastError() ); + + p = *pptr; + } + else + { + pptr = &p->next; + p = p->next; + } + } + + /* release mutex */ + if (!ReleaseMutex( OPENGL32_processdata.dcdata_mutex )) + DBGPRINT( "Error: ReleaseMutex() failed (%d)", GetLastError() ); +} + /*! \brief Delete a GL Context (GLRC) and remove it from the list * @@ -150,7 +195,7 @@ { /* unload icd */ if (glrc->icd != NULL) - OPENGL32_UnloadICD( glrc->icd ); + ROSGL_DeleteDCDataForICD( glrc->icd ); /* remove from list */ ROSGL_RemoveContext( glrc );

1 0

[tkreuzer] 30449: Release keyboard modifiers in KeybardThreadMain on KEY_BREAK. Fixes bug 2751. I think the whole handling of modifiers is still pretty hackish and could need some improvement. See issue #2751 for more details.
by tkreuzer＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: tkreuzer Date: Thu Nov 15 02:28:18 2007 New Revision: 30449 URL: http://svn.reactos.org/svn/reactos?rev=30449&view=rev Log: Release keyboard modifiers in KeybardThreadMain on KEY_BREAK. Fixes bug 2751. I think the whole handling of modifiers is still pretty hackish and could need some improvement. See issue #2751 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Nov 15 02:28:18 2007 @@ -586,8 +586,8 @@ return; //(Status); } - /* Set LastInputTick */ - IntLastInputTick(TRUE); + /* Set LastInputTick */ + IntLastInputTick(TRUE); /* Update modifier state */ fsModifiers = IntKeyboardGetModifiers(&KeyInput); @@ -597,6 +597,22 @@ if (KeyInput.Flags & KEY_BREAK) { ModifierState &= ~fsModifiers; + if(fsModifiers == MOD_ALT) + { + if(KeyInput.Flags & KEY_E0) + { + gQueueKeyStateTable[VK_RMENU] = 0; + } + else + { + gQueueKeyStateTable[VK_LMENU] = 0; + } + if (gQueueKeyStateTable[VK_RMENU] == 0 && + gQueueKeyStateTable[VK_LMENU] == 0) + { + gQueueKeyStateTable[VK_MENU] = 0; + } + } } else { @@ -612,7 +628,7 @@ bLeftAlt = FALSE; if(fsModifiers == MOD_ALT) { - if(KeyInput.Flags & KEY_E1) + if(KeyInput.Flags & KEY_E0) { gQueueKeyStateTable[VK_RMENU] = 0x80; }

1 0

[jimtabor] 30448: Removed code support for dcattr, it was over kill. Fix display locks, take resource from GdiDevice. If pDc_Attr zero, use internal. Fix mass exit error when freeing already freed handle.
by jimtabor＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: jimtabor Date: Thu Nov 15 01:53:19 2007 New Revision: 30448 URL: http://svn.reactos.org/svn/reactos?rev=30448&view=rev Log: Removed code support for dcattr, it was over kill. Fix display locks, take resource from GdiDevice. If pDc_Attr zero, use internal. Fix mass exit error when freeing already freed handle. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Nov 15 01:53:19 2007 @@ -86,19 +86,16 @@ HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); -VOID FASTCALL DC_LockDisplay(PERESOURCE); -VOID FASTCALL DC_UnlockDisplay(PERESOURCE); +VOID FASTCALL DC_LockDisplay(HDC); +VOID FASTCALL DC_UnlockDisplay(HDC); VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); -BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG); BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC, FLONG); BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC, FLONG); -BOOL FASTCALL DCU_SyncDcAttrtoW32k(PDC, FLONG); -BOOL FASTCALL DCU_SynchDcAttrtoW32k(HDC, FLONG); VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c Thu Nov 15 01:53:19 2007 @@ -589,6 +589,8 @@ NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { PDC dc = DC_LockDc(hDC); + PDC_ATTR Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if (dc == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -599,8 +601,8 @@ { NTSTATUS Status = STATUS_SUCCESS; POINT SafePoint; - SafePoint.x = dc->Dc_Attr.ptlBrushOrigin.x; - SafePoint.y = dc->Dc_Attr.ptlBrushOrigin.y; + SafePoint.x = Dc_Attr->ptlBrushOrigin.x; + SafePoint.y = Dc_Attr->ptlBrushOrigin.y; _SEH_TRY { ProbeForWrite(Point, @@ -621,36 +623,9 @@ return FALSE; } } - - dc->Dc_Attr.ptlBrushOrigin.x = XOrg; - dc->Dc_Attr.ptlBrushOrigin.y = YOrg; - - if (dc->pDc_Attr) - { - PDC_ATTR Dc_Attr = dc->pDc_Attr; - NTSTATUS Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - Dc_Attr->ptlBrushOrigin = dc->Dc_Attr.ptlBrushOrigin; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } + Dc_Attr->ptlBrushOrigin.x = XOrg; + Dc_Attr->ptlBrushOrigin.y = YOrg; DC_UnlockDc(dc); - return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Nov 15 01:53:19 2007 @@ -2528,7 +2528,6 @@ PDC pDC = DC_LockDc(DCToFree); if (pDC->pDc_Attr == &pDC->Dc_Attr) return; // Internal DC object! pDC->pDc_Attr = NULL; -// pDC->pDc_Attr = &pDC->Dc_Attr; // Correct behavior. DC_UnlockDc(pDC); KeEnterCriticalRegion(); @@ -2556,10 +2555,18 @@ DC_FreeDC(HDC DCToFree) { DC_FreeDcAttr(DCToFree); - - if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) - { - DPRINT("DC_FreeDC failed\n"); + INT Index = GDI_HANDLE_GET_INDEX(DCToFree); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + if ((Entry->Type & ~GDI_ENTRY_REUSE_MASK) != 0 && Entry->KernelData != NULL) + { + if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) + { + DPRINT1("DC_FreeDC failed\n"); + } + } + else + { + DPRINT1("Attempted to Delete 0x%x currently being destroyed!!!\n",DCToFree); } } @@ -2655,21 +2662,31 @@ // // Support multi display/device locks. -// Here, it is PrimarySurface.hsemDevLock -// or ((PGDIDEVICE)PDC->pPDev)->hsemDevLock // VOID FASTCALL -DC_LockDisplay(PERESOURCE Resource) -{ +DC_LockDisplay(HDC hDC) +{ + PERESOURCE Resource; + PDC dc = DC_LockDc(hDC); + if (!dc) return; + Resource = ((PGDIDEVICE)dc->pPDev)->hsemDevLock; + DC_UnlockDc(dc); + if (!Resource) return; KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite( Resource , TRUE); } VOID FASTCALL -DC_UnlockDisplay(PERESOURCE Resource) -{ +DC_UnlockDisplay(HDC hDC) +{ + PERESOURCE Resource; + PDC dc = DC_LockDc(hDC); + if (!dc) return; + Resource = ((PGDIDEVICE)dc->pPDev)->hsemDevLock; + DC_UnlockDc(dc); + if (!Resource) return; ExReleaseResourceLite( Resource ); KeLeaveCriticalRegion(); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Nov 15 01:53:19 2007 @@ -52,160 +52,19 @@ XForm2MatrixS( &Dc_Attr->mxWorldToPage, &dc->w.xformWorld2Wnd); } -static -VOID -CopyFromUserDcAttr(PDC dc, PDC_ATTR Dc_Attr, FLONG Dirty) -{ - if ( (Dirty & DIRTY_FILL) || (Dc_Attr->ulDirty_ & DIRTY_FILL)) - { - dc->Dc_Attr.ulBrushClr = Dc_Attr->ulBrushClr; - dc->Dc_Attr.crBrushClr = Dc_Attr->crBrushClr; - Dc_Attr->ulDirty_ &= ~DIRTY_FILL; - } - if ( Dirty & DIRTY_LINE || (Dc_Attr->ulDirty_ & DIRTY_LINE)) - { - dc->Dc_Attr.crBackgroundClr = Dc_Attr->crBackgroundClr; - dc->Dc_Attr.ulBackgroundClr = Dc_Attr->ulBackgroundClr; - dc->Dc_Attr.ulPenClr = Dc_Attr->ulPenClr; - dc->Dc_Attr.crPenClr = Dc_Attr->crPenClr; - Dc_Attr->ulDirty_ &= ~DIRTY_LINE; - } - if ( Dirty & DIRTY_TEXT || (Dc_Attr->ulDirty_ & DIRTY_TEXT)) - { - dc->Dc_Attr.crForegroundClr = Dc_Attr->crForegroundClr; - dc->Dc_Attr.ulForegroundClr = Dc_Attr->ulForegroundClr; - Dc_Attr->ulDirty_ &= ~DIRTY_TEXT; - } - - if ( Dirty & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY) || - (Dc_Attr->ulDirty_ & (DC_MODE_DIRTY|DC_FONTTEXT_DIRTY))) - { - dc->Dc_Attr.jROP2 = Dc_Attr->jROP2; - dc->Dc_Attr.iGraphicsMode = Dc_Attr->iGraphicsMode; - dc->Dc_Attr.lFillMode = Dc_Attr->lFillMode; - dc->Dc_Attr.flFontMapper = Dc_Attr->flFontMapper; - dc->Dc_Attr.lBreakExtra = Dc_Attr->lBreakExtra; - dc->Dc_Attr.cBreak = Dc_Attr->cBreak; - } -} - -static -BOOL -ReadWriteVMDcAttr(PDC dc, FLONG Dirty, BOOL Write) -{ - BOOL Ret = FALSE; - KeEnterCriticalRegion(); - { - INT Index = GDI_HANDLE_GET_INDEX(dc->hHmgr); - PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; - HANDLE ProcessId = (HANDLE)(((ULONG_PTR)(Entry->ProcessId)) & ~1); - DC_ATTR lDc_AttrData; - - if(Entry->UserData) - { - NTSTATUS Status = ZwReadVirtualMemory ( ProcessId, - &(Entry->UserData), - &lDc_AttrData, - sizeof(DC_ATTR), - NULL ); - if (Write) - { - if (NT_SUCCESS(Status)) CopytoUserDcAttr(dc, &lDc_AttrData, Dirty); - Ret = TRUE; - } - else - { - if (NT_SUCCESS(Status)) CopyFromUserDcAttr(dc, &lDc_AttrData, Dirty); - Ret = TRUE; - } - if (Write) - Status = ZwWriteVirtualMemory ( ProcessId, - &(Entry->UserData), - &lDc_AttrData, - sizeof(DC_ATTR), - NULL ); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - Ret = FALSE; - } - } - } - KeLeaveCriticalRegion(); - return Ret; -} - - -BOOL -FASTCALL -DCU_UpdateUserXForms(PDC pDC, ULONG uMask) -{ - PDC_ATTR DC_Attr = pDC->pDc_Attr; - - if (!uMask) return FALSE; - - if (!DC_Attr) return FALSE; - else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForWrite(DC_Attr, - sizeof(DC_ATTR), - 1); - if (uMask & WORLD_XFORM_CHANGED) - XForm2MatrixS( &DC_Attr->mxWorldToDevice, &pDC->w.xformWorld2Vport); - - if (uMask & DEVICE_TO_WORLD_INVALID) - XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &pDC->w.xformVport2World); - - if (uMask & WORLD_TO_PAGE_IDENTITY) - XForm2MatrixS( &DC_Attr->mxWorldToPage, &pDC->w.xformWorld2Wnd); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - } - return TRUE; -} BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC dc, FLONG Dirty) { - BOOL TryHarder = FALSE; PDC_ATTR Dc_Attr = dc->pDc_Attr; if (!Dirty) return FALSE; + + if (Dc_Attr == ((PDC_ATTR)&dc->Dc_Attr)) return TRUE; // No need to copy self. + if (!Dc_Attr) return FALSE; else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - CopytoUserDcAttr( dc, Dc_Attr, Dirty); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) TryHarder = TRUE; - if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, TRUE); - } + CopytoUserDcAttr( dc, Dc_Attr, Dirty); return TRUE; } @@ -220,45 +79,4 @@ return Ret; } -BOOL -FASTCALL -DCU_SyncDcAttrtoW32k(PDC dc, FLONG Dirty) -{ - BOOL TryHarder = FALSE; - PDC_ATTR Dc_Attr = dc->pDc_Attr; - if (!Dirty) return FALSE; - if (!Dc_Attr) return FALSE; - else - { - NTSTATUS Status = STATUS_SUCCESS; - KeEnterCriticalRegion(); - _SEH_TRY - { - ProbeForRead(Dc_Attr, - sizeof(DC_ATTR), - 1); - CopyFromUserDcAttr( dc, Dc_Attr, Dirty); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - KeLeaveCriticalRegion(); - if(!NT_SUCCESS(Status)) TryHarder = TRUE; - if (TryHarder) return ReadWriteVMDcAttr( dc, Dirty, FALSE); - } - return TRUE; -} -BOOL -FASTCALL -DCU_SynchDcAttrtoW32k(HDC hDC, FLONG Dirty) -{ - PDC pDC = DC_LockDc ( hDC ); - if (!pDC) return FALSE; - BOOL Ret = DCU_SyncDcAttrtoW32k(pDC, Dirty); - DC_UnlockDc( pDC ); - return Ret; -} - Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Thu Nov 15 01:53:19 2007 @@ -3348,34 +3348,15 @@ DWORD cscp = IntGdiGetCharSet(hDC); // If here, update everything! Dc = DC_LockDc(hDC); + PDC_ATTR Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (!Dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - - Dc->Dc_Attr.iCS_CP = cscp; - Dc->Dc_Attr.ulDirty_ &= ~DIRTY_CHARSET; - - if (Dc->pDc_Attr) - { - PDC_ATTR Dc_Attr = Dc->pDc_Attr; - NTSTATUS Status = STATUS_SUCCESS; - _SEH_TRY - { - ProbeForWrite(Dc_Attr, - sizeof(DC_ATTR), - 1); - Dc_Attr->iCS_CP = cscp; - Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) SetLastNtError(Status); - } + Dc_Attr->iCS_CP = cscp; + Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; DC_UnlockDc( Dc ); return cscp; }

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