Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 24826: -fix a critical bug in SamGetUserSid "I wonder how this all has worked with this..." :o)
by janderwald＠svn.reactos.org 25 Nov '06

25 Nov '06

Author: janderwald Date: Sun Nov 26 01:46:03 2006 New Revision: 24826 URL: http://svn.reactos.org/svn/reactos?rev=24826&view=rev Log: -fix a critical bug in SamGetUserSid "I wonder how this all has worked with this..." :o) Modified: trunk/reactos/dll/win32/samlib/samlib.c Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c (original) +++ trunk/reactos/dll/win32/samlib/samlib.c Sun Nov 26 01:46:03 2006 @@ -556,7 +556,7 @@ } /* Open the user key */ - if (RegOpenKeyExW (hUserKey, + if (RegOpenKeyExW (hUsersKey, UserName, 0, KEY_READ,

1 0

[jimtabor] 24825: Example coding for Enhance Meta File and Meta DC implementation. - Add printing.c - Add a new CreateEnhMetaFileW
by jimtabor＠svn.reactos.org 25 Nov '06

25 Nov '06

Author: jimtabor Date: Sat Nov 25 23:21:22 2006 New Revision: 24825 URL: http://svn.reactos.org/svn/reactos?rev=24825&view=rev Log: Example coding for Enhance Meta File and Meta DC implementation. - Add printing.c - Add a new CreateEnhMetaFileW Added: trunk/reactos/dll/win32/gdi32/objects/painting.c (with props) Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Sat Nov 25 23:21:22 2006 @@ -131,6 +131,137 @@ return rc; } +#if 0 + +HDC WINAPI CreateEnhMetaFileW( + HDC hDC, /* [in] optional reference DC */ + LPCWSTR filename, /* [in] optional filename for disk metafiles */ + const RECT* rect, /* [in] optional bounding rectangle */ + LPCWSTR description /* [in] optional description */ + ) +{ + HDC mDC; + PDC_ATTR Dc_Attr; + PLDC pLDC; + HANDLE hFile; + PENHMETAFILE EmfDC; + DWORD size = 0, length = 0; + + mDC = NtGdiCreateMetafileDC( hDC ); // Basically changes the handle from 1xxxx to 46xxxx. + // If hDC == NULL, works just like createdc in win32k. + + if ( !GdiGetHandleUserData((HGDIOBJ) mDC, (PVOID) &Dc_Attr)) + { + SetLastError (ERROR_INVALID_PARAMETER); + return NULL; // need to delete the handle? + } + + pLDC = LocalAlloc(LMEM_ZEROINIT, sizeof(LDC)); + + Dc_Attr->pvLDC = pLDC; + pLDC->hDC = mDC; + pLDC->iType = LDC_EMFDC + + + if (description) + { /* App name\0Title\0\0 */ + length = lstrlenW(description); + length += lstrlenW(description + length + 1); + length += 3; + length *= 2; + } + + size = sizeof(ENHMETAFILE) + (length + 3) / 4 * 4; + + //Allocate ENHMETAFILE structure + EmfDC = LocalAlloc(LMEM_ZEROINIT, sizeof(ENHMETAFILE)); + pLDC->pvEmfDC = EmfDC; + + EmfDC->handles_size = HANDLE_LIST_INC; + EmfDC->cur_handles = 1; + + EmfDC->horzres = GetDeviceCaps(mDC, HORZRES); + EmfDC->vertres = GetDeviceCaps(mDC, VERTRES); + EmfDC->logpixelsx = GetDeviceCaps(mDC, LOGPIXELSX); + EmfDC->logpixelsy = GetDeviceCaps(mDC, LOGPIXELSY); + EmfDC->horzsize = GetDeviceCaps(mDC, HORZSIZE); + EmfDC->vertsize = GetDeviceCaps(mDC, VERTSIZE); + EmfDC->bitspixel = GetDeviceCaps(mDC, BITSPIXEL); + EmfDC->textcaps = GetDeviceCaps(mDC, TEXTCAPS); + EmfDC->rastercaps = GetDeviceCaps(mDC, RASTERCAPS); + EmfDC->technology = GetDeviceCaps(mDC, TECHNOLOGY); + EmfDC->planes = GetDeviceCaps(mDC, PLANES); + + EmfDC->emf = LocalAlloc(LMEM_ZEROINIT, size); + + EmfDC->emf->iType = EMR_HEADER; + EmfDC->emf->nSize = size; + + EmfDC->emf->rclBounds.left = EmfDC->emf->rclBounds.top = 0; + EmfDC->emf->rclBounds.right = EmfDC->emf->rclBounds.bottom = -1; + + if(rect) + { + EmfDC->emf->rclFrame.left = rect->left; + EmfDC->emf->rclFrame.top = rect->top; + EmfDC->emf->rclFrame.right = rect->right; + EmfDC->emf->rclFrame.bottom = rect->bottom; + } + else + { /* Set this to {0,0 - -1,-1} and update it at the end */ + EmfDC->emf->rclFrame.left = EmfDC->emf->rclFrame.top = 0; + EmfDC->emf->rclFrame.right = EmfDC->emf->rclFrame.bottom = -1; + } + + EmfDC->emf->dSignature = ENHMETA_SIGNATURE; + EmfDC->emf->nVersion = 0x10000; + EmfDC->emf->nBytes = pLDC->pvEmfDC->nSize; + EmfDC->emf->nRecords = 1; + EmfDC->emf->nHandles = 1; + + EmfDC->emf->sReserved = 0; /* According to docs, this is reserved and must be 0 */ + EmfDC->emf->nDescription = length / 2; + + EmfDC->emf->offDescription = length ? sizeof(ENHMETAHEADER) : 0; + + EmfDC->emf->nPalEntries = 0; /* I guess this should start at 0 */ + + /* Size in pixels */ + EmfDC->emf->szlDevice.cx = EmfDC->horzres; + EmfDC->emf->szlDevice.cy = EmfDC->vertres; + + /* Size in millimeters */ + EmfDC->emf->szlMillimeters.cx = EmfDC->horzsize; + EmfDC->emf->szlMillimeters.cy = EmfDC->vertsize; + + /* Size in micrometers */ + EmfDC->emf->szlMicrometers.cx = EmfDC->horzsize * 1000; + EmfDC->emf->szlMicrometers.cy = EmfDC->vertsize * 1000; + + RtlCopyMemory((char *)EmfDC->emf + sizeof(ENHMETAHEADER), description, length); + + if (filename) /* disk based metafile */ + { + if ((hFile = CreateFileW(filename, GENERIC_WRITE | GENERIC_READ, 0, + NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) + { + EMFDRV_DeleteDC( EmfDC ); + return NULL; + } + if (!WriteFile( hFile, (LPSTR)EmfDC->emf, size, NULL, NULL )) + { + EMFDRV_DeleteDC( EmfDC ); + return NULL; + } + EmfDC.hFile = hFile; + EmfDC->emf.iType = 2; + } + else + EmfDC->emf.iType = 1; + + return mDC; +} +#endif /* * @implemented Added: 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 (added) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Sat Nov 25 23:21:22 2006 @@ -1,0 +1,185 @@ +#include "precomp.h" + + +/* + * @unimplemented + */ +BOOL +STDCALL +NewArc( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) +// Call Wine (rewrite of) MFDRV_MetaParam8 + return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PDC_ATTR Dc_Attr; + PLDC pLDC; + GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr); + pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE) + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { +// Call Wine (rewrite of) EMFDRV_ArcChordPie + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC); + return Ret; + } + return FALSE; + } + } + return NtGdiArcInternal(GdiTypeArc, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +NewArcTo( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; //No meta support for ArcTo + else + { + PDC_ATTR Dc_Attr; + PLDC pLDC; + GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr); + pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE) + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO); + return Ret; + } + return FALSE; + } + } + return NtGdiArcInternal(GdiTypeArcTo, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +Chord( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PDC_ATTR Dc_Attr; + PLDC pLDC; + GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr); + pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE) + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD); + return Ret; + } + return FALSE; + } + } + return NtGdiArcInternal(GdiTypeChord, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} + + +/* + * @unimplemented + */ +BOOL +STDCALL +NewPie( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PDC_ATTR Dc_Attr; + PLDC pLDC; + GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr); + pLDC = Dc_Attr->pvLDC; + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE) + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE); + return Ret; + } + return FALSE; + } + } + return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} + + Propchange: trunk/reactos/dll/win32/gdi32/objects/painting.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 24824: get rid of some of vs warings when we are using our own objidl, it did forget #undef some interface
by greatlrd＠svn.reactos.org 25 Nov '06

