Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 42751: - Move GetCharacterPlacement functions into new locations. Implemented GetCharacterPlacementA from wine port. - Port from wine, original authors: Juergen Schmied <juergen.schmied@metronet.de>, Peter Oberndorfer <kumbayo84@arcor.de>
by jimtabor＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: jimtabor Date: Mon Aug 17 03:34:20 2009 New Revision: 42751 URL: http://svn.reactos.org/svn/reactos?rev=42751&view=rev Log: - Move GetCharacterPlacement functions into new locations. Implemented GetCharacterPlacementA from wine port. - Port from wine, original authors: Juergen Schmied <juergen.schmied(a)metronet.de>, Peter Oberndorfer <kumbayo84(a)arcor.de> Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -12,28 +12,6 @@ #include "precomp.h" #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); - - - - -/* - * @unimplemented - */ -DWORD -WINAPI -GetCharacterPlacementA( - HDC hDc, - LPCSTR a1, - int a2, - int a3, - LPGCP_RESULTSA a4, - DWORD a5 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -425,6 +425,58 @@ return IntEnumFontFamilies(hdc, &LogFont, lpEnumFontFamProc, lParam, FALSE); } + +/* + * @implemented + */ +DWORD +WINAPI +GetCharacterPlacementA( + HDC hdc, + LPCSTR lpString, + INT uCount, + INT nMaxExtent, + GCP_RESULTSA *lpResults, + DWORD dwFlags) +{ + WCHAR *lpStringW; + INT uCountW; + GCP_RESULTSW resultsW; + DWORD ret; + UINT font_cp; + + if ( !lpString || uCount <= 0 || (nMaxExtent < 0 && nMaxExtent != -1 ) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } +/* TRACE("%s, %d, %d, 0x%08x\n", + debugstr_an(lpString, uCount), uCount, nMaxExtent, dwFlags); +*/ + /* both structs are equal in size */ + memcpy(&resultsW, lpResults, sizeof(resultsW)); + + lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW, &font_cp); + if(lpResults->lpOutString) + resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW); + + ret = GetCharacterPlacementW(hdc, lpStringW, uCountW, nMaxExtent, &resultsW, dwFlags); + + lpResults->nGlyphs = resultsW.nGlyphs; + lpResults->nMaxFit = resultsW.nMaxFit; + + if(lpResults->lpOutString) { + WideCharToMultiByte(font_cp, 0, resultsW.lpOutString, uCountW, + lpResults->lpOutString, uCount, NULL, NULL ); + } + + HeapFree(GetProcessHeap(), 0, lpStringW); + HeapFree(GetProcessHeap(), 0, resultsW.lpOutString); + + return ret; +} + + /* * @implemented */ @@ -505,6 +557,47 @@ ret = MAKELONG(size.cx, size.cy); return ret; +} + +DWORD +WINAPI +NewGetCharacterPlacementW( + HDC hdc, + LPCWSTR lpString, + INT uCount, + INT nMaxExtent, + GCP_RESULTSW *lpResults, + DWORD dwFlags + ) +{ + INT nSet; + SIZE Size = {0,0}; + + if ( !lpString || uCount <= 0 || (nMaxExtent < 0 && nMaxExtent != -1 ) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if ( !lpResults ) + { + if ( GetTextExtentPointW(hdc, lpString, uCount, &Size) ) + { + return MAKELONG(Size.cx, Size.cy); + } + return 0; + } + + nSet = uCount; + if ( nSet > lpResults->nGlyphs ) + nSet = lpResults->nGlyphs; + + return NtGdiGetCharacterPlacementW( hdc, + (LPWSTR)lpString, + nSet, + nMaxExtent, + lpResults, + dwFlags); } /* Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -215,6 +215,23 @@ ExFreePoolWithTag(SafeFileName.Buffer, TAG_STRING); return Ret; +} + + /* + * @unimplemented + */ +DWORD +APIENTRY +NtGdiGetCharacterPlacementW( + IN HDC hdc, + IN LPWSTR pwsz, + IN INT nCount, + IN INT nMaxExtent, + IN OUT LPGCP_RESULTSW pgcpw, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return 0; } DWORD Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Mon Aug 17 03:34:20 2009 @@ -1164,23 +1164,6 @@ /* * @unimplemented */ -DWORD -APIENTRY -NtGdiGetCharacterPlacementW( - IN HDC hdc, - IN LPWSTR pwsz, - IN INT nCount, - IN INT nMaxExtent, - IN OUT LPGCP_RESULTSW pgcpw, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiGetCharWidthInfo(

