Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33664: Fixed memory leak in w32knapi if it fail found gdihandle table patch by Daniel Zimmermann (netzimme at aim dot com) See issue #3266 for more details.
by greatlrd＠svn.reactos.org 23 May '08

23 May '08

Author: greatlrd Date: Fri May 23 13:14:15 2008 New Revision: 33664 URL: http://svn.reactos.org/svn/reactos?rev=33664&view=rev Log: Fixed memory leak in w32knapi if it fail found gdihandle table patch by Daniel Zimmermann (netzimme at aim dot com) See issue #3266 for more details. Modified: trunk/rostests/apitests/w32knapi/w32knapi.c Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c [iso-8859-1] Fri May 23 13:14:15 2008 @@ -87,6 +87,8 @@ GdiHandleTable = MyGdiQueryTable(); if(!GdiHandleTable) { + FreeLibrary(g_hModule); + printf("GdiHandleTable not found!\n"); return -1; }

1 0

[pschweitzer] 33663: No need to keep linux-ntfs: - it's outdated - more docs are available
by pschweitzer＠svn.reactos.org 23 May '08

23 May '08

Author: pschweitzer Date: Fri May 23 13:01:42 2008 New Revision: 33663 URL: http://svn.reactos.org/svn/reactos?rev=33663&view=rev Log: No need to keep linux-ntfs: - it's outdated - more docs are available Removed: trunk/reactos/drivers/filesystems/ntfs/linux-ntfs/

1 0

[janderwald] 33661: - add stubs for GetTraceEnableFlags, GetTraceEnableLevel, RegisterTraceGuidsA, RegisterTraceGuidsW and UnregisterTraceGuids
by janderwald＠svn.reactos.org 23 May '08

23 May '08

Author: janderwald Date: Fri May 23 11:31:22 2008 New Revision: 33661 URL: http://svn.reactos.org/svn/reactos?rev=33661&view=rev Log: - add stubs for GetTraceEnableFlags, GetTraceEnableLevel, RegisterTraceGuidsA, RegisterTraceGuidsW and UnregisterTraceGuids Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Fri May 23 11:31:22 2008 @@ -290,8 +290,8 @@ GetSidSubAuthorityCount@4 GetSiteSidFromToken@4 GetTokenInformation@20 -;GetTraceEnableFlags -;GetTraceEnableLevel +GetTraceEnableFlags@8 +GetTraceEnableLevel@8 GetTraceLoggerHandle@4 GetTrusteeFormA@4 GetTrusteeFormW@4 @@ -546,8 +546,8 @@ RegisterServiceCtrlHandlerExA@12 RegisterServiceCtrlHandlerExW@12 RegisterServiceCtrlHandlerW@8 -;RegisterTraceGuidsA -;RegisterTraceGuidsW +RegisterTraceGuidsA@32 +RegisterTraceGuidsW@32 ;RemoveTraceCallback RemoveUsersFromEncryptedFile@8 ReportEventA@36 @@ -662,7 +662,7 @@ ;UninstallApplication UnlockServiceDatabase@4 ;UnregisterIdleTask -;UnregisterTraceGuids +UnregisterTraceGuids@8 ;UpdateTraceA ;UpdateTraceW ;WdmWmiServiceMain Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Fri May 23 11:31:22 2008 @@ -19,6 +19,7 @@ #include <windows.h> #include <accctrl.h> #include <aclapi.h> +#include <wmistr.h> #include <evntrace.h> #include <sddl.h> #define NTOS_MODE_USER Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Fri May 23 11:31:22 2008 @@ -55,5 +55,69 @@ return ERROR_SUCCESS; } +ULONG +WMIAPI +GetTraceEnableFlags( + TRACEHANDLE TraceHandle +) +{ + DPRINT1("GetTraceEnableFlags stub()\n"); + return 0xFF; +} + +UCHAR +WMIAPI +GetTraceEnableLevel( + TRACEHANDLE TraceHandle +) +{ + DPRINT1("GetTraceEnableLevel stub()\n"); + return 0xFF; +} + +ULONG +WMIAPI +UnregisterTraceGuids( + TRACEHANDLE RegistrationHandle +) +{ + DPRINT1("UnregisterTraceGuids stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +WMIAPI +RegisterTraceGuidsA( + WMIDPREQUEST RequestAddress, + PVOID RequestContext, + LPCGUID ControlGuid, + ULONG GuidCount, + PTRACE_GUID_REGISTRATION TraceGuidReg, + LPCSTR MofImagePath, + LPCSTR MofResourceName, + PTRACEHANDLE RegistrationHandle +) +{ + DPRINT1("RegisterTraceGuidsA stub()\n"); + return ERROR_SUCCESS; +} + +ULONG +WMIAPI +RegisterTraceGuidsW( + WMIDPREQUEST RequestAddress, + PVOID RequestContext, + LPCGUID ControlGuid, + ULONG GuidCount, + PTRACE_GUID_REGISTRATION TraceGuidReg, + LPCWSTR MofImagePath, + LPCWSTR MofResourceName, + PTRACEHANDLE RegistrationHandle +) +{ + DPRINT1("RegisterTraceGuidsW stub()\n"); + return ERROR_SUCCESS; +} + /* EOF */

