Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[greatlrd] 28719: fix correct implemtions of GetRegionData in gdi32.dll
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 22:48:30 2007 New Revision: 28719 URL: http://svn.reactos.org/svn/reactos?rev=28719&view=rev Log: fix correct implemtions of GetRegionData in gdi32.dll 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 Fri Aug 31 22:48:30 2007 @@ -427,7 +427,7 @@ GetROP2@4=NtGdiGetROP2@4 GetRandomRgn@12=NtGdiGetRandomRgn@12 GetRasterizerCaps@8 -GetRegionData@12=NtGdiGetRegionData@12 +GetRegionData@12 GetRelAbs@8 GetRgnBox@8=NtGdiGetRgnBox@8 GetStockObject@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 Fri Aug 31 22:48:30 2007 @@ -2775,3 +2775,23 @@ } return NtGdiGetFontData(hdc, dwTable, dwOffset, lpvBuffer, cbData); } + + +/* + * @implemented + * + */ +DWORD +STDCALL +GetRegionData(HRGN hrgn, + DWORD nCount, + LPRGNDATA lpRgnData) +{ + if (!lpRgnData) + { + nCount = 0; + } + + return NtGdiGetRegionData(hrgn,nCount,lpRgnData); +} +

1 0

[greatlrd] 28718: fix correct implement of GetPath
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 22:19:09 2007 New Revision: 28718 URL: http://svn.reactos.org/svn/reactos?rev=28718&view=rev Log: fix correct implement of GetPath Modified: trunk/reactos/dll/win32/gdi32/objects/path.c 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 Fri Aug 31 22:19:09 2007 @@ -91,16 +91,25 @@ /* * @implemented */ -int -STDCALL -GetPath( - HDC hdc, - LPPOINT a1, - LPBYTE a2, - int a3 - ) -{ - return NtGdiGetPath ( hdc, a1, a2, a3 ); +INT +STDCALL +GetPath(HDC hdc, + LPPOINT pptlBuf, + LPBYTE pjTypes, + INT cptBuf) +{ + INT retValue = -1; + + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_METADC) + { + SetLastError(ERROR_INVALID_PARAMETER); + } + else + { + retValue = NtGdiGetPath(hdc,pptlBuf,pjTypes,cptBuf); + } + + return retValue; }

1 0

[greatlrd] 28717: implement GetMetaRgn left todo fix it in win32k.sys
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 21:46:06 2007 New Revision: 28717 URL: http://svn.reactos.org/svn/reactos?rev=28717&view=rev Log: implement GetMetaRgn left todo fix it in win32k.sys 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 Fri Aug 31 21:46:06 2007 @@ -115,18 +115,14 @@ /* - * @unimplemented + * @implemented */ int STDCALL -GetMetaRgn( - HDC a0, - HRGN a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetMetaRgn(HDC hdc, + HRGN hrgn) +{ + return NtGdiGetRandomRgn(hdc,hrgn,2); }

1 0

[hpoussin] 28716: Better assert + add LPDWORD type Fix typo preventing livecd to be built
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 21:21:41 2007 New Revision: 28716 URL: http://svn.reactos.org/svn/reactos?rev=28716&view=rev Log: Better assert + add LPDWORD type Fix typo preventing livecd to be built Modified: trunk/reactos/include/reactos/typedefs_host.h Modified: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (original) +++ trunk/reactos/include/reactos/typedefs_host.h Fri Aug 31 21:21:41 2007 @@ -9,8 +9,17 @@ #ifndef _TYPEDEFS_HOST_H #define _TYPEDEFS_HOST_H +#include <assert.h> #include <stdlib.h> #include <limits.h> + +#if defined(_MSC_VER) +#define W64 __w64 +#elif defined(__GNUC__) +#define W64 +#else +#error Unknown compiler +#endif #ifndef __fastcall #define __fastcall __attribute__((fastcall)) @@ -23,7 +32,7 @@ #endif #define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } -#define ASSERT(x) { if (!(x)) { printf("Assertion " #x " at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } +#define ASSERT(x) assert(x) #define DPRINT if (0) printf #define DPRINT1 printf @@ -50,14 +59,14 @@ typedef const char *PCSTR, *LPCSTR; typedef short SHORT; typedef unsigned short USHORT; -typedef unsigned int LONG, *PLONG; -typedef unsigned int ULONG, *PULONG, DWORD; +typedef int LONG, *PLONG; +typedef unsigned int ULONG, *PULONG, DWORD, *LPDWORD; typedef long long LONGLONG; typedef unsigned long long ULONGLONG; typedef UCHAR BOOLEAN, *PBOOLEAN; typedef int BOOL; -typedef int LONG_PTR, *PLONG_PTR; -typedef unsigned int ULONG_PTR, *PULONG_PTR; +typedef int W64 LONG_PTR, *PLONG_PTR; +typedef unsigned int W64 ULONG_PTR, *PULONG_PTR; typedef wchar_t WCHAR, *PWCHAR, *PWSTR, *LPWSTR; typedef const wchar_t *PCWSTR, *LPCWSTR; typedef int NTSTATUS;

