Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[greatlrd] 28679: redirect GdiSetLastError to SetLastError (who did forget GdiSetLastError and SetLastError are same, now it is implement as well)
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 22:52:57 2007 New Revision: 28679 URL: http://svn.reactos.org/svn/reactos?rev=28679&view=rev Log: redirect GdiSetLastError to SetLastError (who did forget GdiSetLastError and SetLastError are same, now it is implement as well) 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 30 22:52:57 2007 @@ -266,7 +266,7 @@ GdiResetDCEMF@8 GdiSetAttrs@4 GdiSetBatchLimit@4 -GdiSetLastError@4 +GdiSetLastError@4=SetLastError@4 GdiSetPixelFormat@8=NtGdiSetPixelFormat@8 GdiSetServerAttr@8 GdiStartDocEMF@8 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 30 22:52:57 2007 @@ -1584,16 +1584,7 @@ return TRUE; } -/* - * @unimplemented - */ -VOID -STDCALL -GdiSetLastError(DWORD dwErrCode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} +

1 0

[greatlrd] 28678: fix the build
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 22:39:08 2007 New Revision: 28678 URL: http://svn.reactos.org/svn/reactos?rev=28678&view=rev Log: fix the build Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Thu Aug 30 22:39:08 2007 @@ -3635,4 +3635,12 @@ APIENTRY NtGdiInitSpool(); +/* FIXME wrong prototypes fix the build */ +W32KAPI +INT +APIENTRY +NtGdiGetSpoolMessage( DWORD u1, + DWORD u2, + DWORD u3, + DWORD u4); #endif

1 0

[greatlrd] 28677: fix a typo
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 22:38:31 2007 New Revision: 28677 URL: http://svn.reactos.org/svn/reactos?rev=28677&view=rev Log: fix a typo 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 30 22:38:31 2007 @@ -2647,7 +2647,7 @@ * @unimplemented */ INT -APIENTRY +STDCALL NtGdiQueryFonts( OUT PUNIVERSAL_FONT_ID pufiFontList, IN ULONG nBufferSize, OUT PLARGE_INTEGER pTimeStamp) @@ -2660,7 +2660,7 @@ * @unimplemented */ INT -APIENTRY +STDCALL NtGdiGetSpoolMessage( DWORD u1, DWORD u2, DWORD u3,

1 0

