Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 28772: implement SelectFontLocal
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 17:19:07 2007 New Revision: 28772 URL: http://svn.reactos.org/svn/reactos?rev=28772&view=rev Log: implement SelectFontLocal Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/dll/win32/gdi32/misc/stubs.c 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 Sun Sep 2 17:19:07 2007 @@ -243,3 +243,14 @@ { return Newhbm; } + +/* + * @implemented + */ +HFONT +STDCALL +SelectFontLocal(HFONT Currenthfnt, + HFONT newhfnt) +{ + return newhfnt; +} 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 Sun Sep 2 17:19:07 2007 @@ -1120,20 +1120,7 @@ } -/* - * @unimplemented - */ -DWORD -STDCALL -SelectFontLocal( - DWORD a0, - DWORD a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /*

1 0

[greatlrd] 28771: implement SelectBrushLocal
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 17:09:50 2007 New Revision: 28771 URL: http://svn.reactos.org/svn/reactos?rev=28771&view=rev Log: implement SelectBrushLocal Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/dll/win32/gdi32/misc/stubs.c 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 Sun Sep 2 17:09:50 2007 @@ -233,4 +233,13 @@ return TRUE; } - +/* + * @implemented + */ +HBRUSH +STDCALL +SelectBrushLocal(HBRUSH Currenthbm, + HBRUSH Newhbm) +{ + return Newhbm; +} 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 Sun Sep 2 17:09:50 2007 @@ -1112,24 +1112,6 @@ DWORD a4, DWORD a5, DWORD a6 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - - -/* - * @unimplemented - */ -DWORD -STDCALL -SelectBrushLocal( - DWORD a0, - DWORD a1 ) { UNIMPLEMENTED;

1 0

[hpoussin] 28770: Search a property by its name
by hpoussin＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: hpoussin Date: Sun Sep 2 17:08:00 2007 New Revision: 28770 URL: http://svn.reactos.org/svn/reactos?rev=28770&view=rev Log: Search a property by its name Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Sep 2 17:08:00 2007 @@ -1204,6 +1204,18 @@ } string +MingwModuleHandler::GetPropertyValue ( const Module& module, const std::string& name ) +{ + for ( size_t i = 0; i < module.project.non_if_data.properties.size (); i++ ) + { + const Property& property = *module.project.non_if_data.properties[i]; + if ( property.name == name ) + return property.value; + } + return string ( "" ); +} + +string MingwModuleHandler::GetRpcServerHeaderFilename ( string basename ) const { return PassThruCacheDirectory ( basename + "_s.h", Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sun Sep 2 17:08:00 2007 @@ -211,6 +211,7 @@ void GenerateBuildNonSymbolStrippedCode (); void CleanupCompilationUnitVector ( std::vector<CompilationUnit*>& compilationUnits ); void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; + static std::string GetPropertyValue ( const Module& module, const std::string& name ); std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; std::string GetIdlHeaderFilename ( std::string basename ) const;

1 0

[greatlrd] 28769: fix smaller bug in SelectClipRgn
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 16:58:35 2007 New Revision: 28769 URL: http://svn.reactos.org/svn/reactos?rev=28769&view=rev Log: fix smaller bug in SelectClipRgn Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Sun Sep 2 16:58:35 2007 @@ -10,7 +10,7 @@ HRGN hrgn ) { - return NtGdiExtSelectClipRgn(hdc, hrgn, RGN_COPY); + return ExtSelectClipRgn(hdc, hrgn, RGN_COPY); }

1 0

[greatlrd] 28768: implement RemoveFontMemResourceEx (left todo fix it in win32k)
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 16:18:34 2007 New Revision: 28768 URL: http://svn.reactos.org/svn/reactos?rev=28768&view=rev Log: implement RemoveFontMemResourceEx (left todo fix it in win32k) 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 Sun Sep 2 16:18:34 2007 @@ -1621,17 +1621,23 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL -RemoveFontMemResourceEx( - HANDLE fh -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +RemoveFontMemResourceEx(HANDLE fh) +{ + BOOL retValue=0; + + if (fh) + { + retValue = NtGdiRemoveFontMemResourceEx(fh); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + return retValue; } /*