1 0

[janderwald] 33660: - add prototypes for GetTraceEnableLevel, RegisterTraceGuidsA, RegisterTraceGuidsW, UnregisterTraceGuids - add WMIPREQUEST, TRACE_GUID_REGISTRATION definition - add wmistr.h header
by janderwald＠svn.reactos.org 23 May '08

23 May '08

Author: janderwald Date: Fri May 23 11:29:05 2008 New Revision: 33660 URL: http://svn.reactos.org/svn/reactos?rev=33660&view=rev Log: - add prototypes for GetTraceEnableLevel, RegisterTraceGuidsA, RegisterTraceGuidsW, UnregisterTraceGuids - add WMIPREQUEST, TRACE_GUID_REGISTRATION definition - add wmistr.h header Added: trunk/reactos/include/psdk/wmistr.h (with props) Modified: trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Fri May 23 11:29:05 2008 @@ -56,12 +56,33 @@ typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; +typedef ULONG (WINAPI *WMIDPREQUEST)( + WMIDPREQUESTCODE RequestCode, + PVOID RequestContext, + ULONG *BufferSize, + PVOID Buffer +); + +typedef struct _TRACE_GUID_REGISTRATION +{ + LPCGUID Guid; + HANDLE RegHandle; +} TRACE_GUID_REGISTRATION, *PTRACE_GUID_REGISTRATION; ULONG WMIAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); TRACEHANDLE WMIAPI GetTraceLoggerHandle(PVOID); ULONG WMIAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WMIAPI GetTraceEnableLevel(TRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); +ULONG WMIAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); +ULONG WMIAPI UnregisterTraceGuids(TRACEHANDLE); +#if defined (UNICODE) || defined (_UNICODE) +#define RegisterTraceGuids RegisterTraceGuidsW +#else +#define RegisterTraceGuids RegisterTraceGuidsA +#endif #endif /* ENVTRACE_H */ Added: trunk/reactos/include/psdk/wmistr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wmistr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wmistr.h (added) +++ trunk/reactos/include/psdk/wmistr.h [iso-8859-1] Fri May 23 11:29:05 2008 @@ -1,0 +1,18 @@ +#ifndef _WMISTR_ +#define _WMISTR_ + +typedef enum +{ + WMI_GET_ALL_DATA = 0, + WMI_GET_SINGLE_INSTANCE, + WMI_SET_SINGLE_INSTANCE, + WMI_SET_SINGLE_ITEM, + WMI_ENABLE_EVENTS, + WMI_DISABLE_EVENTS, + WMI_ENABLE_COLLECTION, + WMI_DISABLE_COLLECTION, + WMI_REGINFO, + WMI_EXECUTE_METHOD +} WMIDPREQUESTCODE; + +#endif /* _WMISTR_ */ Propchange: trunk/reactos/include/psdk/wmistr.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 33659: - Revert 32675 (enabling usage of the cache bitmap). It was just hiding the real bug fixed in r33633, and the bitmap code seems to not be finished (e.g. "out of CacheSeg space" bug).
by fireball＠svn.reactos.org 23 May '08