[greatlrd] 28676: Implement GdiReleaseLocalDC, GdiFlush, GdiPlayDCScript, GdiPlayJournal, GdiPlayScript, GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiSetAttrs Redirect GdiConsoleTextOut, FontIsLinked, GdiDescribePixelFormat, GdiSetPixelFormat, GdiSwapBuffers, GdiFullscreenControl, GdiQueryFonts, GdiInitSpool to win32k.sys do not redirect add smaller code in gdi32 and use share memory : GdiGradientFill, FrameRgn, GdiTransparentBlt stub : GdiPrinterThunk, GdiConvertBitmapV5
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 22:06:35 2007 New Revision: 28676 URL: http://svn.reactos.org/svn/reactos?rev=28676&view=rev Log: Implement GdiReleaseLocalDC, GdiFlush, GdiPlayDCScript, GdiPlayJournal, GdiPlayScript, GdiConvertBitmap, GdiConvertBrush, GdiConvertDC, GdiConvertFont, GdiSetAttrs Redirect GdiConsoleTextOut, FontIsLinked, GdiDescribePixelFormat, GdiSetPixelFormat, GdiSwapBuffers, GdiFullscreenControl, GdiQueryFonts, GdiInitSpool to win32k.sys do not redirect add smaller code in gdi32 and use share memory : GdiGradientFill, FrameRgn, GdiTransparentBlt stub : GdiPrinterThunk, GdiConvertBitmapV5 update good api list. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/good api.def trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsw.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 30 22:06:35 2007 @@ -184,8 +184,98 @@ FixBrushOrgEx@16 FlattenPath@4 FloodFill@16 -FontIsLinked@4 -FrameRgn@20=NtGdiFontIsLinked@4 +FontIsLinked@4=NtGdiFontIsLinked@4 +FrameRgn@20 +GdiAddFontResourceW@12 +GdiAddGlsBounds@8 +GdiAddGlsRecord@16 +GdiAlphaBlend@44 +GdiArtificialDecrementDriver@8 +GdiCleanCacheDC@4 +GdiComment@12 +GdiConsoleTextOut@16=NtGdiConsoleTextOut@16 +GdiConvertAndCheckDC@4 +GdiConvertBitmap@4 +GdiConvertBitmapV5@16 +GdiConvertBrush@4 +GdiConvertDC@4 +GdiConvertEnhMetaFile@4 +GdiConvertFont@4 +GdiConvertMetaFilePict@4 +GdiConvertPalette@4 +GdiConvertRegion@4 +GdiConvertToDevmodeW@4 +GdiCreateLocalEnhMetaFile@4 +GdiCreateLocalMetaFilePict@4 +GdiDeleteLocalDC@4 +GdiDeleteSpoolFileHandle@4 +GdiDescribePixelFormat@16=NtGdiDescribePixelFormat@16 +GdiDllInitialize@12 +GdiEndDocEMF@4 +GdiEndPageEMF@8 +GdiEntry10@8 +GdiEntry11@8 +GdiEntry12@8 +GdiEntry13@0 +GdiEntry14@12 +GdiEntry15@12 +GdiEntry16@12 +GdiEntry1@8 +GdiEntry2@44 +GdiEntry3@4 +GdiEntry4@8 +GdiEntry5@4 +GdiEntry6@8 +GdiEntry7@8 +GdiEntry8@4 +GdiEntry9@24 +GdiFixUpHandle@4 +GdiFlush@0 +GdiFullscreenControl@20=NtGdiFullscreenControl@20 +GdiGetBatchLimit@0 +GdiGetCharDimensions@12 +GdiGetCodePage@4 +GdiGetDC@4 +GdiGetDevmodeForPage@16 +GdiGetLocalBrush@4 +GdiGetLocalDC@4 +GdiGetLocalFont@4 +GdiGetPageCount@4 +GdiGetPageHandle@12 +GdiGetSpoolFileHandle@12 +GdiGetSpoolMessage@16=NtGdiGetSpoolMessage@16 +GdiGradientFill@24 +GdiInitSpool@0=NtGdiInitSpool@0 +GdiInitializeLanguagePack@4 +GdiIsMetaFileDC@4 +GdiIsMetaPrintDC@4 +GdiIsPlayMetafileDC@4 +GdiPlayDCScript@24 +GdiPlayEMF@20 +GdiPlayJournal@20 +GdiPlayPageEMF@20 +GdiPlayPrivatePageEMF@12 +GdiPlayScript@28 +GdiPrinterThunk@12 +GdiProcessSetup@0 +GdiQueryFonts@12=NtGdiQueryFonts@12 +GdiQueryTable@0 +GdiRealizationInfo@8 +GdiReleaseDC@4 +GdiReleaseLocalDC@4 +GdiResetDCEMF@8 +GdiSetAttrs@4 +GdiSetBatchLimit@4 +GdiSetLastError@4 +GdiSetPixelFormat@8=NtGdiSetPixelFormat@8 +GdiSetServerAttr@8 +GdiStartDocEMF@8 +GdiStartPageEMF@4 +GdiSwapBuffers@4=NtGdiSwapBuffers@4 +GdiTransparentBlt@44 +GdiValidateHandle@4 +GetArcDirection@4 +GetAspectRatioFilterEx@8 ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -245,98 +335,7 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 - -GdiAddFontResourceW@12 -GdiAddGlsBounds@8 -GdiAddGlsRecord@16 -GdiAlphaBlend@44 -GdiArtificialDecrementDriver@8 -GdiCleanCacheDC@4 -GdiComment@12 -GdiConsoleTextOut@16 -GdiConvertAndCheckDC@4 -GdiConvertBitmap@4 -;GdiConvertBitmapV5 -GdiConvertBrush@4 -GdiConvertDC@4 -GdiConvertEnhMetaFile@4 -GdiConvertFont@4 -GdiConvertMetaFilePict@4 -GdiConvertPalette@4 -GdiConvertRegion@4 -GdiConvertToDevmodeW@4 -GdiCreateLocalEnhMetaFile@4 -GdiCreateLocalMetaFilePict@4 -GdiDeleteLocalDC@4 -GdiDeleteSpoolFileHandle@4 -GdiDescribePixelFormat@16 -GdiDllInitialize@12 GdiDrawStream@12 -GdiEndDocEMF@4 -GdiEndPageEMF@8 -GdiEntry1@8 -GdiEntry2@44 -GdiEntry3@4 -GdiEntry4@8 -GdiEntry5@4 -GdiEntry6@8 -GdiEntry7@8 -GdiEntry8@4 -GdiEntry9@24 -GdiEntry10@8 -GdiEntry11@8 -GdiEntry12@8 -GdiEntry13@0 -GdiEntry14@12 -GdiEntry15@12 -GdiEntry16@12 -GdiFixUpHandle@4 -GdiFlush@0 -GdiFullscreenControl@20 -GdiGetBatchLimit@0 -GdiGetCharDimensions@12 -GdiGetCodePage@4 -GdiGetDC@4 -GdiGetDevmodeForPage@16 -GdiGetLocalBrush@4 -GdiGetLocalDC@4 -GdiGetLocalFont@4 -GdiGetPageCount@4 -GdiGetPageHandle@12 -GdiGetSpoolFileHandle@12 -;GdiGetSpoolMessage -GdiGradientFill@24=NtGdiGradientFill@24 -GdiInitSpool@0 -GdiInitializeLanguagePack@4 -GdiIsMetaFileDC@4 -GdiIsMetaPrintDC@4 -GdiIsPlayMetafileDC@4 -GdiPlayDCScript@24 -GdiPlayEMF@20 -GdiPlayJournal@20 -GdiPlayPageEMF@20 -GdiPlayPrivatePageEMF@12 -GdiPlayScript@28 -;GdiPrinterThunk -GdiProcessSetup@0 -GdiQueryFonts@12 -GdiQueryTable@0 -GdiRealizationInfo@8 -GdiReleaseDC@4 -GdiReleaseLocalDC@4 -GdiResetDCEMF@8 -GdiSetAttrs@4 -GdiSetBatchLimit@4 -GdiSetLastError@4 -GdiSetPixelFormat@8 -GdiSetServerAttr@8 -GdiStartDocEMF@8 -GdiStartPageEMF@4 -GdiSwapBuffers@4 -GdiTransparentBlt@44=NtGdiTransparentBlt@44 -GdiValidateHandle@4 -GetArcDirection@4 -GetAspectRatioFilterEx@8 GetBitmapAttributes@4 GetBitmapBits@12=NtGdiGetBitmapBits@12 GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 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 Thu Aug 30 22:06:35 2007 @@ -7,7 +7,8 @@ ; if bugs exists their or verify ; -AddFontResourceA@4 +AAddFontResourceA@4 +AddFontResourceExA@12 AddFontResourceExW@12 AddFontResourceW@4 AnyLinkedFonts@0 @@ -47,11 +48,14 @@ EngCreateDeviceBitmap@16 EngCreateDeviceSurface@16 EngCreatePalette@24 +EngCreateSemaphore@0 EngDeleteClip@4 EngDeletePath@4 +EngDeleteSemaphore@4 EngDeleteSurface@4 EngEraseSurface@12 EngFillPath@28 +EngFindResource@16 EngFreeModule@4 EngGetCurrentCodePage@8 EngGetPrinterDataFileName@4 @@ -73,4 +77,39 @@ EngTextOut@40 EngTransparentBlt@32 EngUnicodeToMultiByteN@20 +EngUnlockSurface@4 +EqualRgn@8 +FixBrushOrgEx@16 +FloodFill@16 +FontIsLinked@4 +FONTOBJ_cGetAllGlyphHandles@8 +FONTOBJ_cGetGlyphs@20 +FONTOBJ_pfdg@4 +FONTOBJ_pifi@4 +FONTOBJ_pQueryGlyphAttrs@8 +FONTOBJ_pvTrueTypeFontFile@8 +FONTOBJ_pxoGetXform@4 +FONTOBJ_vGetInfo@12 +GdiConsoleTextOut@16 +GdiConvertBitmap@4 +GdiConvertBrush@4 +GdiConvertDC@4 +GdiDescribePixelFormat@16 +GdiEntry16@12=DdSwapTextureHandles@12 +GdiFlush@0 +GdiFullscreenControl@20 +GdiGetSpoolMessage@16 +GdiInitSpool@0 +GdiPlayDCScript@24 +GdiPlayJournal@20 +GdiPlayScript@28 +GdiQueryFonts@12 +GdiReleaseLocalDC@4 +GdiSetAttrs@4 +GdiSetLastError@4 +GdiSetPixelFormat@8 +GdiSetServerAttr@8 +GdiSwapBuffers@4 +GetAspectRatioFilterEx@8 + 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 Thu Aug 30 22:06:35 2007 @@ -160,13 +160,13 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GdiReleaseLocalDC(HDC hdc) { - return 0; + return TRUE; } 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 30 22:06:35 2007 @@ -757,18 +757,14 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL GdiFlush() { - /* - * Although GdiFlush is unimplemented, it's safe to return - * TRUE, because we don't have GDI engine surface caching - * implemented yet. - */ - return TRUE; + NtGdiFlush(); + return TRUE; } @@ -1118,9 +1114,9 @@ /* - * @unimplemented - */ -DWORD + * @implemented + */ +BOOL STDCALL GdiPlayDCScript( DWORD a0, @@ -1131,16 +1127,15 @@ DWORD a5 ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD + /* FIXME fix the prototype right */ + return FALSE; +} + + +/* + * @implemented + */ +BOOL STDCALL GdiPlayJournal( DWORD a0, @@ -1150,16 +1145,15 @@ DWORD a4 ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD + /* FIXME fix the prototype right */ + return FALSE; +} + + +/* + * @implemented + */ +BOOL STDCALL GdiPlayScript( DWORD a0, @@ -1168,12 +1162,10 @@ DWORD a3, DWORD a4, DWORD a5, - DWORD a6 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + DWORD a6) +{ + /* FIXME prototype */ + return FALSE; } @@ -1348,12 +1340,150 @@ return 0; } + + +/* + * @unimplemented + */ +DWORD +STDCALL +GdiAddGlsBounds(HDC hdc,LPRECT prc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + /* * @unimplemented */ BOOL STDCALL -FontIsLinked(HDC hdc) +GdiArtificialDecrementDriver(LPWSTR pDriverName,BOOL unknown) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiCleanCacheDC(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +HDC +STDCALL +GdiConvertAndCheckDC(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @implemented + */ +HBITMAP +STDCALL +GdiConvertBitmap(HBITMAP hbm) +{ + return hbm; +} + +/* + * @implemented + */ +HBRUSH +STDCALL +GdiConvertBrush(HBRUSH hbr) +{ + return hbr; +} + +/* + * @implemented + */ +HDC +STDCALL +GdiConvertDC(HDC hdc) +{ + return hdc; +} + +/* + * @implemented + */ +HFONT +STDCALL +GdiConvertFont(HFONT hfont) +{ + return hfont; +} + +/* + * @unimplemented + */ +HPALETTE +STDCALL +GdiConvertPalette(HPALETTE hpal) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +HRGN +STDCALL +GdiConvertRegion(HRGN hregion) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +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); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiDrawStream(HDC dc, ULONG l, VOID *v) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1365,67 +1495,19 @@ */ DWORD STDCALL -GdiAddGlsBounds(HDC hdc,LPRECT prc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiArtificialDecrementDriver(LPWSTR pDriverName,BOOL unknown) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiCleanCacheDC(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HDC -STDCALL -GdiConvertAndCheckDC(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBITMAP -STDCALL -GdiConvertBitmap(HBITMAP hbm) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBRUSH -STDCALL -GdiConvertBrush(HBRUSH hbr) +GdiGetCodePage(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +HBRUSH +STDCALL +GdiGetLocalBrush(HBRUSH hbr) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1437,7 +1519,7 @@ */ HDC STDCALL -GdiConvertDC(HDC hdc) +GdiGetLocalDC(HDC hdc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1449,126 +1531,6 @@ */ HFONT STDCALL -GdiConvertFont(HFONT hfont) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HPALETTE -STDCALL -GdiConvertPalette(HPALETTE hpal) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HRGN -STDCALL -GdiConvertRegion(HRGN hregion) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -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); - return 0; -} - -/* - * @unimplemented - */ -int -STDCALL -GdiDescribePixelFormat(HDC hdc,int ipfd,UINT cjpfd,PPIXELFORMATDESCRIPTOR ppfd) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiDrawStream(HDC dc, ULONG l, VOID *v) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -GdiGetCodePage(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HBRUSH -STDCALL -GdiGetLocalBrush(HBRUSH hbr) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HDC -STDCALL -GdiGetLocalDC(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HFONT -STDCALL GdiGetLocalFont(HFONT hfont) { UNIMPLEMENTED; @@ -1613,15 +1575,13 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL GdiSetAttrs(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return TRUE; } /* @@ -1635,17 +1595,7 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } -/* - * @unimplemented - */ -BOOL -STDCALL -GdiSetPixelFormat(HDC hdc,int ipfd) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -1659,27 +1609,16 @@ return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -GdiSwapBuffers(HDC hdc) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented + + +/* + * @implemented */ VOID STDCALL GdiSetServerAttr(HDC hdc,DWORD attr) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + /* it does do nothing */ } /* @@ -2052,31 +1991,9 @@ return 0; } -/* - * @unimplemented - */ -NTSTATUS -STDCALL -GdiFullscreenControl(FULLSCREENCONTROL FullscreenCommand,PVOID FullscreenInput, - DWORD FullscreenInputLength,PVOID FullscreenOutput, - PULONG FullscreenOutputLength) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -INT -STDCALL -GdiQueryFonts(PUNIVERSAL_FONT_ID pufiFontList,ULONG nBufferSize,PLARGE_INTEGER pTimeStamp ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + + + /* * @unimplemented @@ -2719,17 +2636,7 @@ return 0; } -/* - * @unimplemented - */ -BOOL -STDCALL -GdiInitSpool(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2791,5 +2698,101 @@ return NtGdiFillRgn( hdc, hrgn, hbrush); } - - +/* + * @implemented + */ +BOOL +STDCALL +GdiGradientFill( + IN HDC hdc, + IN PTRIVERTEX pVertex, + IN ULONG nVertex, + IN PVOID pMesh, + IN ULONG nMesh, + IN ULONG ulMode) +{ + /* FIXME some part need be done in user mode */ + return NtGdiGradientFill(hdc, pVertex, nVertex, pMesh, nMesh, ulMode); +} + + +/* + * @implemented + */ +BOOL +STDCALL +FrameRgn( + IN HDC hdc, + IN HRGN hrgn, + IN HBRUSH hbrush, + IN INT xWidth, + IN INT yHeight) +{ + /* FIXME some part need be done in user mode */ + return NtGdiFrameRgn(hdc, hrgn, hbrush, xWidth, yHeight); +} + +/* + * @implemented + */ +BOOL +STDCALL +GdiTransparentBlt( + IN HDC hdcDst, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN COLORREF TransColor +) +{ + /* FIXME some part need be done in user mode */ + return NtGdiTransparentBlt(hdcDst, xDst, yDst, cxDst, cyDst, hdcSrc, xSrc, ySrc, cxSrc, cySrc, TransColor); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiPrinterThunk( + IN HUMPD humpd, + DWORD *status, + DWORD unuse) +{ + /* FIXME figout the protypes, the HUMPD are a STRUCT or COM object */ + /* status contain some form of return value that being save, what it is I do not known */ + /* unsue seam have zero effect, what it is for I do not known */ + + // ? return NtGdiSetPUMPDOBJ(humpd->0x10,TRUE, humpd, ?) <- blackbox, OpenRCE info, and api hooks for anylaysing; + return FALSE; +} + +/* + * @unimplemented + * + */ +HBITMAP +STDCALL +GdiConvertBitmapV5( + HBITMAP in_format_BitMap, + HBITMAP src_BitMap, + INT bpp, + INT unuse) +{ + /* FIXME guessing the prototypes */ + + /* + * it have create a new bitmap with desired in format, + * then convert it src_bitmap to new format + * and return it as HBITMAP + */ + + return FALSE; +} + 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 30 22:06:35 2007 @@ -260,17 +260,6 @@ return NtGdiAddFontResource ( &Filename, fl ); } -/* - * @unimplemented - */ -BOOL -STDCALL -GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented 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 30 22:06:35 2007 @@ -396,6 +396,9 @@ } +/* + * @implemented + */ BOOL STDCALL GetAspectRatioFilterEx(

