Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[greatlrd] 28709: redirect GetFontUnicodeRanges to win32k.sys
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 19:09:51 2007 New Revision: 28709 URL: http://svn.reactos.org/svn/reactos?rev=28709&view=rev Log: redirect GetFontUnicodeRanges to win32k.sys 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 19:09:51 2007 @@ -316,6 +316,17 @@ GetEnhMetaFileA@4 GetEnhMetaFileBits@12 GetEnhMetaFileDescriptionA@12 +GetEnhMetaFileDescriptionW@12 +GetEnhMetaFileHeader@12 +GetEnhMetaFilePaletteEntries@12 +GetEnhMetaFilePixelFormat@12 +GetEnhMetaFileW@4 +GetFontAssocStatus@4 +GetFontData@20 +GetFontLanguageInfo@4 +GetFontResourceInfoW@16 +GetFontUnicodeRanges@8=NtGdiGetFontUnicodeRanges@8 + ClearBitmapAttributes@8 @@ -379,16 +390,6 @@ GdiDrawStream@12 GetBitmapAttributes@4 GetBrushAttributes@4 -GetEnhMetaFileDescriptionW@12 -GetEnhMetaFileHeader@12 -GetEnhMetaFilePaletteEntries@12 -GetEnhMetaFilePixelFormat@12 -GetEnhMetaFileW@4 -GetFontAssocStatus@4 -GetFontData@20 -GetFontLanguageInfo@4 -GetFontResourceInfoW@16 -GetFontUnicodeRanges@8 GetGlyphIndicesA@20 GetGlyphIndicesW@20 GetGlyphOutline=GetGlyphOutlineA@28 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 31 19:09:51 2007 @@ -1663,20 +1663,7 @@ return 0; } -/* - * @unimplemented - */ -DWORD -STDCALL -GetFontUnicodeRanges( - HDC hdc, - LPGLYPHSET lpgs -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @implemented

1 0

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

31 Aug '07

Author: greatlrd Date: Fri Aug 31 19:08:37 2007 New Revision: 28708 URL: http://svn.reactos.org/svn/reactos?rev=28708&view=rev Log: implement stub for NtGdiGetFontUnicodeRanges 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 Fri Aug 31 19:08:37 2007 @@ -2860,10 +2860,18 @@ ULONG STDCALL NtGdiQueryFontAssocInfo( - IN HDC hdc -) -{ - UNIMPLEMENTED; - return 0; -} - + IN HDC hdc) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NtGdiGetFontUnicodeRanges( + IN HDC hdc, + OUT OPTIONAL LPGLYPHSET pgs) +{ + 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 Fri Aug 31 19:08:37 2007 @@ -221,7 +221,7 @@ # NtGdiGetEmbedFonts 0 # NtGdiChangeGhostFont 2 # NtGdiAddEmbFontToDC 2 -# NtGdiGetFontUnicodeRanges 2 +NtGdiGetFontUnicodeRanges 2 # NtGdiGetWidthTable 7 NtGdiGradientFill 6 NtGdiHfontCreate 5

1 0

[jimtabor] 28707: Move GetDCObject to dc.c.
by jimtabor＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: jimtabor Date: Fri Aug 31 18:41:01 2007 New Revision: 28707 URL: http://svn.reactos.org/svn/reactos?rev=28707&view=rev Log: Move GetDCObject to dc.c. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c 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 Fri Aug 31 18:41:01 2007 @@ -316,6 +316,43 @@ } +HGDIOBJ +STDCALL +GetDCObject( HDC hDC, INT iType) +{ +#if 0 + if((iType == GDI_OBJECT_TYPE_BRUSH) || + (iType == GDI_OBJECT_TYPE_EXTPEN)|| + (iType == GDI_OBJECT_TYPE_PEN) || + (iType == GDI_OBJECT_TYPE_COLORSPACE)) + { + HGDIOBJ hGO; + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL; + + switch (iType) + { + case GDI_OBJECT_TYPE_BRUSH: + hGO = Dc_Attr->hbrush; + break; + + case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_PEN: + hGO = Dc_Attr->hpen; + break; + + case GDI_OBJECT_TYPE_COLORSPACE: + hGO = Dc_Attr->hColorSpace; + break; + } + return hGO; + } +#endif + return NtGdiGetDCObject( hDC, iType ); +} + + /* * @implemented */ Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Fri Aug 31 18:41:01 2007 @@ -2,43 +2,6 @@ #if 0 /* FIXME: enable this as soon as we have working usermode gdi */ - -// Will move to dc.c -HGDIOBJ -STDCALL -GetDCObject( HDC hDC, INT iType) -{ - - if((iType == GDI_OBJECT_TYPE_BRUSH) || - (iType == GDI_OBJECT_TYPE_EXTPEN)|| - (iType == GDI_OBJECT_TYPE_PEN) || - (iType == GDI_OBJECT_TYPE_COLORSPACE)) - { - HGDIOBJ hGO; - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL; - - switch (iType) - { - case GDI_OBJECT_TYPE_BRUSH: - hGO = Dc_Attr->hbrush; - break; - - case GDI_OBJECT_TYPE_EXTPEN: - case GDI_OBJECT_TYPE_PEN: - hGO = Dc_Attr->hpen; - break; - - case GDI_OBJECT_TYPE_COLORSPACE: - hGO = Dc_Attr->hColorSpace; - break; - } - return hGO; - } - return NtGdiGetDCObject( hDC, iType ); -} - BOOL STDCALL