23 May '08

Author: fireball Date: Fri May 23 09:40:50 2008 New Revision: 33659 URL: http://svn.reactos.org/svn/reactos?rev=33659&view=rev Log: - Revert 32675 (enabling usage of the cache bitmap). It was just hiding the real bug fixed in r33633, and the bitmap code seems to not be finished (e.g. "out of CacheSeg space" bug). Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=336… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Fri May 23 09:40:50 2008 @@ -47,7 +47,7 @@ * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE). */ -#define CACHE_BITMAP +//#define CACHE_BITMAP static LIST_ENTRY DirtySegmentListHead; static LIST_ENTRY CacheSegmentListHead; @@ -58,7 +58,7 @@ KGUARDED_MUTEX ViewLock; #ifdef CACHE_BITMAP -#define CI_CACHESEG_MAPPING_REGION_SIZE (256*1024*1024) +#define CI_CACHESEG_MAPPING_REGION_SIZE (128*1024*1024) static PVOID CiCacheSegMappingRegionBase = NULL; static RTL_BITMAP CiCacheSegMappingRegionAllocMap; @@ -564,12 +564,10 @@ PCACHE_SEGMENT current; PCACHE_SEGMENT previous; PLIST_ENTRY current_entry; + NTSTATUS Status; KIRQL oldIrql; #ifdef CACHE_BITMAP ULONG StartingOffset; -#else - ULONG_PTR GuardArea; - NTSTATUS Status; #endif PHYSICAL_ADDRESS BoundaryAddressMultiple; @@ -679,8 +677,7 @@ KEBUGCHECKCC; } - current->BaseAddress = (PVOID)((ULONG_PTR)CiCacheSegMappingRegionBase + - StartingOffset * PAGE_SIZE); + current->BaseAddress = CiCacheSegMappingRegionBase + StartingOffset * PAGE_SIZE; if (CiCacheSegMappingRegionHint == StartingOffset) { @@ -889,7 +886,7 @@ for (i = 0; i < RegionSize; i++) { MmDeleteVirtualMapping(NULL, - (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i * PAGE_SIZE)), + CacheSeg->BaseAddress + (i * PAGE_SIZE), FALSE, NULL, &Page); @@ -898,8 +895,7 @@ KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); /* Deallocate all the pages used. */ - Base = ((ULONG_PTR)CacheSeg->BaseAddress - - (ULONG_PTR)CiCacheSegMappingRegionBase) / PAGE_SIZE; + Base = (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / PAGE_SIZE; RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize);

1 0

[jimtabor] 33658: Add more data for extended clip object.
by jimtabor＠svn.reactos.org 23 May '08

23 May '08

Author: jimtabor Date: Fri May 23 07:50:46 2008 New Revision: 33658 URL: http://svn.reactos.org/svn/reactos?rev=33658&view=rev Log: Add more data for extended clip object. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri May 23 07:50:46 2008 @@ -77,14 +77,15 @@ BOOL vport2WorldValid; /* Is xformVport2World valid? */ } WIN_DC_INFO; +// EXtended CLip and Window Region Object typedef struct _XCLIPOBJ { - CLIPOBJ co; // Std Clip object. - DWORD Unknown[6]; + WNDOBJ eClipWnd; PVOID pClipRgn; // prgnRao_ or (prgnVis_ if (prgnRao_ == z)) DWORD Unknown1[16]; DWORD nComplexity; // count/mode based on # of rect in regions scan. - DWORD Unknown2; + PVOID pUnknown; // UnK pointer to a large drawing structure. + // We will use it for CombinedClip ptr. } XCLIPOBJ, *PXCLIPOBJ; typedef struct _DCLEVEL

1 0

[greatlrd] 33657: Implemtened : NtUserGetTitleBarInfo This code was writen by me and Daniel Zimmermann (netzimme at aim dot com) and it is base on wine version, See issue #3266 for more details.
by greatlrd＠svn.reactos.org 23 May '08

23 May '08