1 0

[greatlrd] 28675: implement stub for NtGdiInitSpool, NtGdiQueryFonts, NtGdiGetSpoolMessage. the NtGdiGetSpoolMessage missing the protypes.
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 21:38:40 2007 New Revision: 28675 URL: http://svn.reactos.org/svn/reactos?rev=28675&view=rev Log: implement stub for NtGdiInitSpool, NtGdiQueryFonts, NtGdiGetSpoolMessage. the NtGdiGetSpoolMessage missing the protypes. 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 30 21:38:40 2007 @@ -2143,6 +2143,7 @@ + /* * @unimplemented */ @@ -2630,8 +2631,46 @@ } - - - - - + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiInitSpool() +{ + UNIMPLEMENTED; + return FALSE; +} + + + /* + * @unimplemented + */ +INT +APIENTRY +NtGdiQueryFonts( OUT PUNIVERSAL_FONT_ID pufiFontList, + IN ULONG nBufferSize, + OUT PLARGE_INTEGER pTimeStamp) +{ + UNIMPLEMENTED; + return 0; +} + + /* + * @unimplemented + */ +INT +APIENTRY +NtGdiGetSpoolMessage( DWORD u1, + DWORD u2, + DWORD u3, + DWORD u4) +{ + /* FIXME the prototypes */ + 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 Thu Aug 30 21:38:40 2007 @@ -185,29 +185,29 @@ NtGdiGetEudcTimeStampEx 3 NtGdiGetFontData 5 NtGdiGetFontResourceInfoInternalW 7 -# NtGdiGetGlyphIndicesW 5 -# NtGdiGetGlyphIndicesWInternal 6 +# NtGdiGetGlyphIndicesW 5 +# NtGdiGetGlyphIndicesWInternal 6 NtGdiGetGlyphOutline 8 NtGdiGetKerningPairs 3 -# NtGdiGetLinkedUFIs 3 +# NtGdiGetLinkedUFIs 3 NtGdiGetMiterLimit 2 -# NtGdiGetMonitorID 3 +# NtGdiGetMonitorID 3 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 -# NtGdiGetObjectBitmapHandle 2 +# NtGdiGetObjectBitmapHandle 2 NtGdiGetOutlineTextMetricsInternalW 4 NtGdiGetPath 4 NtGdiGetPixel 3 NtGdiGetRandomRgn 3 NtGdiGetRasterizerCaps 2 -# NtGdiGetRealizationInfo 3 +# NtGdiGetRealizationInfo 3 NtGdiGetRegionData 3 NtGdiGetRgnBox 2 -# NtGdiGetServerMetaFileBits 7 -# NtGdiGetSpoolMessage 4 -# NtGdiGetStats 5 +# NtGdiGetServerMetaFileBits 7 +NtGdiGetSpoolMessage 4 +# NtGdiGetStats 5 NtGdiGetStockObject 1 -# NtGdiGetStringBitmapW 5 +# NtGdiGetStringBitmapW 5 NtGdiGetSystemPaletteUse 1 NtGdiGetTextCharsetInfo 3 NtGdiGetTextExtent 5 @@ -216,27 +216,27 @@ NtGdiGetTextMetricsW 3 NtGdiGetTransform 3 NtGdiGetUFI 6 -# NtGdiGetEmbUFI 7 -# NtGdiGetUFIPathname 10 -# NtGdiGetEmbedFonts 0 -# NtGdiChangeGhostFont 2 -# NtGdiAddEmbFontToDC 2 -# NtGdiGetFontUnicodeRanges 2 -# NtGdiGetWidthTable 7 +# NtGdiGetEmbUFI 7 +# NtGdiGetUFIPathname 10 +# NtGdiGetEmbedFonts 0 +# NtGdiChangeGhostFont 2 +# NtGdiAddEmbFontToDC 2 +# NtGdiGetFontUnicodeRanges 2 +# NtGdiGetWidthTable 7 NtGdiGradientFill 6 NtGdiHfontCreate 5 -# NtGdiIcmBrushInfo 8 -# NtGdiInit 0 -# NtGdiInitSpool 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 @@ -249,13 +249,13 @@ # NtGdiPolyTextOutW 4 NtGdiPtInRegion 3 NtGdiPtVisible 3 -# NtGdiQueryFonts 3 -# NtGdiQueryFontAssocInfo 1 +NtGdiQueryFonts 3 +# NtGdiQueryFontAssocInfo 1 NtGdiRectangle 5 NtGdiRectInRegion 2 NtGdiRectVisible 2 -# NtGdiRemoveFontResourceW 6 -# NtGdiRemoveFontMemResourceEx 1 +# NtGdiRemoveFontResourceW 6 +# NtGdiRemoveFontMemResourceEx 1 NtGdiResetDC 5 NtGdiResizePalette 2 NtGdiRestoreDC 2 @@ -263,50 +263,50 @@ 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 -# NtGdiSetBrushAttributes 2 +# NtGdiSetBrushAttributes 2 NtGdiSetBrushOrg 4 NtGdiSetColorAdjustment 2 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 NtGdiSetSystemPaletteUse 2 NtGdiSetTextJustification 3 -# NtGdiSetupPublicCFONT 3 -# NtGdiSetVirtualResolution 5 -# NtGdiSetSizeDevice 3 +# NtGdiSetupPublicCFONT 3 +# NtGdiSetVirtualResolution 5 +# NtGdiSetSizeDevice 3 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 @@ -347,10 +347,10 @@ NtUserCreateAcceleratorTable 2 NtUserCreateCaret 4 NtUserCreateDesktop 5 -# NtUserCreateInputContext 1 +# NtUserCreateInputContext 1 NtUserCreateLocalMemHandle 4 -# NtUserCreateWindowEx 15 Wrong number of param ? -# NtUserCreateWindowStation 7 Wrong number of param ? +# NtUserCreateWindowEx 15 Wrong number of param ? +# NtUserCreateWindowStation 7 Wrong number of param ? NtUserDdeGetQualityOfService 3 NtUserDdeInitialize 5 NtUserDdeSetQualityOfService 3 @@ -358,11 +358,11 @@ NtUserDefSetText 2 NtUserDeleteMenu 3 NtUserDestroyAcceleratorTable 1 -# NtUserDestroyCursor 2 -# NtUserDestroyInputContext 1 +# NtUserDestroyCursor 2 +# NtUserDestroyInputContext 1 NtUserDestroyMenu 1 NtUserDestroyWindow 1 -# NtUserDisableThreadIme 1 +# NtUserDisableThreadIme 1 NtUserDispatchMessage 1 NtUserDragDetect 3 NtUserDragObject 5 @@ -378,22 +378,22 @@ NtUserEndMenu 0 NtUserEndPaint 2 NtUserEnumDisplayDevices 4 -# NtUserEnumDisplayMonitors 4 Wrong number of param ? +# NtUserEnumDisplayMonitors 4 Wrong number of param ? NtUserEnumDisplaySettings 4 NtUserEvent 1 NtUserExcludeUpdateRgn 2 NtUserFillWindow 4 -# NtUserFindExistingCursorIcon 3 Wrong number of param ? -# NtUserFindWindowEx 5 Wrong number of param ? +# NtUserFindExistingCursorIcon 3 Wrong number of param ? +# NtUserFindWindowEx 5 Wrong number of param ? NtUserFlashWindowEx 1 NtUserGetAltTabInfo 6 NtUserGetAncestor 2 -# NtUserGetAppImeLevel 1 +# NtUserGetAppImeLevel 1 NtUserGetAsyncKeyState 1 -# NtUserGetAtomName 2 +# NtUserGetAtomName 2 NtUserGetCaretBlinkTime 0 NtUserGetCaretPos 1 -# NtUserGetClassInfo 5 Wrong number of param ? +# NtUserGetClassInfo 5 Wrong number of param ? NtUserGetClassName 3 NtUserGetClipboardData 2 NtUserGetClipboardFormatName 3 @@ -413,10 +413,10 @@ NtUserGetForegroundWindow 0 NtUserGetGuiResources 2 NtUserGetGUIThreadInfo 2 -# NtUserGetIconInfo 6 -# NtUserGetIconSize 4 +# NtUserGetIconInfo 6 +# NtUserGetIconSize 4 NtUserGetImeHotKey 4 -# NtUserGetImeInfoEx 2 +# NtUserGetImeInfoEx 2 NtUserGetInternalWindowPos 3 NtUserGetKeyboardLayoutList 2 NtUserGetKeyboardLayoutName 1 @@ -433,11 +433,11 @@ NtUserGetOpenClipboardWindow 0 NtUserGetPriorityClipboardFormat 2 NtUserGetProcessWindowStation 0 -# NtUserGetRawInputBuffer 3 -# NtUserGetRawInputData 5 -# NtUserGetRawInputDeviceInfo 4 -# NtUserGetRawInputDeviceList 3 -# NtUserGetRegisteredRawInputDevices 3 +# NtUserGetRawInputBuffer 3 +# NtUserGetRawInputData 5 +# NtUserGetRawInputDeviceInfo 4 +# NtUserGetRawInputDeviceList 3 +# NtUserGetRegisteredRawInputDevices 3 NtUserGetScrollBarInfo 3 NtUserGetSystemMenu 2 NtUserGetThreadDesktop 2 @@ -448,13 +448,13 @@ NtUserGetWindowDC 1 NtUserGetWindowPlacement 2 NtUserGetWOWClass 2 -# NtUserHardErrorControl 3 +# NtUserHardErrorControl 3 NtUserHideCaret 1 NtUserHiliteMenuItem 4 NtUserImpersonateDdeClientWindow 2 -# NtUserInitialize 3 +# NtUserInitialize 3 NtUserInitializeClientPfnArrays 4 -# NtUserInitTask 12 Wrong number of param ? +# NtUserInitTask 12 Wrong number of param ? NtUserInternalGetWindowText 3 NtUserInvalidateRect 3 NtUserInvalidateRgn 3 @@ -467,13 +467,13 @@ NtUserMapVirtualKeyEx 4 NtUserMenuItemFromPoint 4 NtUserMessageCall 7 -# NtUserMinMaximize 3 +# NtUserMinMaximize 3 NtUserMNDragLeave 0 NtUserMNDragOver 2 NtUserModifyUserStartupInfoFlags 2 NtUserMoveWindow 6 NtUserNotifyIMEStatus 3 -# NtUserNotifyProcessCreate 4 +# NtUserNotifyProcessCreate 4 NtUserNotifyWinEvent 4 NtUserOpenClipboard 2 NtUserOpenDesktop 3 @@ -483,26 +483,26 @@ NtUserPeekMessage 5 NtUserPostMessage 4 NtUserPostThreadMessage 4 -# NtUserPrintWindow 3 -# NtUserProcessConnect 3 -# NtUserQueryInformationThread 5 -# NtUserQueryInputContext 2 +# NtUserPrintWindow 3 +# NtUserProcessConnect 3 +# NtUserQueryInformationThread 5 +# NtUserQueryInputContext 2 NtUserQuerySendMessage 1 NtUserQueryUserCounters 5 NtUserQueryWindow 2 NtUserRealChildWindowFromPoint 3 -# NtUserRealInternalGetMessage 6 -# NtUserRealWaitMessageEx 2 +# NtUserRealInternalGetMessage 6 +# NtUserRealWaitMessageEx 2 NtUserRedrawWindow 4 -# NtUserRegisterClassExWOW 7 -# NtUserRegisterUserApiHook 2 +# NtUserRegisterClassExWOW 7 +# NtUserRegisterUserApiHook 2 NtUserRegisterHotKey 4 -# NtUserRegisterRawInputDevices 3 +# NtUserRegisterRawInputDevices 3 NtUserRegisterTasklist 1 NtUserRegisterWindowMessage 1 NtUserRemoveMenu 3 NtUserRemoveProp 2 -# NtUserResolveDesktop 4 +# NtUserResolveDesktop 4 NtUserResolveDesktopForWOW 1 NtUserSBGetParms 4 NtUserScrollDC 7 @@ -510,7 +510,7 @@ NtUserSelectPalette 3 NtUserSendInput 3 NtUserSetActiveWindow 1 -# NtUserSetAppImeLevel 2 +# NtUserSetAppImeLevel 2 NtUserSetCapture 1 NtUserSetClassLong 4 NtUserSetClassWord 3 @@ -518,15 +518,15 @@ NtUserSetClipboardViewer 1 NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 -# NtUserSetCursorContents 2 -# NtUserSetCursorIconData 4 Wrong number of param ? +# NtUserSetCursorContents 2 +# NtUserSetCursorIconData 4 Wrong number of param ? NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5 -# NtUserSetImeInfoEx 1 +# NtUserSetImeInfoEx 1 NtUserSetImeOwnerWindow 2 -# NtUserSetInformationProcess 4 -# NtUserSetInformationThread 4 +# NtUserSetInformationProcess 4 +# NtUserSetInformationThread 4 NtUserSetInternalWindowPos 4 NtUserSetKeyboardState 1 NtUserSetLogonNotifyWindow 1 @@ -546,7 +546,7 @@ NtUserSetSystemMenu 2 NtUserSetSystemTimer 4 NtUserSetThreadDesktop 1 -# NtUserSetThreadLayoutHandles 2 +# NtUserSetThreadLayoutHandles 2 NtUserSetThreadState 2 NtUserSetTimer 4 NtUserSetWindowFNID 2 @@ -563,36 +563,36 @@ NtUserShowScrollBar 3 NtUserShowWindow 2 NtUserShowWindowAsync 2 -# NtUserSoundSentry 0 +# NtUserSoundSentry 0 NtUserSwitchDesktop 1 NtUserSystemParametersInfo 4 -# NtUserTestForInteractiveUser 1 +# NtUserTestForInteractiveUser 1 NtUserThunkedMenuInfo 2 NtUserThunkedMenuItemInfo 6 NtUserToUnicodeEx 7 NtUserTrackMouseEvent 1 NtUserTrackPopupMenuEx 6 -# NtUserCalcMenuBar 5 -# NtUserPaintMenuBar 6 +# NtUserCalcMenuBar 5 +# NtUserPaintMenuBar 6 NtUserTranslateAccelerator 3 NtUserTranslateMessage 2 NtUserUnhookWindowsHookEx 1 NtUserUnhookWinEvent 1 NtUserUnloadKeyboardLayout 1 NtUserUnlockWindowStation 1 -# NtUserUnregisterClass 3 Wrong number of param ? -# NtUserUnregisterUserApiHook 0 +# NtUserUnregisterClass 3 Wrong number of param ? +# NtUserUnregisterUserApiHook 0 NtUserUnregisterHotKey 2 NtUserUpdateInputContext 3 NtUserUpdateInstance 3 NtUserUpdateLayeredWindow 9 -# NtUserGetLayeredWindowAttributes 4 +# NtUserGetLayeredWindowAttributes 4 NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 -# NtUserValidateHandleSecure 2 Wrong number of param ? -# NtUserValidateRect 2 -# NtUserValidateTimerCallback 3 +# NtUserValidateHandleSecure 2 Wrong number of param ? +# NtUserValidateRect 2 +# NtUserValidateTimerCallback 3 NtUserVkKeyScanEx 3 NtUserWaitForInputIdle 3 NtUserWaitForMsgAndEvent 1 @@ -600,11 +600,11 @@ NtUserWin32PoolAllocationStats 6 NtUserWindowFromPoint 2 NtUserYieldTask 0 -# NtUserRemoteConnect 3 -# NtUserRemoteRedrawRectangle 4 -# NtUserRemoteRedrawScreen 0 -# NtUserRemoteStopScreenUpdates 0 -# NtUserCtxDisplayIOCtl 3 +# NtUserRemoteConnect 3 +# NtUserRemoteRedrawRectangle 4 +# NtUserRemoteRedrawScreen 0 +# NtUserRemoteStopScreenUpdates 0 +# NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 NtGdiEngCreateBitmap 6 NtGdiEngCreateDeviceSurface 4 @@ -631,21 +631,21 @@ NtGdiEngTransparentBlt 8 NtGdiEngTextOut 10 NtGdiEngStretchBltROP 13 -# NtGdiXLATEOBJ_cGetPalette 4 -# NtGdiXLATEOBJ_iXlate 2 -# NtGdiXLATEOBJ_hGetColorTransform 1 +# NtGdiXLATEOBJ_cGetPalette 4 +# NtGdiXLATEOBJ_iXlate 2 +# NtGdiXLATEOBJ_hGetColorTransform 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_hGetColorTransform 1 -# NtGdiXFORMOBJ_bApplyXform 5 -# NtGdiXFORMOBJ_iGetXform 2 +NtGdiBRUSHOBJ_ulGetBrushColor 1 +NtGdiBRUSHOBJ_pvAllocRbrush 2 +NtGdiBRUSHOBJ_pvGetRbrush 1 +NtGdiBRUSHOBJ_hGetColorTransform 1 +# NtGdiXFORMOBJ_bApplyXform 5 +# NtGdiXFORMOBJ_iGetXform 2 NtGdiFONTOBJ_vGetInfo 3 NtGdiFONTOBJ_pxoGetXform 1 NtGdiFONTOBJ_cGetGlyphs 5 @@ -654,25 +654,25 @@ NtGdiFONTOBJ_pQueryGlyphAttrs 2 NtGdiFONTOBJ_pvTrueTypeFontFile 2 NtGdiFONTOBJ_cGetAllGlyphHandles 2 -# 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 +# 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 NtGdiEngCheckAbort 1 -# NtGdiHT_Get8BPPFormatPalette 4 -# NtGdiHT_Get8BPPMaskPalette 6 -# NtGdiUpdateTransform 1 -# NtGdiSetPUMPDOBJ 4 -# NtGdiBRUSHOBJ_DeleteRbrush 2 -# NtGdiUMPDEngFreeUserMem 1 -# NtGdiDrawStream 3 +# NtGdiHT_Get8BPPFormatPalette 4 +# NtGdiHT_Get8BPPMaskPalette 6 +# NtGdiUpdateTransform 1 +# NtGdiSetPUMPDOBJ 4 +# NtGdiBRUSHOBJ_DeleteRbrush 2 +# NtGdiUMPDEngFreeUserMem 1 +# NtGdiDrawStream 3 # # # Wrong number of param ?

