Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 28470: create stub for both CreateCompatibleDC and CreateCompatibleBitmap instead for redirect them, they need share memory, and it need do some stuff in user mode
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 18:02:10 2007 New Revision: 28470 URL: http://svn.reactos.org/svn/reactos?rev=28470&view=rev Log: create stub for both CreateCompatibleDC and CreateCompatibleBitmap instead for redirect them, they need share memory, and it need do some stuff in user mode Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 18:02:10 2007 @@ -47,20 +47,21 @@ CopyMetaFileW@8 CreateBitmap@20 CreateBitmapIndirect@4 +CreateColorSpaceA@4 +CreateColorSpaceW@4 +CreateCompatibleBitmap@12 +CreateCompatibleDC@4 +CreateDCA@16 +CreateDCW@16 +CreateDIBPatternBrush@8 +CreateDIBPatternBrushPt@8 +CreateDIBSection@24 ClearBitmapAttributes@8 ClearBrushAttributes@8 CopyMetaFileA@8 CopyMetaFileW@8 CreateBrushIndirect@4 -CreateColorSpaceA@4 -CreateColorSpaceW@4 -CreateCompatibleBitmap@12=NtGdiCreateCompatibleBitmap@12 -CreateCompatibleDC@4=NtGdiCreateCompatibleDC@4 -CreateDCA@16 -CreateDCW@16 -CreateDIBPatternBrush@8 -CreateDIBPatternBrushPt@8 CreateDIBSection@24 CreateDIBitmap@24=NtGdiCreateDIBitmap@24 CreateDiscardableBitmap@12 Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Thu Aug 23 18:02:10 2007 @@ -139,6 +139,18 @@ } +HBITMAP WINAPI +CreateCompatibleBitmap( + HDC hDC, + INT Width, + INT Height) +{ + /* FIXME some part shall be done in user mode */ + return NtGdiCreateCompatibleBitmap(hDC, Width, Height); +} + + + INT WINAPI SetDIBitsToDevice( HDC hDC, Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Thu Aug 23 18:02:10 2007 @@ -78,6 +78,17 @@ return hDC; } + +/* + * @implemented + */ +HDC +STDCALL +CreateCompatibleDC ( HDC hdc) +{ + /* FIXME need sharememory if it metadc */ + return NtGdiCreateCompatibleDC(hdc); +} /* * @implemented

1 0

[greatlrd] 28469: remove redirect of CombineRgn and CreateBitmap some part are need be done in user mode. not in win32k, implement it as stub, and doing the syscall until some got time review and rewrite this code right
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 16:54:09 2007 New Revision: 28469 URL: http://svn.reactos.org/svn/reactos?rev=28469&view=rev Log: remove redirect of CombineRgn and CreateBitmap some part are need be done in user mode. not in win32k, implement it as stub, and doing the syscall until some got time review and rewrite this code right Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 16:54:09 2007 @@ -37,19 +37,21 @@ CloseEnhMetaFile@4 CloseFigure@4 CloseMetaFile@4 - -ClearBitmapAttributes@8 -ClearBrushAttributes@8 ColorCorrectPalette@16 ColorMatchToTarget@12 -CombineRgn@16=NtGdiCombineRgn@16 +CombineRgn@16 CombineTransform@12=NtGdiCombineTransform@12 CopyEnhMetaFileA@8 CopyEnhMetaFileW@8 CopyMetaFileA@8 CopyMetaFileW@8 -CreateBitmap@20=NtGdiCreateBitmap@20 +CreateBitmap@20 CreateBitmapIndirect@4 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 +CopyMetaFileA@8 +CopyMetaFileW@8 CreateBrushIndirect@4 CreateColorSpaceA@4 CreateColorSpaceW@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 23 16:54:09 2007 @@ -2432,7 +2432,34 @@ return 0; } - +/* + * @unimplemented + */ +INT +STDCALL +CombineRgn(HRGN hDest, + HRGN hSrc1, + HRGN hSrc2, + INT CombineMode) +{ + /* FIXME some part should be done in user mode */ + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); +} + +/* + * @unimplemented + */ +HBITMAP STDCALL +CreateBitmap( + INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + PCVOID pUnsafeBits) +{ + /* FIXME some part should be done in user mode */ + return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); +} /* * @unimplemented