1 0

[jimtabor] 42750: - Add callback for client side thread startup. This is for bug 4785.
by jimtabor＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: jimtabor Date: Mon Aug 17 02:30:25 2009 New Revision: 42750 URL: http://svn.reactos.org/svn/reactos?rev=42750&view=rev Log: - Add callback for client side thread startup. This is for bug 4785. Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/include/reactos/win32k/callback.h trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -232,6 +232,8 @@ (PVOID)User32CallEventProcFromKernel; NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] = (PVOID)User32CallLoadMenuFromKernel; + NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = + (PVOID)User32CallClientThreadSetupFromKernel; NtUserProcessConnect( NtCurrentProcess(), &UserCon, @@ -353,3 +355,12 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); } + +NTSTATUS +WINAPI +User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + ERR("GetConnected\n"); + return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); +} + Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -8,7 +8,8 @@ #define USER32_CALLBACK_HOOKPROC (4) #define USER32_CALLBACK_EVENTPROC (5) #define USER32_CALLBACK_LOADMENU (6) -#define USER32_CALLBACK_MAXIMUM (6) +#define USER32_CALLBACK_CLIENTTHREADSTARTUP (7) +#define USER32_CALLBACK_MAXIMUM (7) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -84,5 +85,7 @@ User32CallEventProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -56,4 +56,6 @@ HMENU APIENTRY co_IntCallLoadMenu(HINSTANCE,PUNICODE_STRING); +NTSTATUS APIENTRY co_IntClientThreadSetup(VOID); + #endif /* _WIN32K_CALLBACK_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -703,4 +703,29 @@ return (HMENU)Result; } +NTSTATUS +APIENTRY +co_IntClientThreadSetup(VOID) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + + ArgumentLength = ResultLength = 0; + Argument = ResultPointer = NULL; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_CLIENTTHREADSTARTUP, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + return Status; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Mon Aug 17 02:30:25 2009 @@ -94,6 +94,8 @@ HANDLE hPowerRequestEvent, HANDLE hMediaRequestEvent) { + NTSTATUS Status; + // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. @@ -105,6 +107,15 @@ // Initialize User Screen. // } // Create ThreadInfo for this Thread! +// { + + GetW32ThreadInfo(); + +// Callback to User32 Client Thread Setup + + Status = co_IntClientThreadSetup(); + +// } // Set Global SERVERINFO Error flags. // Load Resources.

1 0

[gschneider] 42749: - Don't allow glyph indices (ETO_GLYPH_INDEX) in ExtTextOut as long as they are not created properly - GetCharacterPlacementA/W has to work to allow this, currently broken/stubbed - Switch to full text processing mode so that those texts are shown - Fixes garbled text in OpenOffice 1.14/1.15 installers, bug #933
by gschneider＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: gschneider Date: Mon Aug 17 02:24:46 2009 New Revision: 42749 URL: http://svn.reactos.org/svn/reactos?rev=42749&view=rev Log: - Don't allow glyph indices (ETO_GLYPH_INDEX) in ExtTextOut as long as they are not created properly - GetCharacterPlacementA/W has to work to allow this, currently broken/stubbed - Switch to full text processing mode so that those texts are shown - Fixes garbled text in OpenOffice 1.14/1.15 installers, bug #933 Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Aug 17 02:24:46 2009 @@ -3694,6 +3694,9 @@ } } + /* FIXME: remove this as soon as GetCharacterPlacementA/W work properly */ + fuOptions &= ~ETO_GLYPH_INDEX; + /* Finally call the internal routine */ Result = GreExtTextOutW(hDC, XStart,

1 0

[gschneider] 42748: Handle a missing output buffer in NtGdiGetCharABCWidthsW
by gschneider＠svn.reactos.org 17 Aug '09

17 Aug '09