1 0

[janderwald] 28674: - create a batch file to execute the commands required for sysreg
by janderwald＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: janderwald Date: Thu Aug 30 21:20:32 2007 New Revision: 28674 URL: http://svn.reactos.org/svn/reactos?rev=28674&view=rev Log: - create a batch file to execute the commands required for sysreg Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Thu Aug 30 21:20:32 2007 @@ -18,6 +18,7 @@ #include <string.h> #include <setupapi.h> #include <pseh/pseh.h> +#include <shlobj.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> @@ -2120,18 +2121,6 @@ return TRUE; } - if (BootCDRegtestActive) - { - _tcscpy(szValue, _T("C:\\ReactOS\\bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE")); - RegSetValueEx(hKey, - _T("BootCDRegtestActive"), - 0, - REG_SZ, - (const BYTE*)szValue, - _tcslen(szValue) * sizeof(TCHAR)); - } - - if (SetupFindFirstLine(hUnattendedInf, _T("GuiRunOnce"), @@ -2167,10 +2156,47 @@ } } }while(SetupFindNextLine(&InfContext, &InfContext)); - + } + + DPRINT1("BootCDRegtestActive %d\n", BootCDRegtestActive); + if (BootCDRegtestActive) + { + char szPath[MAX_PATH]; + FILE * file; +#if 0 + if (!SHGetSpecialFolderPathA(0, szPath, CSIDL_DESKTOP, FALSE)) + { + /* failed to get desktop path */ + strcpy(szPath, "C:"); + } + strcat(szPath, "\\sysregtest.bat"); +#else + strcpy(szPath, "C:\\sysregtest.bat"); +#endif + file = fopen(szPath, "w+"); + if (!file) + { + DPRINT1("Error: failed create sysregtest.bat"); + RegCloseKey(hKey); + return TRUE; + } + + RegSetValueExA(hKey, + "BootCDRegtestActive", + 0, + REG_SZ, + (const BYTE*)szPath, + strlen(szPath) * sizeof(char)); + + strcpy(szPath, "C:\\ReactOS\\bin\\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); + fwrite(szPath, 1, strlen(szPath) + 1, file); + strcpy(szPath, "C:\\ReactOS\\system32\\shutdown.exe -s"); + fwrite(szPath, 1, strlen(szPath) + 1, file); + fclose(file); + + } RegCloseKey(hKey); - } - return TRUE; + return TRUE; } /*

