Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[greatlrd] 28729: implement GetTextExtentExPointI
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 03:56:11 2007 New Revision: 28729 URL: http://svn.reactos.org/svn/reactos?rev=28729&view=rev Log: implement GetTextExtentExPointI Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c 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 Sat Sep 1 03:56:11 2007 @@ -1745,23 +1745,19 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetTextExtentExPointI( - HDC hdc, - LPWORD pgiIn, - int cgi, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetTextExtentExPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + int nMaxExtent, + LPINT lpnFit, + LPINT alpDx, + LPSIZE lpSize) +{ + return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); } /*

1 0

[greatlrd] 28728: implement GetTextExtentExPointWPri
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 03:41:07 2007 New Revision: 28728 URL: http://svn.reactos.org/svn/reactos?rev=28728&view=rev Log: implement GetTextExtentExPointWPri Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c 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 Sat Sep 1 03:41:07 2007 @@ -1533,15 +1533,19 @@ } /* - * @unimplemented - */ -BOOL -STDCALL -GetTextExtentExPointWPri(HDC hdc,LPWSTR lpwsz,ULONG cwc,ULONG dxMax,ULONG *pcCh,PULONG pdxOut,LPSIZE psize) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + * @implemented + */ +BOOL +STDCALL +GetTextExtentExPointWPri(HDC hdc, + LPWSTR lpwsz, + ULONG cwc, + ULONG dxMax, + ULONG *pcCh, + PULONG pdxOut, + LPSIZE psize) +{ + return NtGdiGetTextExtentExW(hdc,lpwsz,cwc,dxMax,pcCh,pdxOut,psize,0); } /*

1 0

[greatlrd] 28727: redirect GetTextCharsetInfo to win32k implement GetTextExtentPointI
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 03:32:54 2007 New Revision: 28727 URL: http://svn.reactos.org/svn/reactos?rev=28727&view=rev Log: redirect GetTextCharsetInfo to win32k implement GetTextExtentPointI Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/text.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 Sat Sep 1 03:32:54 2007 @@ -438,7 +438,7 @@ GetTextAlign@4=NtGdiGetTextAlign@4 GetTextCharacterExtra@4 GetTextCharset@4 -GetTextCharsetInfo@12 +GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12 GetTextColor@4=NtGdiGetTextColor@4 GetTextExtentExPointA@28 GetTextExtentExPointI@28 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 Sat Sep 1 03:32:54 2007 @@ -1761,20 +1761,16 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetTextExtentPointI( - HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetTextExtentPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + LPSIZE lpSize) +{ + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); } Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Sat Sep 1 03:32:54 2007 @@ -72,28 +72,13 @@ */ int STDCALL -GetTextCharset( - HDC hdc - ) +GetTextCharset(HDC hdc) { /* MSDN docs say this is equivalent */ - return GetTextCharsetInfo(hdc, NULL, 0); -} - - -/* - * @implemented - */ -int -STDCALL -GetTextCharsetInfo( - HDC hdc, - LPFONTSIGNATURE lpSig, - DWORD dwFlags - ) -{ - return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags); -} + return NtGdiGetTextCharsetInfo(hdc,NULL,0); +} + + /*

1 0

[greatlrd] 28726: implement GetStringBitmapA (left todo implement it in win32k.sys)
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 02:33:53 2007 New Revision: 28726 URL: http://svn.reactos.org/svn/reactos?rev=28726&view=rev Log: implement GetStringBitmapA (left todo implement it in win32k.sys) Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Sat Sep 1 02:33:53 2007 @@ -271,15 +271,37 @@ } /* - * @unimplemented + * @implemented */ UINT STDCALL -GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetStringBitmapA(HDC hdc, + LPSTR psz, + BOOL DoCall, + UINT cj, + BYTE *lpSB) +{ + + NTSTATUS Status; + PWSTR pwsz; + UINT retValue = 0; + + if (DoCall) + { + Status = HEAP_strdupA2W ( &pwsz, psz ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + retValue = NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); + HEAP_free ( pwsz ); + } + } + + return retValue; + }

1 0