1 0

[greatlrd] 28468: sorry fixed break in comping
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 16:43:06 2007 New Revision: 28468 URL: http://svn.reactos.org/svn/reactos?rev=28468&view=rev Log: sorry fixed break in comping Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c 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 (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Thu Aug 23 16:43:06 2007 @@ -1260,7 +1260,7 @@ NtGdiBRUSHOBJ_ulGetBrushColor(BRUSHOBJ *pbo) { UNIMPLEMENTED; - return NULL; + return 0; } /* @@ -1287,7 +1287,7 @@ IN ULONG MaxRects) { UNIMPLEMENTED; - return NULL; + return 0; }

1 0

[greatlrd] 28467: Redirect : BRUSHOBJ_pvGetRbrush@4 to NtGdiBRUSHOBJ_pvGetRbrush@4 Redirect : BRUSHOBJ_ulGetBrushColor@4 to NtGdiBRUSHOBJ_ulGetBrushColor@4 Redirect : CLIPOBJ_bEnum@12 to NtGdiCLIPOBJ_bEnum@12 Redirect : CLIPOBJ_cEnumStart@20 to NtGdiCLIPOBJ_cEnumStart@20 Redirect : CLIPOBJ_ppoGetPath@4 to NtGdiCLIPOBJ_ppoGetPath@4
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 16:10:13 2007 New Revision: 28467 URL: http://svn.reactos.org/svn/reactos?rev=28467&view=rev Log: Redirect : BRUSHOBJ_pvGetRbrush@4 to NtGdiBRUSHOBJ_pvGetRbrush@4 Redirect : BRUSHOBJ_ulGetBrushColor@4 to NtGdiBRUSHOBJ_ulGetBrushColor@4 Redirect : CLIPOBJ_bEnum@12 to NtGdiCLIPOBJ_bEnum@12 Redirect : CLIPOBJ_cEnumStart@20 to NtGdiCLIPOBJ_cEnumStart@20 Redirect : CLIPOBJ_ppoGetPath@4 to NtGdiCLIPOBJ_ppoGetPath@4 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 16:10:13 2007 @@ -23,23 +23,23 @@ ArcTo@36 BRUSHOBJ_hGetColorTransform@4=NtGdiBRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8=NtGdiBRUSHOBJ_pvAllocRbrush@8 - -BRUSHOBJ_pvGetRbrush@4 -BRUSHOBJ_ulGetBrushColor@4 +BRUSHOBJ_pvGetRbrush@4=NtGdiBRUSHOBJ_pvGetRbrush@4 +BRUSHOBJ_ulGetBrushColor@4=NtGdiBRUSHOBJ_ulGetBrushColor@4 BeginPath@4 BitBlt@36 -CLIPOBJ_bEnum@12 -CLIPOBJ_cEnumStart@20 -CLIPOBJ_ppoGetPath@4 +CLIPOBJ_bEnum@12=NtGdiCLIPOBJ_bEnum@12 +CLIPOBJ_cEnumStart@20=NtGdiCLIPOBJ_cEnumStart@20 +CLIPOBJ_ppoGetPath@4=NtGdiCLIPOBJ_ppoGetPath@4 CancelDC@4 CheckColorsInGamut@16 ChoosePixelFormat@8 Chord@36 -ClearBitmapAttributes@8 -ClearBrushAttributes@8 CloseEnhMetaFile@4 CloseFigure@4 CloseMetaFile@4 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 ColorCorrectPalette@16 ColorMatchToTarget@12 CombineRgn@16=NtGdiCombineRgn@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 23 16:10:13 2007 @@ -2434,69 +2434,6 @@ - - -/* - * @unimplemented - */ -PVOID STDCALL -BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG STDCALL -BRUSHOBJ_ulGetBrushColor(BRUSHOBJ *pbo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -CLIPOBJ_bEnum(IN CLIPOBJ *ClipObj, - IN ULONG ObjSize, - OUT ULONG *EnumRects) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG STDCALL -CLIPOBJ_cEnumStart(IN CLIPOBJ *ClipObj, - IN BOOL ShouldDoAll, - IN ULONG ClipType, - IN ULONG BuildOrder, - IN ULONG MaxRects) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -PATHOBJ* STDCALL -CLIPOBJ_ppoGetPath(CLIPOBJ *ClipObj) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* * @unimplemented */