1 0

[greatlrd] 28673: adding prototype for NtGdiInitSpool()
by greatlrd＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: greatlrd Date: Thu Aug 30 20:28:28 2007 New Revision: 28673 URL: http://svn.reactos.org/svn/reactos?rev=28673&view=rev Log: adding prototype for NtGdiInitSpool() Modified: trunk/reactos/include/psdk/ntgdi.h Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Thu Aug 30 20:28:28 2007 @@ -3630,4 +3630,9 @@ IN HANDLE h ); +W32KAPI +BOOL +APIENTRY +NtGdiInitSpool(); + #endif

1 0

[dreimer] 28672: Translate the new Restart Button into German
by dreimer＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: dreimer Date: Thu Aug 30 20:26:24 2007 New Revision: 28672 URL: http://svn.reactos.org/svn/reactos?rev=28672&view=rev Log: Translate the new Restart Button into German Modified: trunk/reactos/base/shell/explorer/explorer-de.rc Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Thu Aug 30 20:26:24 2007 @@ -336,7 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." - IDS_RESTART "Restart..." + IDS_RESTART "Neustarten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..."

1 0

[gedmurphy] 28671: update the visual service count when a service is deleted
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 17:39:59 2007 New Revision: 28671 URL: http://svn.reactos.org/svn/reactos?rev=28671&view=rev Log: update the visual service count when a service is deleted Modified: trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/listview.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c trunk/reactos/base/applications/mscutils/servman/precomp.h Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Thu Aug 30 17:39:59 2007 @@ -318,17 +318,21 @@ { case WM_INITDIALOG: { - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); - - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } + return TRUE; } @@ -340,10 +344,10 @@ { PCREATE_DATA Data; - Data = (PCREATE_DATA) HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(CREATE_DATA)); - if (Data != NULL) + Data = (PCREATE_DATA)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(CREATE_DATA)); + if (Data) { Data->hSelf = hDlg; @@ -362,7 +366,6 @@ FreeMemory(Data); } - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -370,7 +373,6 @@ case IDCANCEL: { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Thu Aug 30 17:39:59 2007 @@ -119,8 +119,11 @@ case IDOK: { if (DoDeleteService(Info, hDlg)) + { (void)ListView_DeleteItem(Info->hListView, Info->SelectedItem); + UpdateServiceCount(Info); + } EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c Thu Aug 30 17:39:59 2007 @@ -231,8 +231,6 @@ ENUM_SERVICE_STATUS_PROCESS *pService; LPTSTR lpDescription; LVITEM lvItem; - LPTSTR lpNumServices; - TCHAR szNumServices[32]; TCHAR szStatus[64]; DWORD NumServices; DWORD Index; @@ -241,8 +239,6 @@ if (GetServiceList(Info, &NumServices)) { - INT NumListedServ = 0; - for (Index = 0; Index < NumServices; Index++) { LPQUERY_SERVICE_CONFIG pServiceConfig; @@ -334,26 +330,7 @@ } } - if (AllocAndLoadString(&lpNumServices, - hInstance, - IDS_NUM_SERVICES)) - { - NumListedServ = ListView_GetItemCount(Info->hListView); - - _sntprintf(szNumServices, - 31, - lpNumServices, - NumListedServ); - - SendMessage(Info->hStatus, - SB_SETTEXT, - 0, - (LPARAM)szNumServices); - - HeapFree(ProcessHeap, - 0, - lpNumServices); - } + UpdateServiceCount(Info); } /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Thu Aug 30 17:39:59 2007 @@ -118,6 +118,35 @@ SB_SIMPLE, (WPARAM)Info->bInMenuLoop, 0); + } +} + +VOID +UpdateServiceCount(PMAIN_WND_INFO Info) +{ + LPTSTR lpNumServices; + + if (AllocAndLoadString(&lpNumServices, + hInstance, + IDS_NUM_SERVICES)) + { + TCHAR szNumServices[32]; + + INT NumListedServ = ListView_GetItemCount(Info->hListView); + + _sntprintf(szNumServices, + 31, + lpNumServices, + NumListedServ); + + SendMessage(Info->hStatus, + SB_SETTEXT, + 0, + (LPARAM)szNumServices); + + HeapFree(ProcessHeap, + 0, + lpNumServices); } } Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Aug 30 17:39:59 2007 @@ -60,6 +60,7 @@ UINT HintId; } MENU_HINT, *PMENU_HINT; +VOID UpdateServiceCount(PMAIN_WND_INFO Info); VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column); BOOL InitMainWindowImpl(VOID); VOID UninitMainWindowImpl(VOID);