[greatlrd] 28725: implement GetStringBitmapW (left todo, implement it in win32k)
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 02:21:35 2007 New Revision: 28725 URL: http://svn.reactos.org/svn/reactos?rev=28725&view=rev Log: implement GetStringBitmapW (left todo, implement it in win32k) Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c 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 Sat Sep 1 02:21:35 2007 @@ -330,15 +330,25 @@ } /* - * @unimplemented + * @implemented */ UINT STDCALL -GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetStringBitmapW(HDC hdc, + LPWSTR pwsz, + BOOL doCall, + UINT cj, + BYTE *lpSB) +{ + UINT retValue = 0; + + if (doCall) + { + retValue = NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); + } + + return retValue; + }

1 0

[greatlrd] 28724: implement stub for NtGdiGetStringBitmapW
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 02:15:37 2007 New Revision: 28724 URL: http://svn.reactos.org/svn/reactos?rev=28724&view=rev Log: implement stub for NtGdiGetStringBitmapW Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat Sep 1 02:15:37 2007 @@ -3091,8 +3091,8 @@ DWORD STDCALL NtGdiGetKerningPairs(HDC hDC, - DWORD NumPairs, - LPKERNINGPAIR krnpair) + ULONG NumPairs, + LPKERNINGPAIR krnpair) { UNIMPLEMENTED; return 0; 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 Sat Sep 1 02:15:37 2007 @@ -2875,3 +2875,16 @@ return 0; } +UINT +STDCALL +NtGdiGetStringBitmapW( + IN HDC hdc, + IN LPWSTR pwsz, + IN UINT cwc, + OUT BYTE *lpSB, + IN UINT cj) +{ + UNIMPLEMENTED; + return 0; +} + 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 Sat Sep 1 02:15:37 2007 @@ -207,7 +207,7 @@ NtGdiGetSpoolMessage 4 # NtGdiGetStats 5 NtGdiGetStockObject 1 -# NtGdiGetStringBitmapW 5 +NtGdiGetStringBitmapW 5 NtGdiGetSystemPaletteUse 1 NtGdiGetTextCharsetInfo 3 NtGdiGetTextExtent 5

1 0

[janderwald] 28723: - fix typo
by janderwald＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: janderwald Date: Sat Sep 1 01:22:19 2007 New Revision: 28723 URL: http://svn.reactos.org/svn/reactos?rev=28723&view=rev Log: - fix typo Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc Sat Sep 1 01:22:19 2007 @@ -36,8 +36,8 @@ IDS_SELECTALL "Alles auswählen" IDS_SCROLL "Scrollen" IDS_FIND "Suchen..." - IDS_DEFAULTS "Standarts" - IDS_PROPERTIES "Einstellungen" + IDS_DEFAULTS "Standardwerte" + IDS_PROPERTIES "Eigenschaften" IDS_SCROLLHERE "Hier Scrollen" IDS_SCROLLTOP "Ganz nach oben Scrollen" IDS_SCROLLBOTTOM "Ganz nach unten Scrollen"

1 0

[greatlrd] 28722: update the good api list
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 00:55:10 2007 New Revision: 28722 URL: http://svn.reactos.org/svn/reactos?rev=28722&view=rev Log: update the good api list Modified: trunk/reactos/dll/win32/gdi32/good api.def Modified: trunk/reactos/dll/win32/gdi32/good api.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/good%20api… ============================================================================== --- trunk/reactos/dll/win32/gdi32/good api.def (original) +++ trunk/reactos/dll/win32/gdi32/good api.def Sat Sep 1 00:55:10 2007 @@ -127,8 +127,23 @@ GetFontAssocStatus@4 GetFontData@20 GetFontUnicodeRanges@8 +GetGlyphIndicesW@20 +GetGlyphOutline@28 +GetKerningPairs@12 +GetKerningPairsW@12 +GetMetaRgn@8 +GetMiterLimit@8 +GetNearestColor@8 +GetNearestPaletteIndex@8 +GetPaletteEntries@16 +GetPath@16 +GetPixelFormat@4 +GetRandomRgn@12 +GetRasterizerCaps@8 +GetRegionData@12 +

1 0