Author: greatlrd Date: Fri May 23 00:46:22 2008 New Revision: 33657 URL: http://svn.reactos.org/svn/reactos?rev=33657&view=rev Log: Implemtened : NtUserGetTitleBarInfo This code was writen by me and Daniel Zimmermann (netzimme at aim dot com) and it is base on wine version, See issue #3266 for more details. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.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 [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri May 23 00:46:22 2008 @@ -1477,7 +1477,7 @@ NtUserGetThreadState( DWORD Routine); -DWORD +BOOLEAN NTAPI NtUserGetTitleBarInfo( HWND hwnd, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri May 23 00:46:22 2008 @@ -1390,6 +1390,146 @@ return TRUE; } +VOID STDCALL +co_InflateRect(LPRECT rect, int dx, int dy) +{ + rect->left -= dx; + rect->top -= dy; + rect->right += dx; + rect->bottom += dy; +} + +BOOLEAN STDCALL +intGetTitleBarInfo(PWINDOW_OBJECT pWindowObject, PTITLEBARINFO bti) +{ + + DWORD dwStyle = 0; + DWORD dwExStyle = 0; + BOOLEAN retValue = TRUE; + + if (bti->cbSize == sizeof(TITLEBARINFO)) + { + RtlZeroMemory(&bti->rgstate[0],sizeof(DWORD)*(CCHILDREN_TITLEBAR+1)); + + bti->rgstate[0] = STATE_SYSTEM_FOCUSABLE; + + dwStyle = pWindowObject->Wnd->Style; + dwExStyle = pWindowObject->Wnd->ExStyle; + + bti->rcTitleBar.top = 0; + bti->rcTitleBar.left = 0; + bti->rcTitleBar.right = pWindowObject->Wnd->WindowRect.right - pWindowObject->Wnd->WindowRect.left; + bti->rcTitleBar.bottom = pWindowObject->Wnd->WindowRect.bottom - pWindowObject->Wnd->WindowRect.top; + + /* is it iconiced ? */ + if ((dwStyle & WS_ICONIC)!=WS_ICONIC) + { + /* Remove frame from rectangle */ + if (HAS_THICKFRAME( dwStyle, dwExStyle )) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CXFRAME) and UserGetSystemMetrics(SM_CYFRAME) */ + co_InflateRect( &bti->rcTitleBar, -UserGetSystemMetrics(SM_CXFRAME), -UserGetSystemMetrics(SM_CYFRAME) ); + } + else if (HAS_DLGFRAME( dwStyle, dwExStyle )) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CXDLGFRAME) and UserGetSystemMetrics(SM_CYDLGFRAME) */ + co_InflateRect( &bti->rcTitleBar, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); + } + else if (HAS_THINFRAME( dwStyle, dwExStyle)) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CXBORDER) and UserGetSystemMetrics(SM_CYBORDER) */ + co_InflateRect( &bti->rcTitleBar, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER) ); + } + + /* We have additional border information if the window + * is a child (but not an MDI child) */ + if ( (dwStyle & WS_CHILD) && + ((dwExStyle & WS_EX_MDICHILD) == 0 ) ) + { + if (dwExStyle & WS_EX_CLIENTEDGE) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CXEDGE) and UserGetSystemMetrics(SM_CYEDGE) */ + co_InflateRect (&bti->rcTitleBar, -UserGetSystemMetrics(SM_CXEDGE), -UserGetSystemMetrics(SM_CYEDGE)); + } + + if (dwExStyle & WS_EX_STATICEDGE) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CXBORDER) and UserGetSystemMetrics(SM_CYBORDER) */ + co_InflateRect (&bti->rcTitleBar, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); + } + } + } + + bti->rcTitleBar.top += pWindowObject->Wnd->WindowRect.top; + bti->rcTitleBar.left += pWindowObject->Wnd->WindowRect.left; + bti->rcTitleBar.right += pWindowObject->Wnd->WindowRect.left; + + bti->rcTitleBar.bottom = bti->rcTitleBar.top; + if (dwExStyle & WS_EX_TOOLWINDOW) + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CYSMCAPTION) */ + bti->rcTitleBar.bottom += UserGetSystemMetrics(SM_CYSMCAPTION); + } + else + { + /* FIXME : Note this value should exists in pWindowObject for UserGetSystemMetrics(SM_CYCAPTION) and UserGetSystemMetrics(SM_CXSIZE) */ + bti->rcTitleBar.bottom += UserGetSystemMetrics(SM_CYCAPTION); + bti->rcTitleBar.left += UserGetSystemMetrics(SM_CXSIZE); + } + + if (dwStyle & WS_CAPTION) + { + bti->rgstate[1] = STATE_SYSTEM_INVISIBLE; + if (dwStyle & WS_SYSMENU) + { + if (!(dwStyle & (WS_MINIMIZEBOX|WS_MAXIMIZEBOX))) + { + bti->rgstate[2] = STATE_SYSTEM_INVISIBLE; + bti->rgstate[3] = STATE_SYSTEM_INVISIBLE; + } + else + { + if (!(dwStyle & WS_MINIMIZEBOX)) + { + bti->rgstate[2] = STATE_SYSTEM_UNAVAILABLE; + } + if (!(dwStyle & WS_MAXIMIZEBOX)) + { + bti->rgstate[3] = STATE_SYSTEM_UNAVAILABLE; + } + } + + if (!(dwExStyle & WS_EX_CONTEXTHELP)) + { + bti->rgstate[4] = STATE_SYSTEM_INVISIBLE; + } + if (pWindowObject->Wnd->Class->Style & CS_NOCLOSE) + { + bti->rgstate[5] = STATE_SYSTEM_UNAVAILABLE; + } + } + else + { + bti->rgstate[2] = STATE_SYSTEM_INVISIBLE; + bti->rgstate[3] = STATE_SYSTEM_INVISIBLE; + bti->rgstate[4] = STATE_SYSTEM_INVISIBLE; + bti->rgstate[5] = STATE_SYSTEM_INVISIBLE; + } + } + else + { + bti->rgstate[0] |= STATE_SYSTEM_INVISIBLE; + } + } + else + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + retValue = FALSE; + } + + return retValue; +} + /* FUNCTIONS *****************************************************************/ @@ -1530,6 +1670,73 @@ DPRINT("Leave NtUserDeleteMenu, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; +} + +/* + * @implemented + */ +BOOLEAN STDCALL +NtUserGetTitleBarInfo( + HWND hwnd, + PTITLEBARINFO bti) +{ + PWINDOW_OBJECT WindowObject; + TITLEBARINFO bartitleinfo; + DECLARE_RETURN(BOOLEAN); + BOOLEAN retValue = FALSE; + + DPRINT("Enter NtUserGetTitleBarInfo\n"); + UserEnterExclusive(); + + /* Vaildate the windows handle */ + if (!(WindowObject = UserGetWindowObject(hwnd))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + retValue = FALSE; + } + + _SEH_TRY + { + /* Copy our usermode buffer bti to local buffer bartitleinfo */ + ProbeForRead(bti, sizeof(TITLEBARINFO), 1); + RtlCopyMemory(&bartitleinfo, bti, sizeof(TITLEBARINFO)); + } + _SEH_HANDLE + { + /* Fail copy the data */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + retValue = FALSE; + } + _SEH_END + + /* Get the tile bar info */ + if (retValue) + { + retValue = intGetTitleBarInfo(WindowObject, &bartitleinfo); + if (retValue) + { + _SEH_TRY + { + /* Copy our buffer to user mode buffer bti */ + ProbeForWrite(bti, sizeof(TITLEBARINFO), 1); + RtlCopyMemory(bti, &bartitleinfo, sizeof(TITLEBARINFO)); + } + _SEH_HANDLE + { + /* Fail copy the data */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + retValue = FALSE; + } + _SEH_END + } + } + + RETURN( retValue ); + +CLEANUP: + DPRINT("Leave NtUserGetTitleBarInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri May 23 00:46:22 2008 @@ -318,16 +318,7 @@ return 0; } -DWORD -STDCALL -NtUserGetTitleBarInfo( - HWND hwnd, - PTITLEBARINFO pti) -{ - UNIMPLEMENTED - - return 0; -} + DWORD STDCALL