1 0

[greatlrd] 28767: implement stub for NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont, NtGdiSelectPen, NtGdiSetBitmapAttributes, NtGdiSetFontEnumeration, NtGdiSetFontXform, NtGdiSetLinkedUFIs, NtGdiSetMagicColors, NtGdiGetDeviceWidth, NtGdiMirrorWindowOrg, NtGdiSetLayout, NtGdiStretchDIBitsInternal, NtGdiUnloadPrinterDriver, NtGdiUnmapMemFont
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 15:28:34 2007 New Revision: 28767 URL: http://svn.reactos.org/svn/reactos?rev=28767&view=rev Log: implement stub for NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont, NtGdiSelectPen, NtGdiSetBitmapAttributes, NtGdiSetFontEnumeration, NtGdiSetFontXform, NtGdiSetLinkedUFIs, NtGdiSetMagicColors, NtGdiGetDeviceWidth, NtGdiMirrorWindowOrg, NtGdiSetLayout, NtGdiStretchDIBitsInternal, NtGdiUnloadPrinterDriver, NtGdiUnmapMemFont 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 Sun Sep 2 15:28:34 2007 @@ -3413,3 +3413,212 @@ return FALSE; } + /* + * @unimplemented + */ +HBITMAP +STDCALL +NtGdiSelectBitmap( + IN HDC hdc, + IN HBITMAP hbm) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +HBRUSH +STDCALL +NtGdiSelectBrush( + IN HDC hdc, + IN HBRUSH hbrush) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +HFONT +STDCALL +NtGdiSelectFont( + IN HDC hdc, + IN HFONT hf) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +HPEN +STDCALL +NtGdiSelectPen( + IN HDC hdc, + IN HPEN hpen) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +HBITMAP +STDCALL +NtGdiSetBitmapAttributes( + IN HBITMAP hbm, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiSetFontEnumeration( + IN ULONG ulType) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSetFontXform( + IN HDC hdc, + IN DWORD dwxScale, + IN DWORD dwyScale) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSetLinkedUFIs( + IN HDC hdc, + IN PUNIVERSAL_FONT_ID pufiLinks, + IN ULONG uNumUFIs) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSetMagicColors( + IN HDC hdc, + IN PALETTEENTRY peMagic, + IN ULONG Index) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +LONG +STDCALL +NtGdiGetDeviceWidth( + IN HDC hdc) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiMirrorWindowOrg( + IN HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiSetLayout( + IN HDC hdc, + IN LONG wox, + IN DWORD dwLayout) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +INT +STDCALL +NtGdiStretchDIBitsInternal( + IN HDC hdc, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN OPTIONAL LPBYTE pjInit, + IN LPBITMAPINFO pbmi, + IN DWORD dwUsage, + IN DWORD dwRop4, + IN UINT cjMaxInfo, + IN UINT cjMaxBits, + IN HANDLE hcmXform) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiUnloadPrinterDriver( + IN LPWSTR pDriverName, + IN ULONG cbDriverName) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiUnmapMemFont( + IN PVOID pvView) +{ + UNIMPLEMENTED; + return FALSE; +} + 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 Sun Sep 2 15:28:34 2007 @@ -263,12 +263,12 @@ NtGdiSaveDC 1 NtGdiScaleViewportExtEx 6 NtGdiScaleWindowExtEx 6 -# NtGdiSelectBitmap 2 -# NtGdiSelectBrush 2 +NtGdiSelectBitmap 2 +NtGdiSelectBrush 2 NtGdiSelectClipPath 2 -# NtGdiSelectFont 2 -# NtGdiSelectPen 2 -# NtGdiSetBitmapAttributes 2 +NtGdiSelectFont 2 +NtGdiSelectPen 2 +NtGdiSetBitmapAttributes 2 NtGdiSetBitmapBits 3 NtGdiSetBitmapDimension 4 NtGdiSetBoundsRect 3 @@ -278,16 +278,16 @@ NtGdiSetColorSpace 2 NtGdiSetDeviceGammaRamp 2 NtGdiSetDIBitsToDeviceInternal 16 -# NtGdiSetFontEnumeration 1 -# NtGdiSetFontXform 3 +NtGdiSetFontEnumeration 1 +NtGdiSetFontXform 3 NtGdiSetIcmMode 3 -# NtGdiSetLinkedUFIs 3 -# NtGdiSetMagicColors 3 +NtGdiSetLinkedUFIs 3 +NtGdiSetMagicColors 3 NtGdiSetMetaRgn 1 NtGdiSetMiterLimit 3 -# NtGdiGetDeviceWidth 1 -# NtGdiMirrorWindowOrg 1 -# NtGdiSetLayout 3 +NtGdiGetDeviceWidth 1 +NtGdiMirrorWindowOrg 1 +NtGdiSetLayout 3 NtGdiSetPixel 4 NtGdiSetPixelFormat 2 NtGdiSetRectRgn 5 @@ -299,14 +299,14 @@ NtGdiStartDoc 4 NtGdiStartPage 1 NtGdiStretchBlt 12 -# NtGdiStretchDIBitsInternal 16 +NtGdiStretchDIBitsInternal 16 NtGdiStrokeAndFillPath 1 NtGdiStrokePath 1 NtGdiSwapBuffers 1 NtGdiTransformPoints 5 NtGdiTransparentBlt 11 -# NtGdiUnloadPrinterDriver 2 -# NtGdiUnmapMemFont 1 +NtGdiUnloadPrinterDriver 2 +NtGdiUnmapMemFont 1 NtGdiUnrealizeObject 1 NtGdiUpdateColors 1 NtGdiWidenPath 1