25 Nov '06

Author: greatlrd Date: Sat Nov 25 17:43:29 2006 New Revision: 24824 URL: http://svn.reactos.org/svn/reactos?rev=24824&view=rev Log: get rid of some of vs warings when we are using our own objidl, it did forget #undef some interface Modified: trunk/reactos/include/psdk/objidl.h Modified: trunk/reactos/include/psdk/objidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/objidl.h (original) +++ trunk/reactos/include/psdk/objidl.h Sat Nov 25 17:43:29 2006 @@ -430,6 +430,7 @@ STDMETHOD(Read)(THIS_ void*,ULONG,ULONG*) PURE; STDMETHOD(Write)(THIS_ void const*,ULONG,ULONG*) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStream; #define INTERFACE IStream @@ -466,6 +467,7 @@ STDMETHOD(ReleaseMarshalData) (THIS_ IStream*) PURE; STDMETHOD(DisconnectObject) (THIS_ DWORD) PURE; }; +#undef INTERFACE EXTERN_C const IID IID_IStdMarshalInfo; #define INTERFACE IStdMarshalInfo

1 0

[greatlrd] 24823: update the def file
by greatlrd＠svn.reactos.org 25 Nov '06

25 Nov '06

Author: greatlrd Date: Sat Nov 25 16:45:36 2006 New Revision: 24823 URL: http://svn.reactos.org/svn/reactos?rev=24823&view=rev Log: update the def file Modified: trunk/reactos/dll/directx/ddraw/ddraw.def Modified: trunk/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.de… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.def (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.def Sat Nov 25 16:45:36 2006 @@ -4,21 +4,20 @@ ReleaseDDThreadLock@0 ;CompleteCreateSysmemSurface -;DDGetAttachedSurfaceLcl -;DDInternalLock -;DDInternalUnlock -;DSoundHelp +;DDGetAttachedSurfaceLcl@12 +;DDInternalLock@8 +;DDInternalUnlock@4 +;DSoundHelp@12 DirectDrawCreate@12 DirectDrawCreateClipper@12 DirectDrawCreateEx@16 DirectDrawEnumerateA@8 +DirectDrawEnumerateW@8 DirectDrawEnumerateExA@12 DirectDrawEnumerateExW@12 -DirectDrawEnumerateW@8 ;DllCanUnloadNow ;DllGetClassObject -;GetDDSurfaceLocal +;GetDDSurfaceLocal@12 ;GetOLEThunkData -;GetSurfaceFromDC +;GetSurfaceFromDC@12 ;RegisterSpecialCase -