1 0

[greatlrd] 28715: implement GetKerningPairsW (left todo implement it to win32k.sys)
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 20:59:12 2007 New Revision: 28715 URL: http://svn.reactos.org/svn/reactos?rev=28715&view=rev Log: implement GetKerningPairsW (left todo implement it to win32k.sys) 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 Fri Aug 31 20:59:12 2007 @@ -34,19 +34,23 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL -GetKerningPairsW( - HDC a0, - DWORD a1, - LPKERNINGPAIR a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetKerningPairsW(HDC hdc, + ULONG cPairs, + LPKERNINGPAIR pkpDst) +{ + if ((cPairs != 0) || (pkpDst == 0)) + { + return NtGdiGetKerningPairs(hdc,cPairs,pkpDst); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } }

1 0

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

31 Aug '07

Author: greatlrd Date: Fri Aug 31 20:23:33 2007 New Revision: 28714 URL: http://svn.reactos.org/svn/reactos?rev=28714&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 Fri Aug 31 20:23:33 2007 @@ -12,7 +12,6 @@ AddFontResourceExW@12 AddFontResourceW@4 AnyLinkedFonts@0 -BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 BRUSHOBJ_pvGetRbrush@4 @@ -50,6 +49,7 @@ EngCreatePalette@24 EngCreateSemaphore@0 EngDeleteClip@4 +EngDeletePalette@4 EngDeletePath@4 EngDeleteSemaphore@4 EngDeleteSurface@4 @@ -97,6 +97,7 @@ GdiConvertFont@4 GdiConvertPalette@4 GdiConvertRegion@4 +GdiDeleteLocalDC@4 GdiDescribePixelFormat@16 GdiEntry16@12=DdSwapTextureHandles@12 GdiFlush@0 @@ -123,7 +124,11 @@ GetDeviceGammaRamp@8 GetEUDCTimeStamp@0 GetEUDCTimeStampExW@4 +GetFontAssocStatus@4 +GetFontData@20 +GetFontUnicodeRanges@8 +

1 0