1 0

[jimtabor] 33656: Removed w.flags from dc.h update all related.
by jimtabor＠svn.reactos.org 23 May '08

23 May '08

Author: jimtabor Date: Thu May 22 20:46:55 2008 New Revision: 33656 URL: http://svn.reactos.org/svn/reactos?rev=33656&view=rev Log: Removed w.flags from dc.h update all related. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dc.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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu May 22 20:46:55 2008 @@ -13,10 +13,6 @@ #define DCPATH_ACTIVE 0x0001 #define DCPATH_SAVE 0x0002 #define DCPATH_CLOCKWISE 0x0004 - - /* DC flags */ -#define DC_SAVED 0x0002 /* It is a saved DC */ -#define DC_DIRTY 0x0004 /* hVisRgn has to be updated */ // GDIDEVICE flags #define PDEV_DISPLAY 0x00000001 // Display device @@ -56,8 +52,6 @@ typedef struct _WIN_DC_INFO { - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ HRGN hrgnMeta; /* Meta region (may be 0) */ HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Thu May 22 20:46:55 2008 @@ -76,8 +76,8 @@ return ERROR; } - dc->w.flags &= ~DC_DIRTY; - + dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO; + if (dc->w.hVisRgn == NULL) { dc->w.hVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0); @@ -101,7 +101,7 @@ int fnMode) { int retval; - // dc->w.flags &= ~DC_DIRTY; + // dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO; if (!hrgn) { 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu May 22 20:46:55 2008 @@ -1019,7 +1019,7 @@ } /* Free GDI resources allocated to this DC */ - if (!(DCToDelete->w.flags & DC_SAVED)) + if (!(DCToDelete->DcLevel.flPath & DCPATH_SAVE)) { /* NtGdiSelectPen (DCHandle, STOCK_BLACK_PEN); @@ -1332,7 +1332,7 @@ nDc_Attr = newdc->pDc_Attr; if(!nDc_Attr) nDc_Attr = &newdc->Dc_Attr; - newdc->w.flags = dc->w.flags | DC_SAVED; + newdc->DcLevel.flPath = dc->DcLevel.flPath | DCPATH_SAVE; nDc_Attr->dwLayout = Dc_Attr->dwLayout; nDc_Attr->hpen = Dc_Attr->hpen; nDc_Attr->hbrush = Dc_Attr->hbrush; @@ -1405,7 +1405,7 @@ sDc_Attr = dcs->pDc_Attr; if(!sDc_Attr) sDc_Attr = &dcs->Dc_Attr; - dc->w.flags = dcs->w.flags & ~DC_SAVED; + dc->DcLevel.flPath = dcs->DcLevel.flPath & ~DCPATH_SAVE; dc->w.hFirstBitmap = dcs->w.hFirstBitmap; @@ -1539,7 +1539,7 @@ dcs = DC_LockDc ( hDCSave ); if ( dcs ) { - if ( dcs->w.flags & DC_SAVED ) + if ( dcs->DcLevel.flPath & DCPATH_SAVE ) { IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave); } @@ -2156,7 +2156,7 @@ return 0; } - wRet = dc->w.flags & DC_DIRTY; + wRet = dc->DC_Flags & DC_FLAG_DIRTY_RAO; // Fixme wrong flag! /* "Undocumented Windows" info is slightly confusing. */ @@ -2164,12 +2164,12 @@ DPRINT("DC %p, Flags %04x\n", hDC, Flags); if (Flags & DCHF_INVALIDATEVISRGN) - { - dc->w.flags |= DC_DIRTY; + { /* hVisRgn has to be updated */ + dc->DC_Flags |= DC_FLAG_DIRTY_RAO; } else if (Flags & DCHF_VALIDATEVISRGN || 0 == Flags) { - dc->w.flags &= ~DC_DIRTY; + dc->DC_Flags &= ~DC_FLAG_DIRTY_RAO; } DC_UnlockDc(dc);