1 0

[greatlrd] 28466: Implement stub : NtGdiCLIPOBJ_bEnum Implement stub : NtGdiCLIPOBJ_cEnumStart Implement stub : NtGdiCLIPOBJ_ppoGetPath Implement stub : NtGdiBRUSHOBJ_ulGetBrushColor Implement stub : NtGdiBRUSHOBJ_pvAllocRbrush Implement stub : NtGdiBRUSHOBJ_pvGetRbrush
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 16:07:37 2007 New Revision: 28466 URL: http://svn.reactos.org/svn/reactos?rev=28466&view=rev Log: Implement stub : NtGdiCLIPOBJ_bEnum Implement stub : NtGdiCLIPOBJ_cEnumStart Implement stub : NtGdiCLIPOBJ_ppoGetPath Implement stub : NtGdiBRUSHOBJ_ulGetBrushColor Implement stub : NtGdiBRUSHOBJ_pvAllocRbrush Implement stub : NtGdiBRUSHOBJ_pvGetRbrush Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db 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 (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Thu Aug 23 16:07:37 2007 @@ -1243,3 +1243,61 @@ return NULL; } +/* + * @unimplemented + */ +PVOID STDCALL +NtGdiBRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +ULONG STDCALL +NtGdiBRUSHOBJ_ulGetBrushColor(BRUSHOBJ *pbo) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +BOOL STDCALL +NtGdiCLIPOBJ_bEnum( IN CLIPOBJ *ClipObj, + IN ULONG ObjSize, + OUT ULONG *EnumRects) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +ULONG STDCALL +NtGdiCLIPOBJ_cEnumStart(IN CLIPOBJ *ClipObj, + IN BOOL ShouldDoAll, + IN ULONG ClipType, + IN ULONG BuildOrder, + IN ULONG MaxRects) +{ + UNIMPLEMENTED; + return NULL; +} + + +/* + * @unimplemented + */ +PATHOBJ* STDCALL +NtGdiCLIPOBJ_ppoGetPath(CLIPOBJ *ClipObj) +{ + UNIMPLEMENTED; + return NULL; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 16:07:37 2007 @@ -634,15 +634,15 @@ # NtGdiXLATEOBJ_cGetPalette 4 # NtGdiXLATEOBJ_iXlate 2 # NtGdiXLATEOBJ_hGetColorTransform 1 -# NtGdiCLIPOBJ_bEnum 3 -# NtGdiCLIPOBJ_cEnumStart 5 -# NtGdiCLIPOBJ_ppoGetPath 1 +NtGdiCLIPOBJ_bEnum 3 +NtGdiCLIPOBJ_cEnumStart 5 +NtGdiCLIPOBJ_ppoGetPath 1 # NtGdiEngDeletePath 1 # NtGdiEngCreateClip 0 # NtGdiEngDeleteClip 1 -# NtGdiBRUSHOBJ_ulGetBrushColor 1 -NtGdiBRUSHOBJ_pvAllocRbrush 2 -# NtGdiBRUSHOBJ_pvGetRbrush 1 +NtGdiBRUSHOBJ_ulGetBrushColor 1 +NtGdiBRUSHOBJ_pvAllocRbrush 2 +NtGdiBRUSHOBJ_pvGetRbrush 1 NtGdiBRUSHOBJ_hGetColorTransform 1 # NtGdiXFORMOBJ_bApplyXform 5 # NtGdiXFORMOBJ_iGetXform 2

1 0

