Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[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

[jimtabor] 33653: Removed unused code from Arc. Removed old saveLevel and hSelf, use DcLevel. Other changes to region and clipping.
by jimtabor＠svn.reactos.org 23 May '08

23 May '08

Author: jimtabor Date: Thu May 22 19:29:08 2008 New Revision: 33653 URL: http://svn.reactos.org/svn/reactos?rev=33653&view=rev Log: Removed unused code from Arc. Removed old saveLevel and hSelf, use DcLevel. Other changes to region and clipping. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -232,7 +232,7 @@ HRGN hrgn ) { - INT Ret = NtGdiGetRandomRgn(hdc, hrgn, 1); + INT Ret = NtGdiGetRandomRgn(hdc, hrgn, CLIPRGN); // if (Ret) // { // if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); @@ -248,7 +248,7 @@ GetMetaRgn(HDC hdc, HRGN hrgn) { - return NtGdiGetRandomRgn(hdc,hrgn,2); + return NtGdiGetRandomRgn(hdc, hrgn, METARGN); } /* 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 19:29:08 2008 @@ -115,7 +115,7 @@ PVOID prfnt; // RFONT* unsigned co_[31]; // CLIPOBJ PVOID pPFFList; // PPFF* - PVOID ClrxFormObj; + PVOID ClrxFormLnk; INT ipfdDevMax; ULONG ulCopyCount; PVOID pSurfInfo; @@ -128,9 +128,6 @@ CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen; - - INT saveLevel; // DCLEVEL lSaveDepth - HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. UNICODE_STRING DriverName; } DC, *PDC; @@ -264,4 +261,5 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); + #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -37,26 +37,6 @@ IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect); IntGdiSetRect(&rc1, XStartArc, YStartArc, XEndArc, YEndArc); - - if (dc->w.flags & DCX_WINDOW) //window rectangle instead of client rectangle - { - HWND hWnd; - PWINDOW_OBJECT Window; - - hWnd = IntWindowFromDC((HDC) dc->BaseObject.hHmgr); - Window = UserGetWindowObject(hWnd); - if(!Window) return FALSE; - - rc.left += Window->Wnd->ClientRect.left; - rc.top += Window->Wnd->ClientRect.top; - rc.right += Window->Wnd->ClientRect.left; - rc.bottom += Window->Wnd->ClientRect.top; - - rc1.left += Window->Wnd->ClientRect.left; - rc1.top += Window->Wnd->ClientRect.top; - rc1.right += Window->Wnd->ClientRect.left; - rc1.bottom += Window->Wnd->ClientRect.top; - } rx = (rc.right - rc.left)/2 - 1; ry = (rc.bottom - rc.top)/2 -1; 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 19:29:08 2008 @@ -225,13 +225,6 @@ return Ret; } -int STDCALL NtGdiGetMetaRgn(HDC hDC, - HRGN hrgn) -{ - UNIMPLEMENTED; - return 0; -} - int STDCALL NtGdiExcludeClipRect(HDC hDC, int LeftRect, int TopRect, @@ -430,10 +423,146 @@ return Result; } +int +FASTCALL +IntGdiSetMetaRgn(PDC pDC) +{ + INT Ret = ERROR; + PROSRGNDATA TempRgn; + + if ( pDC->DcLevel.prgnMeta ) + { + if ( pDC->DcLevel.prgnClip ) + { + TempRgn = REGION_AllocRgnWithHandle(1); + + if (TempRgn) + { + REGION_SetRectRgn(TempRgn, 0, 0, 0, 0); + Ret = IntGdiCombineRgn( TempRgn, + pDC->DcLevel.prgnMeta, + pDC->DcLevel.prgnClip, + RGN_AND); + if ( Ret ) + { + REGION_UnlockRgn(TempRgn); + TempRgn = GDIOBJ_ShareLockObj(TempRgn->BaseObject.hHmgr, + GDI_OBJECT_TYPE_REGION); + + GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnMeta); + if (!((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.ulShareCount) + REGION_FreeRgn(pDC->DcLevel.prgnMeta); + + pDC->DcLevel.prgnMeta = TempRgn; + + GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnClip); + if (!((PROSRGNDATA)pDC->DcLevel.prgnClip)->BaseObject.ulShareCount) + REGION_FreeRgn(pDC->DcLevel.prgnClip); + + pDC->DcLevel.prgnClip = NULL; + + pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; + pDC->erclClip.left = 0; + pDC->erclClip.top = 0; + pDC->erclClip.right = 0; + pDC->erclClip.bottom = 0; + + } + else + REGION_FreeRgn(TempRgn); + } + } + else + Ret = REGION_Complexity(pDC->DcLevel.prgnMeta); + } + else + { + if ( pDC->DcLevel.prgnClip ) + { + Ret = REGION_Complexity(pDC->DcLevel.prgnClip); + pDC->DcLevel.prgnMeta = pDC->DcLevel.prgnClip; + pDC->DcLevel.prgnClip = NULL; + } + else + Ret = SIMPLEREGION; + } + return Ret; +} + + int STDCALL NtGdiSetMetaRgn(HDC hDC) { - UNIMPLEMENTED; - return 0; + INT Ret; + PDC pDC = DC_LockDc(hDC); + + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return ERROR; + } + Ret = IntGdiSetMetaRgn(pDC); + + DC_UnlockDc(pDC); + return Ret; +} + +INT FASTCALL +NEW_CLIPPING_UpdateGCRegion(PDC pDC) +{ + CLIPOBJ * co; + + if (!pDC->prgnVis) return 0; + + if (pDC->prgnAPI) + { + REGION_FreeRgn(pDC->prgnAPI); + pDC->prgnAPI = REGION_AllocRgnWithHandle(1); + REGION_SetRectRgn(pDC->prgnAPI, 0, 0, 0, 0); + } + + if (pDC->prgnRao) + { + REGION_FreeRgn(pDC->prgnRao); + pDC->prgnRao = REGION_AllocRgnWithHandle(1); + REGION_SetRectRgn(pDC->prgnRao, 0, 0, 0, 0); + } + + if (pDC->DcLevel.prgnMeta && pDC->DcLevel.prgnClip) + { + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnClip, + pDC->DcLevel.prgnMeta, + RGN_AND); + } + else + { + if (pDC->DcLevel.prgnClip) + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnClip, + NULL, + RGN_COPY); + else if (pDC->DcLevel.prgnMeta) + IntGdiCombineRgn( pDC->prgnAPI, + pDC->DcLevel.prgnMeta, + NULL, + RGN_COPY); + } + + IntGdiCombineRgn( pDC->prgnRao, + pDC->prgnVis, + pDC->prgnAPI, + RGN_AND); + + RtlCopyMemory(&pDC->erclClip, &((PROSRGNDATA)pDC->prgnRao)->rdh.rcBound , sizeof(RECTL)); + pDC->DC_Flags &= ~DC_FLAG_DIRTY_RAO; + +// if (Dc->CombinedClip != NULL) IntEngDeleteClipRegion(Dc->CombinedClip); + + co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount, + (PRECTL)((PROSRGNDATA)pDC->prgnRao)->Buffer, + (PRECTL)&pDC->erclClip); + + return REGION_Complexity(pDC->prgnRao); } /* EOF */ 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 19:29:08 2008 @@ -107,7 +107,7 @@ if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr; /* Copy information from original DC to new DC */ - NewDC->hSelf = hNewDC; + NewDC->DcLevel.hdcSave = hNewDC; NewDC->PDev = OrigDC->PDev; @@ -1001,7 +1001,7 @@ } /* First delete all saved DCs */ - while (DCToDelete->saveLevel) + while (DCToDelete->DcLevel.lSaveDepth) { PDC savedDC; HDC savedHDC; @@ -1013,7 +1013,7 @@ break; } DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); - DCToDelete->saveLevel--; + DCToDelete->DcLevel.lSaveDepth--; DC_UnlockDc( savedDC ); IntGdiDeleteDC(savedHDC, Force); } @@ -1376,7 +1376,7 @@ nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg; nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt; - newdc->saveLevel = 0; + newdc->DcLevel.lSaveDepth = 0; newdc->DC_Type = dc->DC_Type; #if 0 @@ -1518,7 +1518,7 @@ /* FIXME - newdc can be NULL!!!! Don't assert here!!! */ ASSERT( newdc ); - newdc->hSelf = hnewdc; + newdc->DcLevel.hdcSave = hnewdc; IntGdiCopyToSaveState( dc, newdc); DC_UnlockDc( newdc ); @@ -1541,7 +1541,7 @@ { if ( dcs->w.flags & DC_SAVED ) { - IntGdiCopyFromSaveState( dc, dcs, dc->hSelf); + IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave); } else { @@ -1805,16 +1805,16 @@ } if (SaveLevel < 0) - SaveLevel = dc->saveLevel + SaveLevel + 1; - - if(SaveLevel < 0 || dc->saveLevel<SaveLevel) + SaveLevel = dc->DcLevel.lSaveDepth + SaveLevel + 1; + + if(SaveLevel < 0 || dc->DcLevel.lSaveDepth<SaveLevel) { DC_UnlockDc(dc); return FALSE; } success=TRUE; - while (dc->saveLevel >= SaveLevel) + while (dc->DcLevel.lSaveDepth >= SaveLevel) { HDC hdcs = DC_GetNextDC (dc); @@ -1828,7 +1828,7 @@ DC_SetNextDC (dc, DC_GetNextDC (dcs)); dcs->hNext = 0; - if (--dc->saveLevel < SaveLevel) + if (--dc->DcLevel.lSaveDepth < SaveLevel) { DC_UnlockDc( dc ); DC_UnlockDc( dcs ); @@ -1903,7 +1903,7 @@ DC_SetNextDC (dcs, DC_GetNextDC (dc)); DC_SetNextDC (dc, hdcs); - ret = ++dc->saveLevel; + ret = ++dc->DcLevel.lSaveDepth; DC_UnlockDc( dcs ); DC_UnlockDc( dc ); Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Thu May 22 19:29:08 2008 @@ -138,7 +138,7 @@ (pReg)->rdh.nCount = 0; \ (pReg)->rdh.rcBound.left = (pReg)->rdh.rcBound.top = 0; \ (pReg)->rdh.rcBound.right = (pReg)->rdh.rcBound.bottom = 0; \ - (pReg)->rdh.iType = NULLREGION; \ + (pReg)->rdh.iType = RDH_RECTANGLES; \ } #define REGION_NOT_EMPTY(pReg) pReg->rdh.nCount @@ -542,7 +542,7 @@ pReg->rdh.rcBound.top = 0; pReg->rdh.rcBound.right = 0; pReg->rdh.rcBound.bottom = 0; - pReg->rdh.iType = NULLREGION; + pReg->rdh.iType = RDH_RECTANGLES; return; } @@ -570,7 +570,7 @@ pExtents->right = pRect->right; pRect++; } - pReg->rdh.iType = (1 == pReg->rdh.nCount ? SIMPLEREGION : COMPLEXREGION); + pReg->rdh.iType = RDH_RECTANGLES; } // FIXME: This seems to be wrong @@ -724,7 +724,7 @@ rgnDst->rdh.rcBound.top = ((PRECT)rgnDst->Buffer)->top; rgnDst->rdh.rcBound.bottom = ((PRECT)rgnDst->Buffer + j)->bottom; - rgnDst->rdh.iType = (j >= 1) ? COMPLEXREGION : SIMPLEREGION; + rgnDst->rdh.iType = RDH_RECTANGLES; } return TRUE; @@ -1181,11 +1181,6 @@ ASSERT(newReg->Buffer); } } - - if (newReg->rdh.nCount == 0) - newReg->rdh.iType = NULLREGION; - else - newReg->rdh.iType = (newReg->rdh.nCount > 1)? COMPLEXREGION : SIMPLEREGION; if (oldRects != &newReg->rdh.rcBound) ExFreePool(oldRects); @@ -1886,7 +1881,7 @@ return FALSE; } - if (srcObj->rdh.iType == SIMPLEREGION) + if (REGION_Complexity(srcObj) == SIMPLEREGION) { if (!REGION_CreateSimpleFrameRgn(destObj, x, y)) { @@ -2096,7 +2091,7 @@ { if ( !REGION_CopyRegion(destRgn, src1Rgn) ) return ERROR; - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else { @@ -2117,7 +2112,7 @@ REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); break; } - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else if (src2Rgn == NULL) { @@ -2156,7 +2151,7 @@ { if ( !REGION_CopyRegion(destRgn, src1Rgn) ) return ERROR; - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else { @@ -2179,7 +2174,7 @@ break; } REGION_UnlockRgn(src2Rgn); - result = destRgn->rdh.iType; + result = REGION_Complexity(destRgn); } else if (hSrc2 == NULL) { @@ -2554,7 +2549,7 @@ if (Rgn) { *pRect = Rgn->rdh.rcBound; - ret = Rgn->rdh.iType; + ret = REGION_Complexity(Rgn); return ret; } @@ -2562,7 +2557,21 @@ } -/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw */ +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw + + 1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong! + + The intersection of the clip with the meta region is not Rao it's API! + Go back and read 7.2 Clipping pages 418-19: + Rao = API & Vis: + 1) The Rao region is the intersection of the API region and the system region, + named after the Microsoft engineer who initially proposed it. + 2) The Rao region can be calculated from the API region and the system region. + + API: + API region is the intersection of the meta region and the clipping region, + clearly named after the fact that it is controlled by GDI API calls. +*/ INT STDCALL NtGdiGetRandomRgn( HDC hDC, @@ -2584,16 +2593,14 @@ switch (iCode) { - case 1: + case CLIPRGN: hSrc = pDC->w.hClipRgn; +// if (dc->DcLevel.prgnClip) hSrc = ((PROSRGNDATA)dc->DcLevel.prgnClip)->BaseObject.hHmgr; break; - case 2: - //hSrc = dc->hMetaRgn; - DPRINT1("hMetaRgn not implemented\n"); - DC_UnlockDc(pDC); - return -1; + case METARGN: + if (pDC->DcLevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.hHmgr; break; - case 3: + case APIRGN: DPRINT1("hMetaRgn not implemented\n"); //hSrc = dc->hMetaClipRgn; if (!hSrc) @@ -2601,9 +2608,11 @@ hSrc = pDC->w.hClipRgn; } //if (!hSrc) rgn = dc->hMetaRgn; +// if (dc->prgnAPI) hSrc = ((PROSRGNDATA)dc->prgnAPI)->BaseObject.hHmgr; break; - case 4: + case SYSRGN: hSrc = pDC->w.hVisRgn; +// if (dc->prgnVis) hSrc = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr; break; default: hSrc = 0; @@ -2768,7 +2777,7 @@ } } } - ret = rgn->rdh.iType; + ret = REGION_Complexity(rgn); REGION_UnlockRgn(rgn); return ret; } @@ -2984,7 +2993,7 @@ firstRect->right = rgn->rdh.rcBound.right = RightRect; firstRect->bottom = rgn->rdh.rcBound.bottom = BottomRect; rgn->rdh.nCount = 1; - rgn->rdh.iType = SIMPLEREGION; + rgn->rdh.iType = RDH_RECTANGLES; } else EMPTY_REGION(rgn);

1 0

[cfinck] 33652: Apply the fix from r32705 to C and C++ files as well. This fixes the "rebuild-everything-on-every-change" bug (at least for me) For the record, this is broken since r32595. Note: If you have building problems after this commit when building a single module, please try to revert only my changes from lines 1847 to 1850.
by cfinck＠svn.reactos.org 23 May '08

23 May '08

Author: cfinck Date: Thu May 22 19:11:52 2008 New Revision: 33652 URL: http://svn.reactos.org/svn/reactos?rev=33652&view=rev Log: Apply the fix from r32705 to C and C++ files as well. This fixes the "rebuild-everything-on-every-change" bug (at least for me) For the record, this is broken since r32595. Note: If you have building problems after this commit when building a single module, please try to revert only my changes from lines 1847 to 1850. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu May 22 19:11:52 2008 @@ -1350,19 +1350,23 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); -Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); @@ -1844,10 +1848,9 @@ if ( rpcDependencies.size () > 0 ) dependencies += " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, - "%s: %s ${%s_precondition} | %s\n", + "%s: %s | %s\n", backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str(), - module.name.c_str (), backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile,

1 0

[tkreuzer] 33651: fix a cast and indentation
by tkreuzer＠svn.reactos.org 22 May '08

22 May '08

Author: tkreuzer Date: Thu May 22 18:16:35 2008 New Revision: 33651 URL: http://svn.reactos.org/svn/reactos?rev=33651&view=rev Log: fix a cast and indentation Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Thu May 22 18:16:35 2008 @@ -144,15 +144,15 @@ (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&DefaultGuiFont, (HFONT*)&StockObjects[DEFAULT_GUI_FONT]); - StockObjects[DEFAULT_PALETTE] = (HGDIOBJ*)PALETTE_Init(); + StockObjects[DEFAULT_PALETTE] = (HGDIOBJ)PALETTE_Init(); for (Object = 0; Object < NB_STOCK_OBJECTS; Object++) + { + if (NULL != StockObjects[Object]) { - if (NULL != StockObjects[Object]) - { - GDIOBJ_ConvertToStockObj(&StockObjects[Object]); - } + GDIOBJ_ConvertToStockObj(&StockObjects[Object]); } + } DPRINT("Completed creation of stock objects\n"); }

1 0

[sedwards] 33650: Sync GetTempPathW with current Wine. This should help with some installers the depend on the USERPROFILE variable being present. Does not fix the Word 2003 viewer install but changes the behavior slightly and is more correct.
by sedwards＠svn.reactos.org 22 May '08

22 May '08

Author: sedwards Date: Thu May 22 16:07:41 2008 New Revision: 33650 URL: http://svn.reactos.org/svn/reactos?rev=33650&view=rev Log: Sync GetTempPathW with current Wine. This should help with some installers the depend on the USERPROFILE variable being present. Does not fix the Word 2003 viewer install but changes the behavior slightly and is more correct. Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Thu May 22 16:07:41 2008 @@ -166,16 +166,19 @@ LPWSTR path ) { - WCHAR tmp_path[MAX_PATH]; - WCHAR tmp_full_path[MAX_PATH]; - UINT ret; - - TRACE("GetTempPathW(%lu,%p)\n", count, path); - - if (!(ret = GetEnvironmentVariableW( L"TMP", tmp_path, MAX_PATH ))) - if (!(ret = GetEnvironmentVariableW( L"TEMP", tmp_path, MAX_PATH ))) - if (!(ret = GetCurrentDirectoryW( MAX_PATH, tmp_path ))) - return 0; + static const WCHAR tmp[] = { 'T', 'M', 'P', 0 }; + static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; + static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; + WCHAR tmp_path[MAX_PATH]; + UINT ret; + + TRACE("%u,%p\n", count, path); + + if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && + !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) + return 0; if (ret > MAX_PATH) { @@ -183,7 +186,7 @@ return 0; } - ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_full_path, NULL); + ret = GetFullPathNameW(tmp_path, MAX_PATH, tmp_path, NULL); if (!ret) return 0; if (ret > MAX_PATH - 2) @@ -192,17 +195,17 @@ return 0; } - if (tmp_full_path[ret-1] != '\\') - { - tmp_full_path[ret++] = '\\'; - tmp_full_path[ret] = '\0'; + if (tmp_path[ret-1] != '\\') + { + tmp_path[ret++] = '\\'; + tmp_path[ret] = '\0'; } ret++; /* add space for terminating 0 */ if (count) { - lstrcpynW(path, tmp_full_path, count); + lstrcpynW(path, tmp_path, count); if (count >= ret) ret--; /* return length without 0 */ else if (count < 4)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008