1 0

[greatlrd] 24822: Update dejavu font from 2.10 to 2.12, see the change log for dejavu for more info Charter changes Sans Serif Sans Mono old : U+0180 Latin Extended-B 100% (208/208) 89% (187/208) 57% (119/208) update : U+0180 Latin Extended-B 100% (208/208) 90% (188/208) 57% (119/208) old : U+0400 Cyrillic 97% (249/255) 73% (188/255) 66% (170/255) update : U+0400 Cyrillic 98% (251/255) 74% (190/255) 66% (170/255) old : U+0500 Cyrillic Supplement 90% (18/20) (0/20) (0/20) update : U+0500 Cyrillic
by greatlrd＠svn.reactos.org 25 Nov '06

25 Nov '06

Author: greatlrd Date: Sat Nov 25 11:36:45 2006 New Revision: 24822 URL: http://svn.reactos.org/svn/reactos?rev=24822&view=rev Log: Update dejavu font from 2.10 to 2.12, see the change log for dejavu for more info Charter changes Sans Serif Sans Mono old : U+0180 Latin Extended-B 100% (208/208) 89% (187/208) 57% (119/208) update : U+0180 Latin Extended-B 100% (208/208) 90% (188/208) 57% (119/208) old : U+0400 Cyrillic 97% (249/255) 73% (188/255) 66% (170/255) update : U+0400 Cyrillic 98% (251/255) 74% (190/255) 66% (170/255) old : U+0500 Cyrillic Supplement 90% (18/20) (0/20) (0/20) update : U+0500 Cyrillic Supplement 100% (20/20) (0/20) (0/20) old : U+1400 Unified Canadian Aboriginal Syllabics (0/630) (0/630) (0/630) update : U+1400 Unified Canadian Aboriginal Syllabics 23% (150/630) (0/630) (0/630) old : U+2000 General Punctuation 82% (87/106) 44% (47/106) 37% (40/106) update : U+2000 General Punctuation 82% (87/106) 45% (48/106) 38% (41/106) old : U+2100 Letterlike Symbols 56% (45/79) 7% (6/79) 7% (6/79) update : U+2100 Letterlike Symbols 59% (47/79) 7% (6/79) 7% (6/79) old : U+2600 Miscellaneous Symbols 99% (175/176) 17% (30/176) 84% (149/176) update : U+2600 Miscellaneous Symbols 100% (176/176) 17% (30/176) 84% (149/176) Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansCondensed.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-ExtraLight.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Ext… Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansCond… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Ob… Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/DejaVuSerifCondensed.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerifCon… Modified: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Modified: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Modified: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Modified: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni…