[greatlrd] 28465: Bugfix : AddFontResourceExW, SetLastError to invaild param when the fl are not set. Redirect : AnyLinkedFonts@0 to NtGdiAnyLinkedFonts@0 (stubed in win32k) Redirect : BRUSHOBJ_hGetColorTransform@4 to NtGdiBRUSHOBJ_hGetColorTransform@4 (stubed in win32k) Redirect : BRUSHOBJ_pvAllocRbrush@8 to NtGdiBRUSHOBJ_pvAllocRbrush@8 (stubed in win32k) partly working : GdiAddFontResourceW is parttly working but it does not works as windows version, instead for being stub, it is not finish i
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 13:52:31 2007 New Revision: 28465 URL: http://svn.reactos.org/svn/reactos?rev=28465&view=rev Log: Bugfix : AddFontResourceExW, SetLastError to invaild param when the fl are not set. Redirect : AnyLinkedFonts@0 to NtGdiAnyLinkedFonts@0 (stubed in win32k) Redirect : BRUSHOBJ_hGetColorTransform@4 to NtGdiBRUSHOBJ_hGetColorTransform@4 (stubed in win32k) Redirect : BRUSHOBJ_pvAllocRbrush@8 to NtGdiBRUSHOBJ_pvAllocRbrush@8 (stubed in win32k) partly working : GdiAddFontResourceW is parttly working but it does not works as windows version, instead for being stub, it is not finish implementions of it. This is nassry to clean up some mess. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 13:52:31 2007 @@ -14,28 +14,29 @@ AddFontResourceA@4 AddFontResourceExA@12 AddFontResourceExW@12 +AddFontResourceTracking@8 AddFontResourceW@4 -AddFontResourceTracking@8 AngleArc@24 AnimatePalette@16 -AnyLinkedFonts@0 +AnyLinkedFonts@0=NtGdiAnyLinkedFonts@0 Arc@36 ArcTo@36 -BeginPath@4 -BRUSHOBJ_hGetColorTransform@4 -BRUSHOBJ_pvAllocRbrush@8 +BRUSHOBJ_hGetColorTransform@4=NtGdiBRUSHOBJ_hGetColorTransform@4 +BRUSHOBJ_pvAllocRbrush@8=NtGdiBRUSHOBJ_pvAllocRbrush@8 + BRUSHOBJ_pvGetRbrush@4 BRUSHOBJ_ulGetBrushColor@4 +BeginPath@4 BitBlt@36 +CLIPOBJ_bEnum@12 +CLIPOBJ_cEnumStart@20 +CLIPOBJ_ppoGetPath@4 CancelDC@4 CheckColorsInGamut@16 ChoosePixelFormat@8 Chord@36 ClearBitmapAttributes@8 ClearBrushAttributes@8 -CLIPOBJ_bEnum@12 -CLIPOBJ_cEnumStart@20 -CLIPOBJ_ppoGetPath@4 CloseEnhMetaFile@4 CloseFigure@4 CloseMetaFile@4 Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Thu Aug 23 13:52:31 2007 @@ -184,5 +184,9 @@ WINAPI UserRealizePalette(HDC hDC); +int +STDCALL +GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv); + /* EOF */ Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 23 13:52:31 2007 @@ -1314,17 +1314,7 @@ return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -AnyLinkedFonts(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2442,28 +2432,9 @@ return 0; } -/* - * @unimplemented - */ -HANDLE STDCALL -BRUSHOBJ_hGetColorTransform(BRUSHOBJ *pbo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -PVOID STDCALL -BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, - IN ULONG ObjSize) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + + + /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Thu Aug 23 13:52:31 2007 @@ -258,11 +258,16 @@ */ int STDCALL -GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv) +{ + UNICODE_STRING Filename; + //UNIMPLEMENTED; + //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + //return 0; + + /* FIXME handle fl parameter */ + RtlInitUnicodeString(&Filename, lpszFilename); + return NtGdiAddFontResource ( &Filename, fl ); } /* 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 (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Thu Aug 23 13:52:31 2007 @@ -1091,11 +1091,17 @@ STDCALL AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved ) { - UNICODE_STRING Filename; - - /* FIXME handle fl parameter */ - RtlInitUnicodeString(&Filename, lpszFilename); - return NtGdiAddFontResource ( &Filename, fl ); + int retVal = 0; + + if (fl & (FR_PRIVATE | FR_NOT_ENUM)) + { + retVal = GdiAddFontResourceW(lpszFilename, fl,0); + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + } + return retVal; }

1 0