[greatlrd] 28721: Add hacks.c contain api using only ros home made syscall follow api have been move in there so far : GetPolyFillMode, GetGraphicsMode, GetROP2, SetDIBitsToDevice, SetBkMode, SetBkColor, SelectObject, GetMapMode make follow in user mode : GetRgnBox, GetPixel redirect GetMiterLimit to win32k.sys
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Sat Sep 1 00:26:02 2007 New Revision: 28721 URL: http://svn.reactos.org/svn/reactos?rev=28721&view=rev Log: Add hacks.c contain api using only ros home made syscall follow api have been move in there so far : GetPolyFillMode, GetGraphicsMode, GetROP2, SetDIBitsToDevice, SetBkMode, SetBkColor, SelectObject, GetMapMode make follow in user mode : GetRgnBox, GetPixel redirect GetMiterLimit to win32k.sys Added: trunk/reactos/dll/win32/gdi32/misc/hacks.c (with props) Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/palette.c trunk/reactos/dll/win32/gdi32/objects/path.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 Sat Sep 1 00:26:02 2007 @@ -326,8 +326,46 @@ GetFontLanguageInfo@4 GetFontResourceInfoW@16 GetFontUnicodeRanges@8=NtGdiGetFontUnicodeRanges@8 - - +GetGlyphIndicesA@20 +GetGlyphIndicesW@20=NtGdiGetGlyphIndicesW@20 +GetGlyphOutline@28=GetGlyphOutlineA@28 +GetGlyphOutlineA@28 +GetGlyphOutlineW@28 +GetGlyphOutlineWow@28 +GetGraphicsMode@4 +GetHFONT@4 +GetICMProfileA@12 +GetICMProfileW@12 +GetKerningPairs@12=GetKerningPairsA@12 +GetKerningPairsA@12 +GetKerningPairsW@12 +GetLayout@4 +GetLogColorSpaceA@12 +GetLogColorSpaceW@12 +GetMapMode@4 +GetMetaFileA@4 +GetMetaFileBitsEx@12 +GetMetaFileW@4 +GetMetaRgn@8 +GetMiterLimit@8=NtGdiGetMiterLimit@8 +GetNearestColor@8=NtGdiGetNearestColor@8 +GetNearestPaletteIndex@8=NtGdiGetNearestPaletteIndex@8 +GetObjectA@12 +GetObjectType@4 +GetObjectW@12 +GetOutlineTextMetricsA@12 +GetOutlineTextMetricsW@12 +GetPaletteEntries@16 +GetPath@16 +GetPixel@12 +GetPixelFormat@4 +GetPolyFillMode@4 +GetROP2@4 +GetRandomRgn@12=NtGdiGetRandomRgn@12 +GetRasterizerCaps@8=NtGdiGetRasterizerCaps@8 +GetRegionData@12 +GetRelAbs@8 +GetRgnBox@8 ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -391,45 +429,6 @@ GetBitmapAttributes@4 GetBrushAttributes@4 GetGlyphIndicesA@20 -GetGlyphIndicesW@20 -GetGlyphOutline=GetGlyphOutlineA@28 -GetGlyphOutlineA@28 -GetGlyphOutlineW@28 -GetGlyphOutlineWow@28 -GetGraphicsMode@4=NtGdiGetGraphicsMode@4 -GetHFONT@4 -GetICMProfileA@12 -GetICMProfileW@12 -GetKerningPairs=GetKerningPairsA@12 -GetKerningPairsA@12 -GetKerningPairsW@12 -GetLayout@4 -GetLogColorSpaceA@12 -GetLogColorSpaceW@12 -GetMapMode@4=NtGdiGetMapMode@4 -GetMetaFileA@4 -GetMetaFileBitsEx@12 -GetMetaFileW@4 -GetMetaRgn@8 -GetMiterLimit@8 -GetNearestColor@8=NtGdiGetNearestColor@8 -GetNearestPaletteIndex@8=NtGdiGetNearestPaletteIndex@8 -GetObjectA@12 -GetObjectType@4 -GetObjectW@12 -GetOutlineTextMetricsA@12 -GetOutlineTextMetricsW@12 -GetPaletteEntries@16 -GetPath@16 -GetPixel@12=NtGdiGetPixel@12 -GetPixelFormat@4 -GetPolyFillMode@4=NtGdiGetPolyFillMode@4 -GetROP2@4=NtGdiGetROP2@4 -GetRandomRgn@12=NtGdiGetRandomRgn@12 -GetRasterizerCaps@8 -GetRegionData@12 -GetRelAbs@8 -GetRgnBox@8=NtGdiGetRgnBox@8 GetStockObject@4 GetStretchBltMode@4=NtGdiGetStretchBltMode@4 GetStringBitmapA@20 @@ -528,15 +527,15 @@ SelectClipPath@8 SelectClipRgn@8 SelectFontLocal@8 -SelectObject@8=NtGdiSelectObject@8 +SelectObject@8 SelectPalette@12 SetAbortProc@8 SetArcDirection@8 SetBitmapAttributes@8 SetBitmapBits@12=NtGdiSetBitmapBits@12 SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 -SetBkColor@8=NtGdiSetBkColor@8 -SetBkMode@8=NtGdiSetBkMode@8 +SetBkColor@8 +SetBkMode@8 SetBoundsRect@12 SetBrushAttributes@8 SetBrushOrgEx@16=NtGdiSetBrushOrg@16 Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sat Sep 1 00:26:02 2007 @@ -20,6 +20,7 @@ <directory name="misc"> <file>heap.c</file> <file>gdientry.c</file> + <file>hacks.c</file> <file>historic.c</file> <file>misc.c</file> <file>stubs.c</file> Added: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (added) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Sat Sep 1 00:26:02 2007 @@ -1,0 +1,144 @@ +#include "precomp.h" + +/* $Id: stubs.c 28709 2007-08-31 15:09:51Z greatlrd $ + * + * reactos/lib/gdi32/misc/hacks.c + * + * GDI32.DLL hacks + * + * Api that are hacked but we can not do correct implemtions yetm but using own syscall + * + */ + +/* + * @implemented + * + */ +int +STDCALL +GetPolyFillMode(HDC hdc) +{ + /* FIXME do not use reactos own syscall for this, + * this hack need be remove + */ + return NtGdiGetPolyFillMode(hdc); +} + + +/* + * @implemented + * + */ +int +STDCALL +GetGraphicsMode(HDC hdc) +{ + /* FIXME do not use reactos own syscall for this, + * this hack need be remove + */ + return NtGdiGetGraphicsMode(hdc); +} + +/* + * @implemented + * + */ +int +STDCALL +GetROP2(HDC hdc) +{ + /* FIXME do not use reactos own syscall for this, + * this hack need be remove + */ + return NtGdiGetROP2(hdc); +} + + +/* + * @implemented + * + */ +INT +STDCALL +SetDIBitsToDevice( + HDC hDC, + int XDest, + int YDest, + DWORD Width, + DWORD Height, + int XSrc, + int YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *lpbmi, + UINT ColorUse) +{ + return NtGdiSetDIBitsToDeviceInternal(hDC, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + (LPBYTE)Bits, + (LPBITMAPINFO)lpbmi, + ColorUse, + lpbmi->bmiHeader.biSizeImage, + lpbmi->bmiHeader.biSize, + FALSE, + NULL); +} + +/* + * @implemented + * + */ +int +STDCALL +SetBkMode(HDC hdc, + int iBkMode) +{ + return NtGdiSetBkMode(hdc,iBkMode); +} + +/* + * @implemented + * + */ +COLORREF +STDCALL +SetBkColor(HDC hdc, + COLORREF crColor) +{ + return NtGdiSetBkColor(hdc,crColor); +} + +/* + * @implemented + * + */ +HGDIOBJ +STDCALL +SelectObject(HDC hdc, + HGDIOBJ hgdiobj) +{ + return NtGdiSelectObject(hdc,hgdiobj); +} + + +/* + * @implemented + * + */ +int +STDCALL +GetMapMode(HDC hdc) +{ + return NtGdiGetMapMode(hdc); +} + + + Propchange: trunk/reactos/dll/win32/gdi32/misc/hacks.c ------------------------------------------------------------------------------ svn:eol-style = native 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 Sat Sep 1 00:26:02 2007 @@ -142,22 +142,6 @@ return 0; } - -/* - * @unimplemented - */ -BOOL -STDCALL -GetRasterizerCaps( - LPRASTERIZER_STATUS a0, - UINT a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* * @unimplemented */ @@ -167,7 +151,6 @@ { return NtGdiGetSystemPaletteUse(hDc); } - /* * @unimplemented @@ -182,7 +165,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - /* * @unimplemented @@ -199,7 +181,6 @@ return FALSE; } - /* * @unimplemented */ @@ -215,7 +196,6 @@ return FALSE; } - /* * @unimplemented */ @@ -229,7 +209,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - /* * @unimplemented @@ -263,7 +242,6 @@ return 0; } - /* * @unimplemented */ @@ -279,7 +257,6 @@ return 0; } - /* * @unimplemented */ @@ -294,7 +271,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - /* * @unimplemented @@ -311,7 +287,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - /* * @unimplemented @@ -363,10 +338,6 @@ return FALSE; } - - - - /* * @unimplemented */ @@ -380,7 +351,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - /* * @unimplemented @@ -400,7 +370,6 @@ return FALSE; } - /* * @unimplemented */ @@ -434,7 +403,6 @@ return 0; } - /* * @unimplemented */ @@ -450,7 +418,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } - /* * @unimplemented @@ -603,10 +570,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - - - /* * @unimplemented @@ -2795,3 +2758,34 @@ return NtGdiGetRegionData(hrgn,nCount,lpRgnData); } + +/* + * @implemented + * + */ +INT +STDCALL +GetRgnBox(HRGN hrgn, + LPRECT prcOut) +{ + /* FIXME some stuff need be done in user mode */ + return NtGdiGetRgnBox(hrgn, prcOut); +} + + +/* + * @implemented + * + */ +DWORD +STDCALL +GetPixel(HDC hdc, + INT x, + INT y) +{ + /* FIXME some part need todo in user mode */ + return NtGdiGetPixel(hdc, x, y); +} + + + 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 Sat Sep 1 00:26:02 2007 @@ -151,38 +151,6 @@ -INT WINAPI -SetDIBitsToDevice( - HDC hDC, - int XDest, - int YDest, - DWORD Width, - DWORD Height, - int XSrc, - int YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *lpbmi, - UINT ColorUse) -{ - return NtGdiSetDIBitsToDeviceInternal(hDC, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)Bits, - (LPBITMAPINFO)lpbmi, - ColorUse, - lpbmi->bmiHeader.biSizeImage, - lpbmi->bmiHeader.biSize, - FALSE, - NULL); -} INT Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Sat Sep 1 00:26:02 2007 @@ -20,6 +20,9 @@ return NtGdiCreatePaletteInternal((LPLOGPALETTE)plpal, plpal->palNumEntries); } +/* + * @implemented + */ UINT WINAPI GetPaletteEntries(HPALETTE hpal, Modified: trunk/reactos/dll/win32/gdi32/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/path.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/path.c Sat Sep 1 00:26:02 2007 @@ -178,20 +178,6 @@ return NtGdiWidenPath ( hdc ); } - -/* - * @implemented - */ -BOOL -STDCALL -GetMiterLimit( - HDC hdc, - PFLOAT a1 - ) -{ - return NtGdiGetMiterLimit ( hdc, (PDWORD)a1 ); -} - /* * @implemented */

1 0

[gedmurphy] 28720: fix building of the new explorer
by gedmurphy＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: gedmurphy Date: Fri Aug 31 23:26:11 2007 New Revision: 28720 URL: http://svn.reactos.org/svn/reactos?rev=28720&view=rev Log: fix building of the new explorer Modified: trunk/reactos/base/shell/explorer-new/explorer.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c Fri Aug 31 23:26:11 2007 @@ -246,15 +246,6 @@ } -#if 1 -/* FIXME: Should be implemented in shell32 */ -BOOL WINAPI IsUserAnAdmin(VOID) -{ - HRESULT WINAPI IsUserAdmin(void); - return (BOOL)IsUserAdmin(); -} -#endif - static BOOL SetShellReadyEvent(IN LPCTSTR lpEventName) {

1 0

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 August 2007