1 0

[cwittich] 24821: add mingw, mingw-common and msvcrt libs where needed
by cwittich＠svn.reactos.org 24 Nov '06

24 Nov '06

Author: cwittich Date: Fri Nov 24 16:57:20 2006 New Revision: 24821 URL: http://svn.reactos.org/svn/reactos?rev=24821&view=rev Log: add mingw, mingw-common and msvcrt libs where needed Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Fri Nov 24 16:57:20 2006 @@ -96,6 +96,7 @@ for(size_t i = 0; i < ProjectNode.modules.size(); i++) { Module &module = *ProjectNode.modules[i]; + MingwAddImplicitLibraries( module ); _generate_cbproj ( module ); } } @@ -430,6 +431,22 @@ if ( !module.allowWarnings ) compiler_flags.push_back ( "-Werror" ); + + ///* implicit libraries */ + //libraries.push_back ( "mingw_common" ); + //libpaths.push_back ( module.project.LocateModule("mingw_common") ); + + //if ( !Module.IsDll ) + //{ + // libraries.push_back ( "%s", module.isUnicode ? "mingw_wmain" : "mingw_main" ); + // libpaths.push_back ( module.project.LocateModule("%s"), module.isUnicode ? "mingw_wmain" : "mingw_main" ); + //} + + //if ( module.name != "msvcrt" ) + //{ + // libraries.push_back ( "msvcrt" ); + // libpaths.push_back ( module.project.LocateModule("msvcrt") ); + //} FILE* OUT = fopen ( cbproj_file.c_str(), "wb" ); @@ -569,7 +586,6 @@ if ( dll ) fprintf ( OUT, "\t\t\t\t\t<Add option=\"%s.temp.exp\" />\r\n", module.name.c_str() ); - /* libraries */ for ( i = 0; i < libraries.size(); i++ ) @@ -587,7 +603,7 @@ if ( dll ) { fprintf ( OUT, "\t\t\t\t<ExtraCommands>\r\n" ); - fprintf ( OUT, "<Add before=\"dlltool --dllname %s.%s --def %s.def --output-exp %s.temp.exp --kill-at\" />\r\n", module.name.c_str(), module_type.c_str(), module.name.c_str(), module.name.c_str() ); + fprintf ( OUT, "<Add before=\"dlltool --dllname %s%s --def %s.def --output-exp %s.temp.exp --kill-at\" />\r\n", module.name.c_str(), module_type.c_str(), module.name.c_str(), module.name.c_str() ); #ifdef WIN32 fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del %s.temp.exp 2>NUL\" />\r\n", module.name.c_str() ); #else @@ -715,3 +731,33 @@ } return lflags; } + +void +CBBackend::MingwAddImplicitLibraries( Module &module ) +{ + Library* pLibrary; + + if ( !module.isDefaultEntryPoint ) + return; + + if ( module.IsDLL () ) + { + //pLibrary = new Library ( module, "__mingw_dllmain" ); + //module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); + } + else + { + pLibrary = new Library ( module, module.isUnicode ? "mingw_wmain" : "mingw_main" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); + } + + pLibrary = new Library ( module, "mingw_common" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() + 1, pLibrary ); + + if ( module.name != "msvcrt" ) + { + // always link in msvcrt to get the basic routines + pLibrary = new Library ( module, "msvcrt" ); + module.non_if_data.libraries.push_back ( pLibrary ); + } +} Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Fri Nov 24 16:57:20 2006 @@ -73,6 +73,7 @@ std::string LayoutFileName ( const Module& module ) const; std::string DependFileName ( const Module& module ) const; std::string GenerateProjectLinkerFlags () const; + void MingwAddImplicitLibraries( Module &module ); std::vector<CBConfiguration*> m_configurations; std::vector<FileUnit> m_fileUnits; @@ -97,5 +98,6 @@ const Property* _lookup_property ( const Module& module, const std::string& name ) const; }; + #endif // __MSVC_H__