1 0

[greatlrd] 28706: implement GetFontAssocStatus. do correct implement of GetFontData, if the lpvBuffer are NULL in user mode, gdi32.dll always send in cbData as 0 to win32k.sys
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 18:38:48 2007 New Revision: 28706 URL: http://svn.reactos.org/svn/reactos?rev=28706&view=rev Log: implement GetFontAssocStatus. do correct implement of GetFontData, if the lpvBuffer are NULL in user mode, gdi32.dll always send in cbData as 0 to win32k.sys 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 18:38:48 2007 @@ -385,7 +385,7 @@ GetEnhMetaFilePixelFormat@12 GetEnhMetaFileW@4 GetFontAssocStatus@4 -GetFontData@20=NtGdiGetFontData@20 +GetFontData@20 GetFontLanguageInfo@4 GetFontResourceInfoW@16 GetFontUnicodeRanges@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 Fri Aug 31 18:38:48 2007 @@ -1689,15 +1689,20 @@ } /* - * @unimplemented + * @implemented */ ULONG STDCALL GetFontAssocStatus(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ULONG retValue = 0; + + if (hdc) + { + retValue = NtGdiQueryFontAssocInfo(hdc); + } + + return retValue; } /* @@ -2912,3 +2917,23 @@ /* FIXME some part need be done in user mode */ return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc); } + + +/* + * @implemented + * + */ +DWORD +STDCALL +GetFontData(HDC hdc, + DWORD dwTable, + DWORD dwOffset, + LPVOID lpvBuffer, + DWORD cbData) +{ + if (!lpvBuffer) + { + cbData = 0; + } + return NtGdiGetFontData(hdc, dwTable, dwOffset, lpvBuffer, cbData); +}

1 0

[cfinck] 28705: Create a "files" subdirectory, the QEMU and ReactOS files will be put there. A user, who extracts this package, will now first see the "boot.bat" and "Readme.txt" files, so he can't be confused by all these QEMU files ; -)
by cfinck＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: cfinck Date: Fri Aug 31 18:36:09 2007 New Revision: 28705 URL: http://svn.reactos.org/svn/reactos?rev=28705&view=rev Log: Create a "files" subdirectory, the QEMU and ReactOS files will be put there. A user, who extracts this package, will now first see the "boot.bat" and "Readme.txt" files, so he can't be confused by all these QEMU files ;-) Added: trunk/tools/VM-Templates/QEMU/files/ Modified: trunk/tools/VM-Templates/QEMU/SVN-Readme.txt trunk/tools/VM-Templates/QEMU/boot.bat trunk/tools/VM-Templates/QEMU/install.bat Modified: trunk/tools/VM-Templates/QEMU/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/SVN-Readme… ============================================================================== --- trunk/tools/VM-Templates/QEMU/SVN-Readme.txt (original) +++ trunk/tools/VM-Templates/QEMU/SVN-Readme.txt Fri Aug 31 18:36:09 2007 @@ -5,12 +5,12 @@ - Copy the files in this directory into a directory called "ReactOS-[VERSION]-QEMU". -- Put the QEMU program files there, including its subdirectories. +- Put the QEMU program files in the "files" subdirectory, including its subdirectories. - Use the following command to create the virtual hard disk: qemu-img create -f vmdk ReactOS.vmdk 2G -- Copy the "ReactOS.iso" file into this directory and run "install.bat" to +- Copy the "ReactOS.iso" file into the "files" subdirectory and run "install.bat" to install it. - Remove the "ReactOS.iso", "install.bat" and this "SVN-Readme.txt" file - Create a ZIP file "ReactOS-[VERSION]-REL-qemu.zip" containing this Modified: trunk/tools/VM-Templates/QEMU/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/boot.bat?r… ============================================================================== --- trunk/tools/VM-Templates/QEMU/boot.bat (original) +++ trunk/tools/VM-Templates/QEMU/boot.bat Fri Aug 31 18:36:09 2007 @@ -1,2 +1,3 @@ @echo off +cd files qemu -L . -m 128 -hda ReactOS.vmdk -serial file:CON Modified: trunk/tools/VM-Templates/QEMU/install.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/install.ba… ============================================================================== --- trunk/tools/VM-Templates/QEMU/install.bat (original) +++ trunk/tools/VM-Templates/QEMU/install.bat Fri Aug 31 18:36:09 2007 @@ -1,2 +1,3 @@ @echo off +cd files qemu -L . -m 128 -hda ReactOS.vmdk -cdrom ReactOS.iso -boot d