[greatlrd] 28464: adding stub for NtGdiAnyLinkedFonts, NtGdiBRUSHOBJ_hGetColorTransform, NtGdiBRUSHOBJ_pvAllocRbrush
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Thu Aug 23 13:44:26 2007 New Revision: 28464 URL: http://svn.reactos.org/svn/reactos?rev=28464&view=rev Log: adding stub for NtGdiAnyLinkedFonts, NtGdiBRUSHOBJ_hGetColorTransform, NtGdiBRUSHOBJ_pvAllocRbrush Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db 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 (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Thu Aug 23 13:44:26 2007 @@ -6,6 +6,9 @@ #define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); } #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) + + + /* * @unimplemented @@ -1204,3 +1207,39 @@ UNIMPLEMENTED; return NULL; } + + +/* + * @unimplemented + */ + +BOOL +STDCALL +NtGdiAnyLinkedFonts() +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +HANDLE STDCALL +NtGdiBRUSHOBJ_hGetColorTransform( + IN BRUSHOBJ *Brush) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +PVOID STDCALL +NtGdiBRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj, + IN ULONG ObjSize) +{ + UNIMPLEMENTED; + return NULL; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 13:44:26 2007 @@ -15,7 +15,7 @@ # NtGdiAddRemoteMMInstanceToDC 3 NtGdiAlphaBlend 12 NtGdiAngleArc 6 -# NtGdiAnyLinkedFonts 0 +NtGdiAnyLinkedFonts 0 # NtGdiFontIsLinked 1 NtGdiArcInternal 10 NtGdiBeginPath 1 @@ -641,9 +641,9 @@ # NtGdiEngCreateClip 0 # NtGdiEngDeleteClip 1 # NtGdiBRUSHOBJ_ulGetBrushColor 1 -# NtGdiBRUSHOBJ_pvAllocRbrush 2 +NtGdiBRUSHOBJ_pvAllocRbrush 2 # NtGdiBRUSHOBJ_pvGetRbrush 1 -# NtGdiBRUSHOBJ_hGetColorTransform 1 +NtGdiBRUSHOBJ_hGetColorTransform 1 # NtGdiXFORMOBJ_bApplyXform 5 # NtGdiXFORMOBJ_iGetXform 2 # NtGdiFONTOBJ_vGetInfo 3

1 0