1 0

[arty] 28766: Ignore elf.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 15:14:58 2007 New Revision: 28766 URL: http://svn.reactos.org/svn/reactos?rev=28766&view=rev Log: Ignore elf. Modified: trunk/reactos/tools/rsym.c Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=28766&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c (original) +++ trunk/reactos/tools/rsym.c Sun Sep 2 15:14:58 2007 @@ -795,6 +795,7 @@ void *FileData; ULONG RosSymLength; void *RosSymSection; + char elfhdr[4] = { '\177', 'E', 'L', 'F' }; if (3 != argc) { @@ -816,6 +817,9 @@ PEDosHeader = (PIMAGE_DOS_HEADER) FileData; if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) { + /* Ignore elf */ + if (!memcmp(PEDosHeader, elfhdr, sizeof(elfhdr))) + exit(0); perror("Input file is not a PE image.\n"); free(FileData); exit(1);

1 0

[arty] 28765: Ignore elf executables.
by arty＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: arty Date: Sun Sep 2 15:10:27 2007 New Revision: 28765 URL: http://svn.reactos.org/svn/reactos?rev=28765&view=rev Log: Ignore elf executables. Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=28765&… ============================================================================== --- trunk/reactos/tools/pefixup.c (original) +++ trunk/reactos/tools/pefixup.c Sun Sep 2 15:10:27 2007 @@ -229,6 +229,7 @@ { int fd_in, fd_out; long len; + char hdrbuf[4] = { }, elfhdr[4] = { '\177', 'E', 'L', 'F' }; PIMAGE_SECTION_HEADER section_header; PIMAGE_DATA_DIRECTORY data_dir; unsigned int i; @@ -276,6 +277,13 @@ printf("Can't open input file.\n"); return 1; } + + /* + * PowerPC ReactOS uses elf, so doesn't need pefixup + */ + len = read(fd_in, hdrbuf, sizeof(elfhdr)); + if (!memcmp(hdrbuf, elfhdr, sizeof(elfhdr))) + return 0; len = lseek(fd_in, 0, SEEK_END); if (len < sizeof(IMAGE_DOS_HEADER))

1 0