[greatlrd] 28713: Move more history api to the history file. follow api have been move DdSwapTextureHandles aka gdientry16, GdiReleaseLocalDC, GdiDeleteLocalDC, DeviceCapabilitiesExA, DeviceCapabilitiesExW, FixBrushOrgEx to historic.c
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 20:17:28 2007 New Revision: 28713 URL: http://svn.reactos.org/svn/reactos?rev=28713&view=rev Log: Move more history api to the history file. follow api have been move DdSwapTextureHandles aka gdientry16, GdiReleaseLocalDC, GdiDeleteLocalDC, DeviceCapabilitiesExA, DeviceCapabilitiesExW, FixBrushOrgEx to historic.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/brush.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Fri Aug 31 20:17:28 2007 @@ -1033,21 +1033,8 @@ hdc, lpGammaRamp); } -/* - * @implemented - * - * GDIEntry 16 - */ -DWORD -WINAPI -DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw, - LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, - LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2) -{ - /* Always returns success */ - return TRUE; -} - - - - + + + + + Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c Fri Aug 31 20:17:28 2007 @@ -9,6 +9,11 @@ */ #include "precomp.h" +#include <ddraw.h> +#include <ddrawi.h> +#include <ddrawint.h> +#include <ddrawgdi.h> +#include <ntgdi.h> /* * @implemented @@ -65,6 +70,7 @@ STDCALL GdiConvertBitmap(HBITMAP hbm) { + /* Note Windows 2000/XP/VISTA always returns hbm */ return hbm; } @@ -75,6 +81,7 @@ STDCALL GdiConvertBrush(HBRUSH hbr) { + /* Note Windows 2000/XP/VISTA always returns hbr */ return hbr; } @@ -85,6 +92,7 @@ STDCALL GdiConvertDC(HDC hdc) { + /* Note Windows 2000/XP/VISTA always returns hdc */ return hdc; } @@ -95,6 +103,7 @@ STDCALL GdiConvertFont(HFONT hfont) { + /* Note Windows 2000/XP/VISTA always returns hfont */ return hfont; } @@ -105,6 +114,7 @@ STDCALL GdiConvertPalette(HPALETTE hpal) { + /* Note Windows 2000/XP/VISTA always returns hpal */ return hpal; } @@ -115,6 +125,7 @@ STDCALL GdiConvertRegion(HRGN hregion) { + /* Note Windows 2000/XP/VISTA always returns hregion */ return hregion; } @@ -125,8 +136,21 @@ STDCALL GdiSetAttrs(HDC hdc) { - return TRUE; -} + /* Note Windows 2000/XP/VISTA always returns TRUE */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +STDCALL +GdiDeleteLocalDC(HDC hdc) +{ + /* Note Windows 2000/XP/VISTA always returns TRUE */ + return TRUE; +} + /* * @implemented @@ -139,5 +163,74 @@ } - - +/* + * @implemented + */ +int +STDCALL +DeviceCapabilitiesExA(LPCSTR pDevice, + LPCSTR pPort, + WORD fwCapability, + LPSTR pOutput, + CONST DEVMODEA *pDevMode) +{ + /* Note Windows 2000/XP/VISTA always returns -1 */ + return -1; +} + +/* + * @implemented + */ +int +STDCALL +DeviceCapabilitiesExW(LPCWSTR pDevice, + LPCWSTR pPort, + WORD fwCapability, + LPWSTR pOutput, + CONST DEVMODEW *pDevMode) +{ + /* Note Windows 2000/XP/VISTA always returns -1 */ + return -1; +} + +/* + * @implemented + */ +BOOL +STDCALL +FixBrushOrgEx(HDC hDC, + INT nXOrg, + INT nYOrg, + LPPOINT lpPoint) +{ + /* Note Windows 2000/XP/VISTA always returns FALSE */ + return FALSE; +} + +/* + * @implemented + * + * GDIEntry 16 + */ +DWORD +WINAPI +DdSwapTextureHandles(LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2) +{ + /* Note Windows 2000/XP/VISTA always returns success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +STDCALL +GdiReleaseLocalDC(HDC hdc) +{ + /* Note Windows 2000/XP/VISTA always returns TRUE */ + return TRUE; +} + + Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Fri Aug 31 20:17:28 2007 @@ -158,18 +158,6 @@ return GDI_BatchLimit; } - -/* - * @implemented - */ -BOOL -STDCALL -GdiReleaseLocalDC(HDC hdc) -{ - return TRUE; -} - - /* * @unimplemented */ @@ -177,8 +165,7 @@ STDCALL GdiReleaseDC(HDC hdc) { - GdiReleaseLocalDC(hdc); - return 0; + return 0; } INT STDCALL 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 Fri Aug 31 20:17:28 2007 @@ -1344,18 +1344,6 @@ HENHMETAFILE STDCALL GdiConvertEnhMetaFile(HENHMETAFILE hmf) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiDeleteLocalDC(HDC hdc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); 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 Fri Aug 31 20:17:28 2007 @@ -14,22 +14,6 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); -/* - * @implemented - */ -int -STDCALL -DeviceCapabilitiesExA( - LPCSTR pDevice, - LPCSTR pPort, - WORD fwCapability, - LPSTR pOutput, - CONST DEVMODEA *pDevMode - ) -{ - /* Note Windows 2000/XP/VISTA always return -1 */ - return -1; -} /* 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 Fri Aug 31 20:17:28 2007 @@ -13,22 +13,7 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); -/* - * @implemented - */ -int -STDCALL -DeviceCapabilitiesExW( - LPCWSTR pDevice, - LPCWSTR pPort, - WORD fwCapability, - LPWSTR pOutput, - CONST DEVMODEW *pDevMode - ) -{ - /* Note Windows 2000/XP/VISTA always return -1 */ - return -1; -} + /* Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c Fri Aug 31 20:17:28 2007 @@ -3,19 +3,7 @@ #define NDEBUG #include <debug.h> -/* - * @implemented - */ -BOOL -STDCALL -FixBrushOrgEx( - HDC hDC, - INT nXOrg, - INT nYOrg, - LPPOINT lpPoint) -{ - return FALSE; -} + /* * @implemented

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