1 0

[cwittich] 24820: -added cpl applet debugging support -added naive target support (custom C::B version needed atm) -handle linker options like baseaddress, entrypoint, stdlib and alignment -use def files when linking dlls
by cwittich＠svn.reactos.org 24 Nov '06

24 Nov '06

Author: cwittich Date: Fri Nov 24 13:46:14 2006 New Revision: 24820 URL: http://svn.reactos.org/svn/reactos?rev=24820&view=rev Log: -added cpl applet debugging support -added naive target support (custom C::B version needed atm) -handle linker options like baseaddress, entrypoint, stdlib and alignment -use def files when linking dlls Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Fri Nov 24 13:46:14 2006 @@ -325,6 +325,9 @@ string module_type = GetExtension(module.GetTargetName()); string cbproj_path = module.GetBasePath(); string CompilerVar; + string baseaddr; + string project_linker_flags = "-Wl,--enable-stdcall-fixup "; + project_linker_flags += GenerateProjectLinkerFlags(); bool lib = (module.type == ObjectLibrary) || (module.type == RpcClient) ||(module.type == RpcServer) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); @@ -417,6 +420,12 @@ vars.push_back( variables[i]->name ); values.push_back( variables[i]->value ); }*/ + for ( i = 0; i < data.properties.size(); i++ ) + { + Property& prop = *data.properties[i]; + if ( strstr ( module.baseaddress.c_str(), prop.name.c_str() ) ) + baseaddr = prop.value; + } } if ( !module.allowWarnings ) @@ -458,13 +467,13 @@ else if ( dll ) fprintf ( OUT, "\t\t\t\t<Option type=\"3\" />\r\n" ); else if ( sys ) - fprintf ( OUT, "\t\t\t\t<Option type=\"?\" />\r\n" ); /*FIXME*/ + fprintf ( OUT, "\t\t\t\t<Option type=\"4\" />\r\n" ); else if ( exe ) { if ( module.type == Kernel ) - fprintf ( OUT, "\t\t\t\t<Option type=\"?\" />\r\n" ); /*FIXME*/ + fprintf ( OUT, "\t\t\t\t<Option type=\"4\" />\r\n" ); else if ( module.type == NativeCUI ) - fprintf ( OUT, "\t\t\t\t<Option type=\"?\" />\r\n" ); /*FIXME*/ + fprintf ( OUT, "\t\t\t\t<Option type=\"4\" />\r\n" ); else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR) { if ( console ) @@ -474,8 +483,16 @@ } } - fprintf ( OUT, "\t\t\t\t<Option compiler=\"gcc\" />\r\n" ); + if ( module_type == ".cpl" ) + { + if ( configuration.UseConfigurationInPath ) + fprintf ( OUT, "\t\t\t\t<Option parameters=\"shell32,Control_RunDLL "%s\\%s%s\\%s%s",@\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str() ); + else + fprintf ( OUT, "\t\t\t\t<Option parameters=\"shell32,Control_RunDLL "%s\\%s\\%s%s",@\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), module.name.c_str(), module_type.c_str() ); + + fprintf ( OUT, "\t\t\t\t<Option host_application=\"rundll32.exe\" />\r\n" ); + } fprintf ( OUT, "\t\t\t\t<Compiler>\r\n" ); bool debug = ( cfg.optimization == Debug ); @@ -512,9 +529,49 @@ fprintf ( OUT, "\t\t\t\t\t<Add directory=\"%s\" />\r\n", include.c_str() ); } fprintf ( OUT, "\t\t\t\t</ResourceCompiler>\r\n" ); + + fprintf ( OUT, "\t\t\t\t<Linker>\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"%s\" />\r\n", project_linker_flags.c_str() ); + + if ( sys ) + { + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--entry,%s%s\" />\r\n", "_", module.GetEntryPoint(false) == "" ? "DriverEntry@8" : module.GetEntryPoint(false).c_str ()); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--image-base,%s\" />\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str () ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-nostartfiles -nostdlib\" />\r\n" ); + } + else if ( exe ) + { + if ( module.type == Kernel ) + { + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--entry,_KiSystemStartup\" />\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--image-base,%s\" />\r\n", baseaddr.c_str () ); + } + else if ( module.type == NativeCUI ) + { + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--entry,_NtProcessStartup@4\" />\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--image-base,%s\" />\r\n", baseaddr.c_str () ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-nostartfiles -nostdlib\" />\r\n" ); + } + else + { + fprintf ( OUT, "\t\t\t\t\t<Add option=\"%s\" />\r\n", module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc" ); + } + } + else if ( dll ) + { + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--entry,%s%s\" />\r\n", "_", module.GetEntryPoint(false).c_str () ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--image-base,%s\" />\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str () ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"%s\" />\r\n", module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc" ); + } + + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--file-alignment,0x1000\" />\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Add option=\"-Wl,--section-alignment,0x1000\" />\r\n" ); + + if ( dll ) + fprintf ( OUT, "\t\t\t\t\t<Add option=\"%s.temp.exp\" />\r\n", module.name.c_str() ); + /* libraries */ - fprintf ( OUT, "\t\t\t\t<Linker>\r\n" ); for ( i = 0; i < libraries.size(); i++ ) { const string& lib = libraries[i]; @@ -526,6 +583,20 @@ fprintf ( OUT, "\t\t\t\t\t<Add directory=\"%s\" />\r\n", lib.c_str() ); } fprintf ( OUT, "\t\t\t\t</Linker>\r\n" ); + + if ( dll ) + { + fprintf ( OUT, "\t\t\t\t<ExtraCommands>\r\n" ); + fprintf ( OUT, "<Add before=\"dlltool --dllname %s.%s --def %s.def --output-exp %s.temp.exp --kill-at\" />\r\n", module.name.c_str(), module_type.c_str(), module.name.c_str(), module.name.c_str() ); +#ifdef WIN32 + fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del %s.temp.exp 2>NUL\" />\r\n", module.name.c_str() ); +#else + fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm %s.temp.exp 2>/dev/null\" />\r\n", module.name.c_str() ); +#endif + fprintf ( OUT, "\t\t\t\t\t<Mode after=\"always\" />\r\n" ); + + fprintf ( OUT, "\t\t\t\t</ExtraCommands>\r\n" ); + } fprintf ( OUT, "\t\t\t</Target>\r\n" ); @@ -631,3 +702,16 @@ return string1; } +std::string +CBBackend::GenerateProjectLinkerFlags() const +{ + std::string lflags; + for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ ) + { + LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i]; + if ( lflags.length () > 0 ) + lflags += " "; + lflags += linkerFlag.flag; + } + return lflags; +} Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Fri Nov 24 13:46:14 2006 @@ -72,7 +72,7 @@ std::string CbpFileName ( const Module& module ) const; std::string LayoutFileName ( const Module& module ) const; std::string DependFileName ( const Module& module ) const; - + std::string GenerateProjectLinkerFlags () const; std::vector<CBConfiguration*> m_configurations; std::vector<FileUnit> m_fileUnits;