1 0

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

31 Aug '07

Author: greatlrd Date: Fri Aug 31 18:35:07 2007 New Revision: 28704 URL: http://svn.reactos.org/svn/reactos?rev=28704&view=rev Log: implement stub for NtGdiQueryFontAssocInfo 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 Fri Aug 31 18:35:07 2007 @@ -2854,3 +2854,16 @@ return FALSE; } + /* + * @unimplemented + */ +ULONG +STDCALL +NtGdiQueryFontAssocInfo( + IN HDC hdc +) +{ + 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 Fri Aug 31 18:35:07 2007 @@ -250,7 +250,7 @@ NtGdiPtInRegion 3 NtGdiPtVisible 3 NtGdiQueryFonts 3 -# NtGdiQueryFontAssocInfo 1 +NtGdiQueryFontAssocInfo 1 NtGdiRectangle 5 NtGdiRectInRegion 2 NtGdiRectVisible 2

1 0

[hpoussin] 28703: Fix boot
by hpoussin＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: hpoussin Date: Fri Aug 31 18:10:49 2007 New Revision: 28703 URL: http://svn.reactos.org/svn/reactos?rev=28703&view=rev Log: Fix boot Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Fri Aug 31 18:10:49 2007 @@ -244,7 +244,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState@8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAnAdmin() + 680 stdcall IsUserAnAdmin() 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 730 stdcall -noname RestartDialogEx(long wstr long long)

1 0

[cfinck] 28702: Enable serial output to console in the template for the QEMU package
by cfinck＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: cfinck Date: Fri Aug 31 17:10:24 2007 New Revision: 28702 URL: http://svn.reactos.org/svn/reactos?rev=28702&view=rev Log: Enable serial output to console in the template for the QEMU package Modified: trunk/tools/VM-Templates/QEMU/boot.bat Modified: trunk/tools/VM-Templates/QEMU/boot.bat URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/boot.bat?r… ============================================================================== --- trunk/tools/VM-Templates/QEMU/boot.bat (original) +++ trunk/tools/VM-Templates/QEMU/boot.bat Fri Aug 31 17:10:24 2007 @@ -1,2 +1,2 @@ @echo off -qemu -L . -m 128 -hda ReactOS.vmdk +qemu -L . -m 128 -hda ReactOS.vmdk -serial file:CON

1 0

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

31 Aug '07

Author: greatlrd Date: Fri Aug 31 16:32:40 2007 New Revision: 28701 URL: http://svn.reactos.org/svn/reactos?rev=28701&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 16:32:40 2007 @@ -117,6 +117,13 @@ GetBitmapBits@12 GetBitmapDimensionEx@8 GetBoundsRect@12 +GetCharWidthInfo@8 +GetColorAdjustment@8 +GetDCOrgEx@8 +GetDeviceGammaRamp@8 +GetEUDCTimeStamp@0 +GetEUDCTimeStampExW@4 +

1 0

[greatlrd] 28700: implement GetEUDCTimeStampExW but still unimplement in win32k
by greatlrd＠svn.reactos.org 31 Aug '07

31 Aug '07

Author: greatlrd Date: Fri Aug 31 16:16:45 2007 New Revision: 28700 URL: http://svn.reactos.org/svn/reactos?rev=28700&view=rev Log: implement GetEUDCTimeStampExW but still unimplement in win32k Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Aug 31 16:16:45 2007 @@ -262,15 +262,24 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL -GetEUDCTimeStampExW(LPCWSTR str) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetEUDCTimeStampExW(LPWSTR lpBaseFaceName) +{ + DWORD retValue = 0; + + if (!lpBaseFaceName) + { + retValue = NtGdiGetEudcTimeStampEx(NULL,0,FALSE); + } + else + { + retValue = NtGdiGetEudcTimeStampEx(lpBaseFaceName, wcslen(lpBaseFaceName), FALSE); + } + + return retValue; } /*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007