[greatlrd] 28764: implement stub for NtGdiIcmBrushInfo, NtGdiInit, NtGdiMakeFontDir, NtGdiMakeInfoDC, NtGdiMonoBitmap, NtGdiMoveTo
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 14:50:25 2007 New Revision: 28764 URL: http://svn.reactos.org/svn/reactos?rev=28764&view=rev Log: implement stub for NtGdiIcmBrushInfo, NtGdiInit, NtGdiMakeFontDir, NtGdiMakeInfoDC, NtGdiMonoBitmap, NtGdiMoveTo 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 Sun Sep 2 14:50:25 2007 @@ -3326,3 +3326,90 @@ return FALSE; } + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiIcmBrushInfo( + IN HDC hdc, + IN HBRUSH hbrush, + IN OUT PBITMAPINFO pbmiDIB, + IN OUT PVOID pvBits, + IN OUT ULONG *pulBits, + OUT OPTIONAL DWORD *piUsage, + OUT OPTIONAL BOOL *pbAlreadyTran, + IN ULONG Command) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiInit() +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiMakeFontDir( + IN FLONG flEmbed, + OUT PBYTE pjFontDir, + IN unsigned cjFontDir, + IN LPWSTR pwszPathname, + IN unsigned cjPathname) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiMakeInfoDC( + IN HDC hdc, + IN BOOL bSet) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiMonoBitmap( + IN HBITMAP hbm) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiMoveTo( + IN HDC hdc, + IN INT x, + IN INT y, + OUT OPTIONAL LPPOINT pptOut) +{ + UNIMPLEMENTED; + return FALSE; +} + 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 Sun Sep 2 14:50:25 2007 @@ -225,18 +225,18 @@ NtGdiGetWidthTable 7 NtGdiGradientFill 6 NtGdiHfontCreate 5 -# NtGdiIcmBrushInfo 8 -# NtGdiInit 0 +NtGdiIcmBrushInfo 8 +NtGdiInit 0 NtGdiInitSpool 0 NtGdiIntersectClipRect 5 NtGdiInvertRgn 2 NtGdiLineTo 3 -# NtGdiMakeFontDir 5 -# NtGdiMakeInfoDC 2 +NtGdiMakeFontDir 5 +NtGdiMakeInfoDC 2 NtGdiMaskBlt 13 NtGdiModifyWorldTransform 3 -# NtGdiMonoBitmap 1 -# NtGdiMoveTo 4 +NtGdiMonoBitmap 1 +NtGdiMoveTo 4 NtGdiOffsetClipRgn 3 NtGdiOffsetRgn 3 NtGdiOpenDCW 7

1 0

[greatlrd] 28763: implement stub for NtGdiGetEmbUFI, NtGdiGetUFIPathname, NtGdiGetEmbedFonts, NtGdiChangeGhostFont, NtGdiAddEmbFontToDC, NtGdiGetWidthTable, NtGdiSTROBJ_bEnum, NtGdiSTROBJ_bEnumPositionsOnly, NtGdiSTROBJ_bGetAdvanceWidths, NtGdiSTROBJ_vEnumStart, NtGdiSTROBJ_dwGetCodePage, NtGdiGetDhpdev
by greatlrd＠svn.reactos.org 02 Sep '07

02 Sep '07