Author: gschneider Date: Mon Aug 17 02:13:44 2009 New Revision: 42748 URL: http://svn.reactos.org/svn/reactos?rev=42748&view=rev Log: Handle a missing output buffer in NtGdiGetCharABCWidthsW Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Aug 17 02:13:44 2009 @@ -3761,6 +3761,12 @@ return FALSE; } + if (!Buffer) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + BufferSize = Count * sizeof(ABC); // Same size! SafeBuff = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT); if (!fl) SafeBuffF = (LPABCFLOAT) SafeBuff;

1 0

[dgorbachev] 42747: Add an assertion. See bug #4785.
by dgorbachev＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: dgorbachev Date: Mon Aug 17 00:52:05 2009 New Revision: 42747 URL: http://svn.reactos.org/svn/reactos?rev=42747&view=rev Log: Add an assertion. See bug #4785. Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Mon Aug 17 00:52:05 2009 @@ -38,6 +38,9 @@ /* Validate the previous mode */ if (KeGetPreviousMode() == KernelMode) return STATUS_INVALID_PARAMETER; + + /* If no win32k, crashes later */ + ASSERT(PspW32ProcessCallout != NULL); /* Make sure win32k is here */ if (!PspW32ProcessCallout) return STATUS_ACCESS_DENIED;

1 0