1 0

[jimtabor] 24819: Add Enhanced Meta File header pointer to local DC structure.
by jimtabor＠svn.reactos.org 24 Nov '06

24 Nov '06

Author: jimtabor Date: Fri Nov 24 11:53:59 2006 New Revision: 24819 URL: http://svn.reactos.org/svn/reactos?rev=24819&view=rev Log: Add Enhanced Meta File header pointer to local DC structure. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Fri Nov 24 11:53:59 2006 @@ -119,6 +119,7 @@ HDC hDC; ULONG Flags; INT iType; + PVOID pEmfDC; /* Pointer to ENHMETAHEADER structure */ ABORTPROC pAbortProc; /* AbortProc for Printing */ } LDC, *PLDC;

1 0

[martinf] 24818: update TODO lisi
by martinf＠svn.reactos.org 24 Nov '06

24 Nov '06

Author: martinf Date: Fri Nov 24 10:21:29 2006 New Revision: 24818 URL: http://svn.reactos.org/svn/reactos?rev=24818&view=rev Log: update TODO lisi Modified: trunk/reactos/base/shell/explorer/doc/TODO.txt trunk/reactos/base/shell/explorer/makearchive.bat Modified: trunk/reactos/base/shell/explorer/doc/TODO.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/doc/TO… ============================================================================== --- trunk/reactos/base/shell/explorer/doc/TODO.txt (original) +++ trunk/reactos/base/shell/explorer/doc/TODO.txt Fri Nov 24 10:21:29 2006 @@ -1,3 +1,4 @@ +- Combobox to switch the second input field between "Filter" and "Command" - rewrite autostart code and include all possible autostart locations - read "DESCRIPT.ION" files to display file descriptions - detect display mode changes and adjust desktop bar size @@ -32,3 +33,17 @@ <m-fuchs> tinus: we should think about installing some default shell extensions <tinus_> m-fuchs: perhaps, but it'd be nice if they actually were shell extensions +- ShellBrowser: Probleme mit TVIF_CHILDREN (in der dritten Ebene?) + + +> The nits: +> * the MDI file manager top window does not seem to be aware of the scroll-wheel +> * the task bar clock color seems to be hard-coded, and so does not show +> with the High Contrast color. Several other places have similar issues +> * there's no quick launch +> * the desktop lacks much functionality, including the ability to arrange icons +> * there are no startmenu settings/it does not heed the MS explorer ones + +> Is there some means of transferring applications across desktops? +> What about (configurable) key combos to cycle/change desktops? + Modified: trunk/reactos/base/shell/explorer/makearchive.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/makear… ============================================================================== --- trunk/reactos/base/shell/explorer/makearchive.bat (original) +++ trunk/reactos/base/shell/explorer/makearchive.bat Fri Nov 24 10:21:29 2006 @@ -1,5 +1,5 @@ set MAKE=mingw32-make.exe -set TARGET=D:\html\newhome\explorer +set TARGET=E:\html\newhome\explorer rm explorer-ansi.exe %MAKE% -f Makefile-precomp clean all UNICODE=0

1 0

[greatlrd] 24817: adding new ddraw.h header. we are delete wine ddraw.h header and using my header I wrote instead.
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Fri Nov 24 00:49:29 2006 New Revision: 24817 URL: http://svn.reactos.org/svn/reactos?rev=24817&view=rev Log: adding new ddraw.h header. we are delete wine ddraw.h header and using my header I wrote instead. Modified: trunk/reactos/include/psdk/ddraw.h trunk/reactos/subsystems/win32/win32k/include/intddraw.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=2… Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…

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