[fireball] 28463: Dmitry Chapyshev <lentind@yandex.ru>: - Add a shortcut to a charmap tool, create start menu group for it.
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Thu Aug 23 13:05:04 2007 New Revision: 28463 URL: http://svn.reactos.org/svn/reactos?rev=28463&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Add a shortcut to a charmap tool, create start menu group for it. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Thu Aug 23 13:05:04 2007 @@ -611,6 +611,12 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); } + /* Creacte System Tools subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); + } + /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Thu Aug 23 13:05:04 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" IDS_REGISTERING_COMPONENTS "Registruji souèásti..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Thu Aug 23 13:05:04 2007 @@ -216,6 +216,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unbekannter Fehler" IDS_REGISTERING_COMPONENTS "Registriere Komponenten..." @@ -241,6 +247,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc Thu Aug 23 13:05:04 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" IDS_UNKNOWN_ERROR "¢ãíùóôï óöÜëìá" IDS_REGISTERING_COMPONENTS "Êáôá÷þñçóç óôïé÷åßùí óôï ìçôñþï..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Thu Aug 23 13:05:04 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Thu Aug 23 13:05:04 2007 @@ -237,6 +237,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -262,6 +268,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Thu Aug 23 13:05:04 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Thu Aug 23 13:05:04 2007 @@ -229,6 +229,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Telepítõ" IDS_UNKNOWN_ERROR "Hiba lépett fel, de nemtudni annak okát" IDS_REGISTERING_COMPONENTS "Komponensek regisztrációja..." @@ -254,6 +260,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Thu Aug 23 13:05:04 2007 @@ -215,6 +215,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Setup ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" IDS_REGISTERING_COMPONENTS "Meregister komponen..." @@ -240,6 +246,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Thu Aug 23 13:05:04 2007 @@ -208,6 +208,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." @@ -233,6 +239,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Thu Aug 23 13:05:04 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Thu Aug 23 13:05:04 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Thu Aug 23 13:05:04 2007 @@ -217,6 +217,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -242,6 +248,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Thu Aug 23 13:05:04 2007 @@ -220,6 +220,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Ustawienia ReactOS" IDS_UNKNOWN_ERROR "Nieznany b³¹d" IDS_REGISTERING_COMPONENTS "Rejestracja sk³adników..." @@ -245,6 +251,7 @@ IDS_SHORT_SNAP "Zrzut ekranu.lnk" IDS_SHORT_SOLITAIRE "RosPasjans.lnk" IDS_SHORT_WINEMINE "ROSaper.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Thu Aug 23 13:05:04 2007 @@ -198,6 +198,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "Ñëóæåáíûå" + IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåèçâåñòíàÿ îøèáêà" IDS_REGISTERING_COMPONENTS "Ðåãèñòðàöèÿ êîìïîíåíòîâ..." @@ -223,6 +229,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" + IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Thu Aug 23 13:05:04 2007 @@ -206,6 +206,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåâ³äîìà ïîìèëêà" IDS_REGISTERING_COMPONENTS "Ðåºñòðàö³ÿ êîìïîíåíò³â..." @@ -231,6 +237,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Thu Aug 23 13:05:04 2007 @@ -205,6 +205,12 @@ STRINGTABLE BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "CharMap" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -230,6 +236,7 @@ IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" + IDS_SHORT_CHARMAP "CharMap.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Thu Aug 23 13:05:04 2007 @@ -89,6 +89,7 @@ #define IDS_ACCESSORIES 3200 #define IDS_GAMES 3201 +#define IDS_SYS_TOOLS 3202 #define IDS_CMT_CMD 3210 #define IDS_CMT_EXPLORER 3211 @@ -102,6 +103,7 @@ #define IDS_CMT_SCREENSHOT 3221 #define IDS_CMT_DOWNLOADER 3222 #define IDS_CMT_DEVMGMT 3223 +#define IDS_CMT_CHARMAP 3224 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -125,6 +127,7 @@ #define IDS_SHORT_SNAP 3410 #define IDS_SHORT_SOLITAIRE 3411 #define IDS_SHORT_WINEMINE 3412 +#define IDS_SHORT_CHARMAP 3413 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[fireball] 28462: Dmitry Chapyshev <lentind@yandex.ru> - Change control panel icon to a better one
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Thu Aug 23 12:05:05 2007 New Revision: 28462 URL: http://svn.reactos.org/svn/reactos?rev=28462&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru> - Change control panel icon to a better one Modified: trunk/reactos/base/applications/control/resources/config.ico Modified: trunk/reactos/base/applications/control/resources/config.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 28461: Add NtGdiFlushUserBatch callback.
by jimtabor＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: jimtabor Date: Thu Aug 23 05:51:22 2007 New Revision: 28461 URL: http://svn.reactos.org/svn/reactos?rev=28461&view=rev Log: Add NtGdiFlushUserBatch callback. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Aug 23 05:51:22 2007 @@ -160,6 +160,8 @@ VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt); +NTSTATUS STDCALL NtGdiFlushUserBatch(VOID); + /* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ typedef struct { 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 (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Thu Aug 23 05:51:22 2007 @@ -385,7 +385,8 @@ CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; CalloutData.ProcessCallout = Win32kProcessCallback; CalloutData.ThreadCallout = Win32kThreadCallback; - + CalloutData.BatchFlushRoutine = NtGdiFlushUserBatch; + /* * Register our per-process and per-thread structures. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Aug 23 05:51:22 2007 @@ -55,3 +55,12 @@ UNIMPLEMENTED; } +NTSTATUS +APIENTRY +NtGdiFlushUserBatch(VOID) +{ + NTSTATUS Status = STATUS_SUCCESS; +// UNIMPLEMENTED; + return Status; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 05:51:22 2007 @@ -156,7 +156,7 @@ NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -# NtGdiFlushUserBatch 0 +NtGdiFlushUserBatch 0 NtGdiFlush 0 # NtGdiForceUFIMapping 2 NtGdiFrameRgn 5

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