[jimtabor] 42746: - [Win32k] Removed W32THREADINFO. - Tested AbiWord, User32 wine tests. Yes, of course, this needs more testing.
by jimtabor＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: jimtabor Date: Sun Aug 16 23:44:59 2009 New Revision: 42746 URL: http://svn.reactos.org/svn/reactos?rev=42746&view=rev Log: - [Win32k] Removed W32THREADINFO. - Tested AbiWord, User32 wine tests. Yes, of course, this needs more testing. 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/hook.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -100,7 +100,7 @@ static __inline PDESKTOPINFO GetThreadDesktopInfo(VOID) { - PW32THREADINFO ti; + PTHREADINFO ti; PDESKTOPINFO di = NULL; ti = GetW32ThreadInfo(); 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -199,7 +199,7 @@ union { PVOID pi; - PW32THREADINFO pti; // pointer to Win32ThreadInfo + PTHREADINFO pti; // pointer to Win32ThreadInfo PPROCESSINFO ppi; // pointer to W32ProcessInfo }; unsigned short type; /* object type (0 if free) */ 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -335,7 +335,7 @@ USERCONNECT UserCon; // ERR("GetConnected\n"); - if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) + if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); if (gpsi && g_ppi) return; 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -104,17 +104,17 @@ return NtUserUpdatePerUserSystemParameters(dwReserved, bEnable); } -PW32THREADINFO +PTHREADINFO GetW32ThreadInfo(VOID) { - PW32THREADINFO ti; - - ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + PTHREADINFO ti; + + ti = (PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo; if (ti == NULL) { - /* create the W32THREADINFO structure */ + /* create the THREADINFO structure */ NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + ti = (PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo; } return ti; @@ -250,13 +250,13 @@ IsGUIThread( BOOL bConvert) { - PW32THREADINFO ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + PTHREADINFO ti = (PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo; if (ti == NULL) { if(bConvert) { NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; + if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; else SetLastError(ERROR_NOT_ENOUGH_MEMORY); } @@ -270,7 +270,7 @@ FASTCALL TestWindowProcess(PWND Wnd) { - if (Wnd->head.pti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + if (Wnd->head.pti == (PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; else return (NtUserQueryWindow(Wnd->head.h, QUERY_WINDOW_UNIQUE_PROCESS_ID) == Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -369,7 +369,7 @@ IsWinEventHookInstalled( DWORD event) { - if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo) { return (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; } 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1333,7 +1333,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->head.pti) != GetW32ThreadInfo()) + if (!Wnd || Wnd->head.pti != GetW32ThreadInfo()) return 0; } else @@ -1394,7 +1394,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->head.pti) != GetW32ThreadInfo()) + if (!Wnd || Wnd->head.pti != GetW32ThreadInfo()) return 0; } else @@ -1791,10 +1791,10 @@ if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { PWND Window; - PW32THREADINFO ti = GetW32ThreadInfo(); + PTHREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->head.pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && Window->head.pti == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: @@ -1855,10 +1855,10 @@ if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { PWND Window; - PW32THREADINFO ti = GetW32ThreadInfo(); + PTHREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->head.pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && Window->head.pti == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1316,12 +1316,12 @@ LPDWORD lpdwProcessId) { DWORD Ret = 0; - PW32THREADINFO ti; + PTHREADINFO ti; PWND pWnd = ValidateHwnd(hWnd); if (!pWnd) return Ret; - ti = SharedPtrToUser(pWnd->head.pti); + ti = pWnd->head.pti; if (ti) { 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 [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -2,6 +2,7 @@ #define __WIN32K_NTUSER_H typedef struct _PROCESSINFO *PPROCESSINFO; +typedef struct _THREADINFO *PTHREADINFO; struct _DESKTOP; struct _WND; @@ -72,13 +73,6 @@ DWORD dwcPumpHook; } CLIENTTHREADINFO, *PCLIENTTHREADINFO; -typedef struct _W32THREADINFO -{ - PPROCESSINFO ppi; /* [KERNEL] */ - PDESKTOPINFO pDeskInfo; - ULONG fsHooks; -} W32THREADINFO, *PW32THREADINFO; - typedef struct _HEAD { HANDLE h; @@ -88,7 +82,7 @@ typedef struct _THROBJHEAD { HEAD; - PW32THREADINFO pti; + PTHREADINFO pti; } THROBJHEAD, *PTHROBJHEAD; typedef struct _THRDESKHEAD @@ -701,7 +695,7 @@ LUID luid; } BROADCASTPARM, *PBROADCASTPARM; -PW32THREADINFO GetW32ThreadInfo(VOID); +PTHREADINFO GetW32ThreadInfo(VOID); PPROCESSINFO GetW32ProcessInfo(VOID); typedef struct _WNDMSG 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -22,7 +22,7 @@ union { PVOID pi; - PW32THREADINFO pti; // pointer to Win32ThreadInfo + PTHREADINFO pti; // pointer to Win32ThreadInfo PPROCESSINFO ppi; // pointer to W32ProcessInfo }; unsigned short type; /* object type (0 if free) */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -88,8 +88,7 @@ LIST_ENTRY W32CallbackListHead; BOOLEAN IsExiting; SINGLE_LIST_ENTRY ReferencesList; - PW32THREADINFO ThreadInfo; -} THREADINFO, *PTHREADINFO; +} THREADINFO; #include <poppack.h> Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -26,7 +26,7 @@ PWND Wnd; /* Pointer to the thread information */ - PW32THREADINFO ti; + PTHREADINFO ti; /* Pointer to the desktop */ PDESKTOPINFO Desktop; /* system menu handle. */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -306,12 +306,6 @@ IntSetThreadDesktop(NULL, TRUE); - if (Win32Thread->ThreadInfo != NULL) - { - UserHeapFree(Win32Thread->ThreadInfo); - Win32Thread->ThreadInfo = NULL; - } - PsSetThreadWin32Thread(Thread, NULL); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1171,7 +1171,6 @@ IN DWORD dwFlags) { PTHREADINFO pti; - PW32THREADINFO ti; PPROCESSINFO pi; PCLS Class; RTL_ATOM ClassAtom; @@ -1179,15 +1178,14 @@ /* NOTE: Accessing the buffers in ClassName and MenuName may raise exceptions! */ - pti = PsGetCurrentThreadWin32Thread(); - ti = GetW32ThreadInfo(); - if (ti == NULL || !RegisteredSysClasses) + pti = GetW32ThreadInfo(); + if (pti == NULL || !RegisteredSysClasses) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return (RTL_ATOM)0; } - pi = ti->ppi; + pi = pti->ppi; /* try to find a previously registered class */ ClassAtom = IntGetClassAtom(ClassName, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1846,7 +1846,7 @@ static NTSTATUS IntUnmapDesktopView(IN PDESKTOP DesktopObject) { - PW32THREADINFO ti; + PTHREADINFO ti; PPROCESSINFO CurrentWin32Process; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; NTSTATUS Status = STATUS_SUCCESS; @@ -1883,10 +1883,6 @@ ti = GetW32ThreadInfo(); if (ti != NULL) { - if (ti->pDeskInfo == DesktopObject->DesktopInfo) - { - ti->pDeskInfo = NULL; - } GetWin32ClientInfo()->pDeskInfo = NULL; } GetWin32ClientInfo()->ulClientDelta = 0; @@ -1897,7 +1893,7 @@ static NTSTATUS IntMapDesktopView(IN PDESKTOP DesktopObject) { - PW32THREADINFO ti; + PTHREADINFO ti; PPROCESSINFO CurrentWin32Process; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; @@ -1965,11 +1961,11 @@ GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); if (ti != NULL) { - if (ti->pDeskInfo == NULL) + if (GetWin32ClientInfo()->pDeskInfo == NULL) { - ti->pDeskInfo = DesktopObject->DesktopInfo; GetWin32ClientInfo()->pDeskInfo = - (PVOID)((ULONG_PTR)ti->pDeskInfo - GetWin32ClientInfo()->ulClientDelta); + (PVOID)((ULONG_PTR)DesktopObject->DesktopInfo - + GetWin32ClientInfo()->ulClientDelta); } } @@ -2009,15 +2005,6 @@ { SetLastNtError(Status); return FALSE; - } - } - - if (W32Thread->Desktop == NULL) - { - PW32THREADINFO ti = GetW32ThreadInfo(); - if (ti != NULL) - { - ti->pDeskInfo = NULL; } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -117,9 +117,6 @@ W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; - - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -242,9 +239,6 @@ W32Thread->fsHooks &= ~HOOKID_TO_FLAG(Hook->HookId); GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; - - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->fsHooks = W32Thread->fsHooks; if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1,21 +1,3 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -307,7 +289,7 @@ { BOOL SameThread = FALSE; - if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) + if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || @@ -329,7 +311,7 @@ { BOOL SameThread = FALSE; - if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->ThreadInfo) + if (Window->ti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; if ((!SameThread && (Window->ti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -451,11 +451,10 @@ return (PPROCESSINFO)PsGetCurrentProcessWin32Process(); } -PW32THREADINFO +PTHREADINFO GetW32ThreadInfo(VOID) { PTEB Teb; - PW32THREADINFO ti; PPROCESSINFO ppi; PCLIENTINFO pci; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); @@ -465,67 +464,49 @@ /* FIXME - temporary hack for system threads... */ return NULL; } - - /* allocate a THREADINFO structure if neccessary */ - if (pti->ThreadInfo == NULL) + /* initialize it */ + pti->ppi = ppi = GetW32ProcessInfo(); + + pti->pcti = &pti->cti; // FIXME Need to set it in desktop.c! + + if (pti->Desktop != NULL) { - ti = UserHeapAlloc(sizeof(W32THREADINFO)); - if (ti != NULL) + pti->pDeskInfo = pti->Desktop->DesktopInfo; + } + else + { + pti->pDeskInfo = NULL; + } + /* update the TEB */ + Teb = NtCurrentTeb(); + pci = GetWin32ClientInfo(); + pti->pClientInfo = pci; + _SEH2_TRY + { + ProbeForWrite( Teb, + sizeof(TEB), + sizeof(ULONG)); + + Teb->Win32ThreadInfo = (PW32THREAD) pti; + + pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! + pci->ppi = ppi; + pci->fsHooks = pti->fsHooks; + /* CI may not have been initialized. */ + if (!pci->pDeskInfo && pti->pDeskInfo) { - RtlZeroMemory(ti, - sizeof(W32THREADINFO)); - - /* initialize it */ - ti->ppi = ppi = GetW32ProcessInfo(); - ti->fsHooks = pti->fsHooks; - pti->pcti = &pti->cti; // FIXME Need to set it in desktop.c! - if (pti->Desktop != NULL) - { - pti->pDeskInfo = ti->pDeskInfo = pti->Desktop->DesktopInfo; - } - else - { - pti->pDeskInfo = ti->pDeskInfo = NULL; - } - - pti->ThreadInfo = ti; - /* update the TEB */ - Teb = NtCurrentTeb(); - pci = GetWin32ClientInfo(); - pti->pClientInfo = pci; - _SEH2_TRY - { - ProbeForWrite(Teb, - sizeof(TEB), - sizeof(ULONG)); - - Teb->Win32ThreadInfo = UserHeapAddressToUser(pti->ThreadInfo); - - pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! - pci->ppi = ppi; - pci->fsHooks = pti->fsHooks; - /* CI may not have been initialized. */ - if (!pci->pDeskInfo && pti->pDeskInfo) - { - if (!pci->ulClientDelta) pci->ulClientDelta = DesktopHeapGetUserDelta(); - - pci->pDeskInfo = - (PVOID)((ULONG_PTR)pti->pDeskInfo - pci->ulClientDelta); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; - } - else - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + if (!pci->ulClientDelta) pci->ulClientDelta = DesktopHeapGetUserDelta(); + + pci->pDeskInfo = (PVOID)((ULONG_PTR)pti->pDeskInfo - pci->ulClientDelta); } } - - return pti->ThreadInfo; + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; + + return pti; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -164,7 +164,7 @@ case ONEPARAM_ROUTINE_GETDESKTOPMAPPING: { - PW32THREADINFO ti; + PTHREADINFO ti; ti = GetW32ThreadInfo(); if (ti != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -1,21 +1,3 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -162,7 +144,8 @@ { if ( (lParam == (LPARAM)pTmr->pfn) && (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && - (pTmr->pti->ThreadInfo->ppi == pti->ThreadInfo->ppi) ) +// (pTmr->head.pti->ppi == pti->ppi) ) + (pTmr->pti->ppi == pti->ppi) ) break; pTmr = (PTIMER)pTmr->ptmrList.Flink; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Aug 16 23:44:59 2009 @@ -103,7 +103,7 @@ /* temp hack */ PWINDOW_OBJECT FASTCALL UserGetWindowObject(HWND hWnd) { - PW32THREADINFO ti; + PTHREADINFO ti; PWINDOW_OBJECT Window; if (PsGetCurrentProcess() != PsInitialSystemProcess) @@ -314,7 +314,7 @@ } static VOID -UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject) +UserFreeWindowInfo(PTHREADINFO ti, PWINDOW_OBJECT WindowObject) { PCLIENTINFO ClientInfo = GetWin32ClientInfo(); PWND Wnd = WindowObject->Wnd; @@ -1551,7 +1551,7 @@ HWND hWnd; POINT Pos; SIZE Size; - PW32THREADINFO ti = NULL; + PTHREADINFO ti = NULL; #if 0 POINT MaxSize, MaxPos, MinTrack, MaxTrack; @@ -3311,7 +3311,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; NTSTATUS Status; - PW32THREADINFO ti; + PTHREADINFO ti; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive();