1 0

[jimtabor] 33655: Move W structure back into dc.h and added the clip object for dcobj.
by jimtabor＠svn.reactos.org 23 May '08

23 May '08

Author: jimtabor Date: Thu May 22 20:11:25 2008 New Revision: 33655 URL: http://svn.reactos.org/svn/reactos?rev=33655&view=rev Log: Move W structure back into dc.h and added the clip object for dcobj. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Thu May 22 20:11:25 2008 @@ -318,49 +318,5 @@ void *pCharWidthData; } FONT_ATTR, *PFONT_ATTR; -typedef enum tagGdiPathState -{ - PATH_Null, - PATH_Open, - PATH_Closed -} GdiPathState; - -typedef struct tagGdiPath -{ - GdiPathState state; - POINT *pPoints; - BYTE *pFlags; - int numEntriesUsed, numEntriesAllocated; - BOOL newStroke; -} GdiPath; - -typedef struct _WIN_DC_INFO -{ - int flags; - - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hrgnMeta; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ - HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ - - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HBITMAP hBitmap; - HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ - -/* #if 0 */ - GdiPath path; -/* #endif */ - - RECT totalExtent; - BYTE bitsPerPixel; - - INT DCOrgX; /* DC origin */ - INT DCOrgY; - - XFORM xformWorld2Wnd; /* World-to-window transformation */ - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - XFORM xformVport2World; /* Inverse of the above transformation */ - BOOL vport2WorldValid; /* Is xformVport2World valid? */ -} WIN_DC_INFO; #endif 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu May 22 20:11:25 2008 @@ -37,6 +37,61 @@ #define PDEV_CLONE_DEVICE 0x00080000 /* Type definitions ***********************************************************/ + +typedef enum tagGdiPathState +{ + PATH_Null, + PATH_Open, + PATH_Closed +} GdiPathState; + +typedef struct tagGdiPath +{ + GdiPathState state; + POINT *pPoints; + BYTE *pFlags; + int numEntriesUsed, numEntriesAllocated; + BOOL newStroke; +} GdiPath; + +typedef struct _WIN_DC_INFO +{ + int flags; + + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hrgnMeta; /* Meta region (may be 0) */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ + HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ + + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + HBITMAP hBitmap; + HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ + +/* #if 0 */ + GdiPath path; +/* #endif */ + + RECT totalExtent; + BYTE bitsPerPixel; + + INT DCOrgX; /* DC origin */ + INT DCOrgY; + + XFORM xformWorld2Wnd; /* World-to-window transformation */ + XFORM xformWorld2Vport; /* World-to-viewport transformation */ + XFORM xformVport2World; /* Inverse of the above transformation */ + BOOL vport2WorldValid; /* Is xformVport2World valid? */ +} WIN_DC_INFO; + +typedef struct _XCLIPOBJ +{ + CLIPOBJ co; // Std Clip object. + DWORD Unknown[6]; + PVOID pClipRgn; // prgnRao_ or (prgnVis_ if (prgnRao_ == z)) + DWORD Unknown1[16]; + DWORD nComplexity; // count/mode based on # of rect in regions scan. + DWORD Unknown2; +} XCLIPOBJ, *PXCLIPOBJ; typedef struct _DCLEVEL { @@ -112,8 +167,8 @@ HFONT hlfntCur; FLONG flSimulationFlags; LONG lEscapement; - PVOID prfnt; // RFONT* - unsigned co_[31]; // CLIPOBJ + PVOID prfnt; // RFONT* + XCLIPOBJ co; // CLIPOBJ PVOID pPFFList; // PPFF* PVOID ClrxFormLnk; INT ipfdDevMax;

1 0

[mpiulachs] 33654: - Remove crtdll reference. All Win32* modules implicitly link msvcrt.
by mpiulachs＠svn.reactos.org 23 May '08

23 May '08

Author: mpiulachs Date: Thu May 22 19:57:32 2008 New Revision: 33654 URL: http://svn.reactos.org/svn/reactos?rev=33654&view=rev Log: - Remove crtdll reference. All Win32* modules implicitly link msvcrt. Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Thu May 22 19:57:32 2008 @@ -5,7 +5,6 @@ <define name="lint" /> <library>kernel32</library> <library>ws2_32</library> - <library>crtdll</library> <library>iphlpapi</library> <file>cmds.c</file> <file>cmdtab.c</file>

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