Author: greatlrd Date: Sun Sep 2 14:33:02 2007 New Revision: 28763 URL: http://svn.reactos.org/svn/reactos?rev=28763&view=rev Log: implement stub for NtGdiGetEmbUFI, NtGdiGetUFIPathname, NtGdiGetEmbedFonts, NtGdiChangeGhostFont, NtGdiAddEmbFontToDC, NtGdiGetWidthTable, NtGdiSTROBJ_bEnum, NtGdiSTROBJ_bEnumPositionsOnly, NtGdiSTROBJ_bGetAdvanceWidths, NtGdiSTROBJ_vEnumStart, NtGdiSTROBJ_dwGetCodePage, NtGdiGetDhpdev 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 Sun Sep 2 14:33:02 2007 @@ -3154,3 +3154,175 @@ return NULL; } + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSTROBJ_bEnum( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSTROBJ_bEnumPositionsOnly( + IN STROBJ *pstro, + OUT ULONG *pc, + OUT PGLYPHPOS *ppgpos) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiSTROBJ_bGetAdvanceWidths( + IN STROBJ*pstro, + IN ULONG iFirst, + IN ULONG c, + OUT POINTQF*pptqD) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +VOID +STDCALL +NtGdiSTROBJ_vEnumStart( + IN STROBJ *pstro) +{ + UNIMPLEMENTED; +} + + /* + * @unimplemented + */ +DWORD +STDCALL +NtGdiSTROBJ_dwGetCodePage( + IN STROBJ *pstro) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +DHPDEV +NtGdiGetDhpdev( + IN HDEV hdev) +{ + UNIMPLEMENTED; + return NULL; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetEmbUFI( + IN HDC hdc, + OUT PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL DESIGNVECTOR *pdv, + OUT ULONG *pcjDV, + OUT ULONG *pulBaseCheckSum, + OUT FLONG *pfl, + OUT KERNEL_PVOID *embFontID) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetUFIPathname( + IN PUNIVERSAL_FONT_ID pufi, + OUT OPTIONAL ULONG* pcwc, + OUT OPTIONAL LPWSTR pwszPathname, + OUT OPTIONAL ULONG* pcNumFiles, + IN FLONG fl, + OUT OPTIONAL BOOL *pbMemFont, + OUT OPTIONAL ULONG *pcjView, + OUT OPTIONAL PVOID pvView, + OUT OPTIONAL BOOL *pbTTC, + OUT OPTIONAL ULONG *piTTC) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiGetEmbedFonts( + VOID) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiChangeGhostFont( + IN KERNEL_PVOID *pfontID, + IN BOOL bLoad) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiAddEmbFontToDC( + IN HDC hdc, + IN VOID **pFontID) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiGetWidthTable( + IN HDC hdc, + IN ULONG cSpecial, + IN WCHAR *pwc, + IN ULONG cwc, + OUT USHORT *psWidth, + OUT OPTIONAL WIDTHDATA *pwd, + OUT FLONG *pflInfo) +{ + UNIMPLEMENTED; + return FALSE; +} + 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 Sun Sep 2 14:33:02 2007 @@ -216,13 +216,13 @@ NtGdiGetTextMetricsW 3 NtGdiGetTransform 3 NtGdiGetUFI 6 -# NtGdiGetEmbUFI 7 -# NtGdiGetUFIPathname 10 -# NtGdiGetEmbedFonts 0 -# NtGdiChangeGhostFont 2 -# NtGdiAddEmbFontToDC 2 +NtGdiGetEmbUFI 7 +NtGdiGetUFIPathname 10 +NtGdiGetEmbedFonts 0 +NtGdiChangeGhostFont 2 +NtGdiAddEmbFontToDC 2 NtGdiGetFontUnicodeRanges 2 -# NtGdiGetWidthTable 7 +NtGdiGetWidthTable 7 NtGdiGradientFill 6 NtGdiHfontCreate 5 # NtGdiIcmBrushInfo 8 @@ -654,17 +654,17 @@ NtGdiFONTOBJ_pQueryGlyphAttrs 2 NtGdiFONTOBJ_pvTrueTypeFontFile 2 NtGdiFONTOBJ_cGetAllGlyphHandles 2 -# NtGdiSTROBJ_bEnum 3 -# NtGdiSTROBJ_bEnumPositionsOnly 3 -# NtGdiSTROBJ_bGetAdvanceWidths 4 -# NtGdiSTROBJ_vEnumStart 1 -# NtGdiSTROBJ_dwGetCodePage 1 +NtGdiSTROBJ_bEnum 3 +NtGdiSTROBJ_bEnumPositionsOnly 3 +NtGdiSTROBJ_bGetAdvanceWidths 4 +NtGdiSTROBJ_vEnumStart 1 +NtGdiSTROBJ_dwGetCodePage 1 NtGdiPATHOBJ_vGetBounds 2 NtGdiPATHOBJ_bEnum 2 NtGdiPATHOBJ_vEnumStart 1 NtGdiPATHOBJ_vEnumStartClipLines 4 NtGdiPATHOBJ_bEnumClipLines 3 -# NtGdiGetDhpdev 1 +NtGdiGetDhpdev 1 NtGdiEngCheckAbort 1 NtGdiHT_Get8BPPFormatPalette 4 NtGdiHT_Get8BPPMaskPalette 6

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