1 0

[gschneider] 42745: Handle failure of EngLockSurface as well
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 22:11:31 2009 New Revision: 42745 URL: http://svn.reactos.org/svn/reactos?rev=42745&view=rev Log: Handle failure of EngLockSurface as well Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Sun Aug 16 22:11:31 2009 @@ -76,6 +76,11 @@ } *ppsoOutput = EngLockSurface((HSURF)EnterLeave->OutputBitmap); + if (*ppsoOutput == NULL) + { + EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); + return FALSE; + } EnterLeave->DestRect.left = 0; EnterLeave->DestRect.top = 0; @@ -105,9 +110,9 @@ EnterLeave->TrivialClipObj = EngCreateClip(); if (EnterLeave->TrivialClipObj == NULL) { - EngUnlockSurface(*ppsoOutput); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - return FALSE; + EngUnlockSurface(*ppsoOutput); + EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); + return FALSE; } EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; if (ClippedDestRect.left < (*ppsoOutput)->sizlBitmap.cx &&

1 0

[sginsberg] 42744: - Revert 32309 -- instead of removing FORCEINLINE to make GCC happy (it can't inline functions using va_list), use __inline to merely hint that the function should be inlined. This lets you use RtlStringCbPrintfA and RtlStringCbPrintfExA in multiple source files as the functions aren't static. - Moreover, there is no reason to forceinline all the RtlString* routines -- they are quite big and the compiler should be allowed to optimize here as it likes, so just use __inline. Als
by sginsberg＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: sginsberg Date: Sun Aug 16 22:08:48 2009 New Revision: 42744 URL: http://svn.reactos.org/svn/reactos?rev=42744&view=rev Log: - Revert 32309 -- instead of removing FORCEINLINE to make GCC happy (it can't inline functions using va_list), use __inline to merely hint that the function should be inlined. This lets you use RtlStringCbPrintfA and RtlStringCbPrintfExA in multiple source files as the functions aren't static. - Moreover, there is no reason to forceinline all the RtlString* routines -- they are quite big and the compiler should be allowed to optimize here as it likes, so just use __inline. Also add RtlStringCchCopyA and re-enable ASSERTMSG and use it for the stubs. - Add missing GUID_CLASS_COMPORT and GUID_SERENUM_BUS_ENUMERATOR to ntddser.h - Add driverspecs.h to stub out Driver Verifier annotations - The WDK serenum source sample now compiles with our header set. Added: trunk/reactos/include/ddk/driverspecs.h (with props) Modified: trunk/reactos/include/ddk/ntddser.h trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/ntoskrnl/mm/sysldr.c Added: trunk/reactos/include/ddk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/driverspecs.h?… ============================================================================== --- trunk/reactos/include/ddk/driverspecs.h (added) +++ trunk/reactos/include/ddk/driverspecs.h [iso-8859-1] Sun Aug 16 22:08:48 2009 @@ -1,0 +1,29 @@ +/* + * PROJECT: ReactOS DDK + * COPYRIGHT: This file is in the Public Domain. + * FILE: driverspecs.h + * ABSTRACT: This header stubs out Driver Verifier annotations to + * allow drivers using them to compile with our header set. + */ + +// +// Stubs +// +#define __drv_dispatchType(x) +#define __drv_dispatchType_other + +// +// FIXME: These annotations are not driver-only and does not belong here +// +#define __in +#define __in_bcount(Size) +#define __in_ecount(Size) + +#define __out +#define __out_bcount(Size) +#define __out_bcount_part(Size, Length) +#define __out_ecount(Size) + +#define __inout + +#define __deref_out_ecount(Size) Propchange: trunk/reactos/include/ddk/driverspecs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/ntddser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddser.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddser.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddser.h [iso-8859-1] Sun Aug 16 22:08:48 2009 @@ -32,8 +32,12 @@ DEFINE_GUID(GUID_DEVINTERFACE_COMPORT, 0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x73); +#define GUID_CLASS_COMPORT GUID_DEVINTERFACE_COMPORT + DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); + +#define GUID_SERENUM_BUS_ENUMERATOR GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR #define IOCTL_SERIAL_CLEAR_STATS \ CTL_CODE (FILE_DEVICE_SERIAL_PORT, 36, METHOD_BUFFERED, FILE_ANY_ACCESS) Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sun Aug 16 22:08:48 2009 @@ -31,13 +31,9 @@ // typedef unsigned long DWORD; -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); -#endif - /* PRIVATE FUNCTIONS *********************************************************/ -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringLengthWorkerA(IN PCHAR String, @@ -70,7 +66,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringValidateDestA(IN PCHAR Destination, @@ -99,7 +95,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringExValidateDestA(IN OUT PCHAR *Destination, @@ -108,14 +104,14 @@ IN SIZE_T MaxLength, IN DWORD Flags) { - //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); return RtlStringValidateDestA(*Destination, *DestinationLength, ReturnLength, MaxLength); } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL, @@ -124,7 +120,7 @@ IN DWORD Flags) { NTSTATUS Status = STATUS_SUCCESS; - //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); if ((ReturnLength) && (*ReturnLength >= MaxLength)) { @@ -134,7 +130,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringVPrintfWorkerA(OUT PCHAR Destination, @@ -175,7 +171,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringCopyWorkerA(OUT PCHAR Destination, @@ -212,6 +208,18 @@ /* PUBLIC FUNCTIONS **********************************************************/ +__inline +NTSTATUS +NTAPI +RtlStringCchCopyA(IN PCHAR Destination, + IN SIZE_T cchDest, + IN PCCHAR pszSrc) +{ + ASSERTMSG("RtlStringCchCopyA is UNIMPLEMENTED!\n", FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +__inline NTSTATUS NTAPI RtlStringCbPrintfA(OUT PCHAR Destination, @@ -241,6 +249,7 @@ return Status; } +__inline NTSTATUS NTAPI RtlStringCbPrintfExA(OUT PCHAR Destination, @@ -255,7 +264,7 @@ SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0; PCHAR LocalDestinationEnd; va_list argList; - //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &CharLength, @@ -321,7 +330,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringCbCopyExA(OUT PCHAR Destination, @@ -334,7 +343,7 @@ NTSTATUS Status; SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining; PCHAR LocalDestinationEnd; - //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &Length, @@ -398,7 +407,7 @@ return Status; } - +__inline NTSTATUS NTAPI RtlStringCbPrintfW( @@ -407,11 +416,11 @@ IN LPCWSTR pszFormat, ...) { - UNIMPLEMENTED + ASSERTMSG("RtlStringCbPrintfW is UNIMPLEMENTED!\n", FALSE); return STATUS_NOT_IMPLEMENTED; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringCbCatExA(IN OUT PCHAR Destination, @@ -425,7 +434,7 @@ SIZE_T CharLength = Length / sizeof(CHAR); SIZE_T DestinationLength, Remaining, Copied = 0; PCHAR LocalDestinationEnd; - //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &CharLength, @@ -485,7 +494,7 @@ return Status; } -FORCEINLINE +__inline NTSTATUS NTAPI RtlStringCbCopyA(OUT PCHAR Destination, Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sun Aug 16 22:08:48 2009 @@ -13,6 +13,7 @@ #include <debug.h> /* GCC's incompetence strikes again */ +__inline VOID sprintf_nt(IN PCHAR Buffer, IN PCHAR Format,

1 0

[gschneider] 42743: Handle failure of EngCreateClip, spotted by Amine Khaldi
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 21:56:40 2009 New Revision: 42743 URL: http://svn.reactos.org/svn/reactos?rev=42743&view=rev Log: Handle failure of EngCreateClip, spotted by Amine Khaldi Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Sun Aug 16 21:56:40 2009 @@ -103,6 +103,12 @@ ClippedDestRect.bottom = ClippedDestRect.top + psoDest->sizlBitmap.cy - SrcPoint.y; } EnterLeave->TrivialClipObj = EngCreateClip(); + if (EnterLeave->TrivialClipObj == NULL) + { + EngUnlockSurface(*ppsoOutput); + EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); + return FALSE; + } EnterLeave->TrivialClipObj->iDComplexity = DC_TRIVIAL; if (ClippedDestRect.left < (*ppsoOutput)->sizlBitmap.cx && 0 <= ClippedDestRect.right && @@ -115,11 +121,11 @@ EnterLeave->TrivialClipObj, NULL, &ClippedDestRect, &SrcPoint)) { - EngDeleteClip(EnterLeave->TrivialClipObj); - EngFreeMem((*ppsoOutput)->pvBits); - EngUnlockSurface(*ppsoOutput); - EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); - return FALSE; + EngDeleteClip(EnterLeave->TrivialClipObj); + EngFreeMem((*ppsoOutput)->pvBits); + EngUnlockSurface(*ppsoOutput); + EngDeleteSurface((HSURF)EnterLeave->OutputBitmap); + return FALSE; } EnterLeave->DestRect.left = DestRect->left; EnterLeave->DestRect.top = DestRect->top;

1 0

[gschneider] 42742: - Copy the source rectangle after checking it - Create input rectangle from destination size if source is not used
by gschneider＠svn.reactos.org 16 Aug '09

16 Aug '09

Author: gschneider Date: Sun Aug 16 21:43:58 2009 New Revision: 42742 URL: http://svn.reactos.org/svn/reactos?rev=42742&view=rev Log: - Copy the source rectangle after checking it - Create input rectangle from destination size if source is not used Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sun Aug 16 21:43:58 2009 @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Win32 kernelmode subsystem * PURPOSE: GDI stretch blt functions * FILE: subsystems/win32/win32k/eng/stretchblt.c * PROGRAMER: Jason Filby @@ -160,13 +160,13 @@ OutputRect.bottom = prclDest->top; } - InputRect = *prclSrc; if (UsesSource) { if (NULL == prclSrc) { return FALSE; } + InputRect = *prclSrc; if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &psoInput)) @@ -178,6 +178,13 @@ InputRect.right += Translate.x; InputRect.top += Translate.y; InputRect.bottom += Translate.y; + } + else + { + InputRect.left = 0; + InputRect.right = OutputRect.right - OutputRect.left; + InputRect.top = 0; + InputRect.bottom = OutputRect.bottom - OutputRect.top; } if (NULL != ClipRegion)

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