1 0

[gedmurphy] 28670: - implement setting the service description - fix deleting of a service
by gedmurphy＠svn.reactos.org 30 Aug '07

30 Aug '07

Author: gedmurphy Date: Thu Aug 30 16:27:11 2007 New Revision: 28670 URL: http://svn.reactos.org/svn/reactos?rev=28670&view=rev Log: - implement setting the service description - fix deleting of a service Modified: trunk/reactos/base/applications/mscutils/servman/create.c trunk/reactos/base/applications/mscutils/servman/delete.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/query.c trunk/reactos/base/applications/mscutils/servman/servman.c Modified: trunk/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/create.c (original) +++ trunk/reactos/base/applications/mscutils/servman/create.c Thu Aug 30 16:27:11 2007 @@ -60,10 +60,10 @@ return FALSE; } - /* Set the service description in the registry - * CreateService does not do this for us */ - //SetDescription(Data->ServiceName, - // Data->Description); + /* Set the service description as CreateService + does not do this for us */ + SetServiceDescription(Data->ServiceName, + Data->Description); /* report success to user */ LoadString(hInstance, Modified: trunk/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/delete.c (original) +++ trunk/reactos/base/applications/mscutils/servman/delete.c Thu Aug 30 16:27:11 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/delete.c + * FILE: base/applications/mscutils/servman/delete.c * PURPOSE: Delete an existing service - * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -15,42 +15,30 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; + BOOL bRet = FALSE; - /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (hSCManager == NULL) + if (hSCManager) { - GetError(); - return FALSE; + hSc = OpenService(hSCManager, + Info->pCurrentService->lpServiceName, + DELETE); + if (hSc) + { + if (DeleteService(hSc)) + { + bRet = TRUE; + } + + CloseServiceHandle(hSc); + } + + CloseServiceHandle(hSCManager); } - /* get a handle to the service requested for deleting */ - hSc = OpenService(hSCManager, - Info->pCurrentService->lpServiceName, - DELETE); - if (hSc == NULL) - { - GetError(); - CloseServiceHandle(hSCManager); - return FALSE; - } - - /* delete the service opened */ - if (! DeleteService(hSc)) - { - GetError(); - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - return FALSE; - } - - - CloseServiceHandle(hSCManager); - CloseServiceHandle(hSc); - - return TRUE; + return bRet; } @@ -62,53 +50,66 @@ { PMAIN_WND_INFO Info = NULL; HICON hIcon = NULL; - TCHAR Buf[1000]; - LVITEM item; + + /* Get the window context */ + Info = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg, + GWLP_USERDATA); + if (Info == NULL && message != WM_INITDIALOG) + { + return FALSE; + } switch (message) { case WM_INITDIALOG: { + LPTSTR lpDescription; + Info = (PMAIN_WND_INFO)lParam; + if (Info != NULL) + { + SetWindowLongPtr(hDlg, + GWLP_USERDATA, + (LONG_PTR)Info); - hIcon = (HICON) LoadImage(hInstance, - MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, + 16, + 16, + 0); + if (hIcon) + { + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); + DestroyIcon(hIcon); + } - SendMessage(hDlg, - WM_SETICON, - ICON_SMALL, - (LPARAM)hIcon); + SendDlgItemMessage(hDlg, + IDC_DEL_NAME, + WM_SETTEXT, + 0, + (LPARAM)Info->pCurrentService->lpDisplayName); - SendDlgItemMessage(hDlg, - IDC_DEL_NAME, - WM_SETTEXT, - 0, - (LPARAM)Info->pCurrentService->lpDisplayName); + lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName); + if (lpDescription) + { + SendDlgItemMessage(hDlg, + IDC_DEL_DESC, + WM_SETTEXT, + 0, + (LPARAM)lpDescription); + HeapFree(ProcessHeap, + 0, + lpDescription); + } + return TRUE; + } - item.mask = LVIF_TEXT; - item.iItem = Info->SelectedItem; - item.iSubItem = 1; - item.pszText = Buf; - item.cchTextMax = sizeof(Buf); - SendMessage(Info->hListView, - LVM_GETITEM, - 0, - (LPARAM)&item); - - SendDlgItemMessage(hDlg, - IDC_DEL_DESC, - WM_SETTEXT, - 0, - (LPARAM)Buf); - - SetFocus(GetDlgItem(hDlg, IDCANCEL)); - - return TRUE; + return FALSE; } case WM_COMMAND: @@ -120,8 +121,6 @@ if (DoDeleteService(Info, hDlg)) (void)ListView_DeleteItem(Info->hListView, Info->SelectedItem); - - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; @@ -129,7 +128,6 @@ case IDCANCEL: { - DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h Thu Aug 30 16:27:11 2007 @@ -88,6 +88,7 @@ LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName); BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPTSTR lpServiceName, LPTSTR lpPassword); LPTSTR GetServiceDescription(LPTSTR lpServiceName); +BOOL SetServiceDescription(LPTSTR lpServiceName, LPTSTR lpDescription); LPTSTR GetExecutablePath(LPTSTR lpServiceName); BOOL RefreshServiceList(PMAIN_WND_INFO Info); BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService); Modified: trunk/reactos/base/applications/mscutils/servman/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/query.c (original) +++ trunk/reactos/base/applications/mscutils/servman/query.c Thu Aug 30 16:27:11 2007 @@ -210,6 +210,53 @@ return lpDescription; } + +BOOL +SetServiceDescription(LPTSTR lpServiceName, + LPTSTR lpDescription) +{ + SC_HANDLE hSCManager; + SC_HANDLE hSc; + SC_LOCK scLock; + SERVICE_DESCRIPTION ServiceDescription; + BOOL bRet = FALSE; + + hSCManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_LOCK); + if (hSCManager) + { + scLock = LockServiceDatabase(hSCManager); + if (scLock) + { + hSc = OpenService(hSCManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); + if (hSc) + { + ServiceDescription.lpDescription = lpDescription; + + if (ChangeServiceConfig2(hSc, + SERVICE_CONFIG_DESCRIPTION, + &ServiceDescription)) + { + bRet = TRUE; + } + + CloseServiceHandle(hSc); + } + + UnlockServiceDatabase(scLock); + } + + CloseServiceHandle(hSCManager); + } + + if (!bRet) + GetError(); + + return bRet; +} BOOL Modified: trunk/reactos/base/applications/mscutils/servman/servman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/servman.c (original) +++ trunk/reactos/base/applications/mscutils/servman/servman.c Thu Aug 30 16:27:11 2007 @@ -64,6 +64,3 @@ return Ret; } - - -

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007