Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[jimtabor] 26593: Win32k/Gdi32 - Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 19:33:35 2007 New Revision: 26593 URL: http://svn.reactos.org/svn/reactos?rev=26593&view=rev Log: Win32k/Gdi32 - Remove NtGdiCreateFont/Indirect, and NtGdiGetOutlineTextMetrics. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 19:33:35 2007 @@ -49,31 +49,6 @@ DWORD FontType; } FONTFAMILYINFO, *PFONTFAMILYINFO; -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFontIndirect(CONST LPLOGFONTW lf); - -/* Should be using NtGdiHfontCreate with an ENUMLOGFONT */ -HFONT -NTAPI -NtGdiCreateFont( - int Height, - int Width, - int Escapement, - int Orientation, - int Weight, - DWORD Italic, - DWORD Underline, - DWORD StrikeOut, - DWORD CharSet, - DWORD OutputPrecision, - DWORD ClipPrecision, - DWORD Quality, - DWORD PitchAndFamily, - LPCWSTR Face -); - /* Should be using NtGdiEnumFontChunk */ INT NTAPI @@ -620,13 +595,6 @@ HDC hDC, HRGN hrgn ); - -/* Use NtGdiGetOutlineTextMetricsInternalW. */ -UINT -STDCALL -NtGdiGetOutlineTextMetrics(HDC hDC, - UINT Data, - LPOUTLINETEXTMETRICW otm); /* Use NtGdiDoPalette with GdiPalGetEntries. */ UINT Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Apr 30 19:33:35 2007 @@ -522,86 +522,6 @@ return Status; } - -HFONT -STDCALL -NtGdiCreateFont(int Height, - int Width, - int Escapement, - int Orientation, - int Weight, - DWORD Italic, - DWORD Underline, - DWORD StrikeOut, - DWORD CharSet, - DWORD OutputPrecision, - DWORD ClipPrecision, - DWORD Quality, - DWORD PitchAndFamily, - LPCWSTR Face) -{ - LOGFONTW logfont; - HFONT NewFont; - NTSTATUS Status = STATUS_SUCCESS; - - logfont.lfHeight = Height; - logfont.lfWidth = Width; - logfont.lfEscapement = Escapement; - logfont.lfOrientation = Orientation; - logfont.lfWeight = Weight; - logfont.lfItalic = Italic; - logfont.lfUnderline = Underline; - logfont.lfStrikeOut = StrikeOut; - logfont.lfCharSet = CharSet; - logfont.lfOutPrecision = OutputPrecision; - logfont.lfClipPrecision = ClipPrecision; - logfont.lfQuality = Quality; - logfont.lfPitchAndFamily = PitchAndFamily; - - if (NULL != Face) - { - int Size = sizeof(logfont.lfFaceName) / sizeof(WCHAR); - wcsncpy((wchar_t *)logfont.lfFaceName, Face, Size - 1); - /* Be 101% sure to have '\0' at end of string */ - logfont.lfFaceName[Size - 1] = '\0'; - } - else - { - logfont.lfFaceName[0] = L'\0'; - } - - if (NT_SUCCESS(Status)) - { - Status = TextIntCreateFontIndirect(&logfont, &NewFont); - } - - return NT_SUCCESS(Status) ? NewFont : NULL; -} - -HFONT -STDCALL -NtGdiCreateFontIndirect(CONST LPLOGFONTW lf) -{ - LOGFONTW SafeLogfont; - HFONT NewFont; - NTSTATUS Status = STATUS_SUCCESS; - - if (NULL != lf) - { - Status = MmCopyFromCaller(&SafeLogfont, lf, sizeof(LOGFONTW)); - if (NT_SUCCESS(Status)) - { - Status = TextIntCreateFontIndirect(&SafeLogfont, &NewFont); - } - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - - return NT_SUCCESS(Status) ? NewFont : NULL; -} - HFONT STDCALL

1 0

[hpoussin] 26592: Rename msacm directory to msacm32
by hpoussin＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: hpoussin Date: Mon Apr 30 19:25:51 2007 New Revision: 26592 URL: http://svn.reactos.org/svn/reactos?rev=26592&view=rev Log: Rename msacm directory to msacm32 Added: trunk/reactos/dll/win32/msacm32/ - copied from r26534, trunk/reactos/dll/win32/msacm/ Removed: trunk/reactos/dll/win32/msacm/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/ole32/ (props changed) trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Apr 30 19:25:51 2007 @@ -176,7 +176,7 @@ dll\win32\winmm\midimap\midimap.dll 1 dll\win32\mmdrv\mmdrv.dll 1 dll\win32\mpr\mpr.dll 1 -dll\win32\msacm\msacm32.dll 1 +dll\win32\msacm32\msacm32.dll 1 dll\win32\msafd\msafd.dll 1 dll\win32\msgina\msgina.dll 1 dll\win32\msi\msi.dll 1 Propchange: trunk/reactos/dll/win32/ole32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Apr 30 19:25:51 2007 @@ -12,3 +12,4 @@ GNUmakefile *.vcproj *.user +dcom.h Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Apr 30 19:25:51 2007 @@ -118,8 +118,8 @@ <directory name="mpr"> <xi:include href="mpr/mpr.rbuild" /> </directory> -<directory name="msacm"> - <xi:include href="msacm/msacm32.rbuild" /> +<directory name="msacm32"> + <xi:include href="msacm32/msacm32.rbuild" /> </directory> <directory name="msafd"> <xi:include href="msafd/msafd.rbuild" />

1 0

[jimtabor] 26591: Win32k/Gdi32 - Remove NtGdiCreateD/IC, it served us well. - Add a note to NtGdiCreateEnhMetaFile.
by jimtabor＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: jimtabor Date: Mon Apr 30 18:33:10 2007 New Revision: 26591 URL: http://svn.reactos.org/svn/reactos?rev=26591&view=rev Log: Win32k/Gdi32 - Remove NtGdiCreateD/IC, it served us well. - Add a note to NtGdiCreateEnhMetaFile. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Apr 30 18:33:10 2007 @@ -127,25 +127,6 @@ LPINT Buffer ); -/* Use NtGdiOpenDCW */ -HDC -NTAPI -NtGdiCreateDC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData -); - -HDC -NTAPI -NtGdiCreateIC( - PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW DevMode -); - /* Use NtGdiAddFontResourceW */ int STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Apr 30 18:33:10 2007 @@ -930,136 +930,6 @@ } return hNewDC; -} - -HDC STDCALL -NtGdiCreateDC(PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData) -{ - UNICODE_STRING SafeDriver, SafeDevice; - DEVMODEW SafeInitData; - HDC Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if(InitData) - { - _SEH_TRY - { - ProbeForRead(InitData, - sizeof(DEVMODEW), - 1); - RtlCopyMemory(&SafeInitData, - InitData, - sizeof(DEVMODEW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - /* FIXME - InitData can have some more bytes! */ - } - - if(Driver) - { - Status = IntSafeCopyUnicodeString(&SafeDriver, Driver); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - } - - if(Device) - { - Status = IntSafeCopyUnicodeString(&SafeDevice, Device); - if(!NT_SUCCESS(Status)) - { - /* FIXME workaround for a real bug */ - // RtlFreeUnicodeString(&SafeDriver); - // SetLastNtError(Status); - // DPRINT1("fail3\n"); - // return NULL; - Device = NULL; - } - } - - Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, - NULL == Device ? NULL : &SafeDevice, NULL, - NULL == InitData ? NULL : &SafeInitData, FALSE); - - return Ret; -} - -HDC STDCALL -NtGdiCreateIC(PUNICODE_STRING Driver, - PUNICODE_STRING Device, - PUNICODE_STRING Output, - CONST PDEVMODEW InitData) -{ - UNICODE_STRING SafeDriver, SafeDevice; - DEVMODEW SafeInitData; - HDC Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if(InitData) - { - _SEH_TRY - { - ProbeForRead(InitData, - sizeof(DEVMODEW), - 1); - RtlCopyMemory(&SafeInitData, - InitData, - sizeof(DEVMODEW)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - /* FIXME - InitData can have some more bytes! */ - } - - if(Driver) - { - Status = IntSafeCopyUnicodeString(&SafeDriver, Driver); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return NULL; - } - } - - if(Device) - { - Status = IntSafeCopyUnicodeString(&SafeDevice, Device); - if(!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&SafeDriver); - SetLastNtError(Status); - return NULL; - } - } - - Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver, - NULL == Device ? NULL : &SafeDevice, NULL, - NULL == InitData ? NULL : &SafeInitData, TRUE); - - return Ret; } HDC STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/metafile.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/metafile.c Mon Apr 30 18:33:10 2007 @@ -280,7 +280,11 @@ UNIMPLEMENTED; return 0; } - +// +// +// Rewrite is in progress, this function is subject to change at any time. +// 04/30/2007 +// HDC STDCALL NtGdiCreateEnhMetaFile(HDC hDCRef, @@ -301,8 +305,15 @@ * Shall we create hdc NtGdiHdcCompatible hdc ?? */ UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - tempHDC = NtGdiCreateDC(&DriverName, NULL, NULL, NULL); //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + RtlInitUnicodeString(&DriverName, L"DISPLAY"); + //IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + tempHDC = NtGdiOpenDCW( &DriverName, + NULL, + NULL, + 0, // DCW 0 and ICW 1. + NULL, + (PVOID) NULL, + (PVOID) NULL ); } GDIOBJ_SetOwnership(GdiHandleTable, tempHDC, PsGetCurrentProcess()); Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Apr 30 18:33:10 2007 @@ -25,7 +25,6 @@ NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 -NtGdiCreateDC 4 NtGdiCreateDIBitmap 6 NtGdiCreateDIBBrush 6 NtGdiCreateDIBSection 9 @@ -35,7 +34,6 @@ NtGdiCreateEnhMetaFile 4 NtGdiCreateHalftonePalette 1 NtGdiCreateHatchBrushInternal 3 -NtGdiCreateIC 4 NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 NtGdiCreatePatternBrushInternal 3

1 0

[cwittich] 26590: add a FORCE_CPP condition to the C::B backend - sometimes the g++ compiler finds some errors in the C code which cc doesn't
by cwittich＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: cwittich Date: Mon Apr 30 16:01:14 2007 New Revision: 26590 URL: http://svn.reactos.org/svn/reactos?rev=26590&view=rev Log: add a FORCE_CPP condition to the C::B backend - sometimes the g++ compiler finds some errors in the C code which cc doesn't Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp 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 Mon Apr 30 16:01:14 2007 @@ -703,10 +703,14 @@ fprintf ( OUT, "\t\t</Build>\r\n" ); +#ifdef FORCE_CPP + CompilerVar = "CPP" +#else if ( module.cplusplus ) CompilerVar = "CPP"; else CompilerVar = "CC"; +#endif /* header files */ for ( i = 0; i < header_files.size(); i++ )

1 0

[ekohl] 26589: Remove "Properties for" from caption.
by ekohl＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: ekohl Date: Mon Apr 30 15:22:07 2007 New Revision: 26589 URL: http://svn.reactos.org/svn/reactos?rev=26589&view=rev Log: Remove "Properties for" from caption. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Mon Apr 30 15:22:07 2007 @@ -273,7 +273,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPSHEETPAGE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM));

1 0

[tkreuzer] 26588: - Add Alex' test for GetObject (word alignment check) - change TEST macro a little for better output
by tkreuzer＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: tkreuzer Date: Mon Apr 30 14:44:18 2007 New Revision: 26588 URL: http://svn.reactos.org/svn/reactos?rev=26588&view=rev Log: - Add Alex' test for GetObject (word alignment check) - change TEST macro a little for better output Modified: trunk/rostests/win32/gdi32/gditest.h trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c trunk/rostests/win32/gdi32/tests/CreatePen.c trunk/rostests/win32/gdi32/tests/GetObject.c trunk/rostests/win32/gdi32/tests/GetStockObject.c trunk/rostests/win32/gdi32/tests/SelectObject.c trunk/rostests/win32/gdi32/tests/SetDCPenColor.c trunk/rostests/win32/gdi32/tests/SetSysColors.c Modified: trunk/rostests/win32/gdi32/gditest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/gditest.h?rev… ============================================================================== --- trunk/rostests/win32/gdi32/gditest.h (original) +++ trunk/rostests/win32/gdi32/gditest.h Mon Apr 30 14:44:18 2007 @@ -16,7 +16,7 @@ (*passed)++;\ } else {\ (*failed)++;\ - printf("Test failed in file %s line %d\n", __FILE__, __LINE__);\ + printf("Test failed in %s:%d (%s)\n", __FILE__, __LINE__, #x);\ }; #define GDI_HANDLE_INDEX_MASK 0x00003fff // (GDI_HANDLE_COUNT - 1) Modified: trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c (original) +++ trunk/rostests/win32/gdi32/tests/CreateCompatibleDC.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "CreateCompatibleDC.c" + #include "..\gditest.h" BOOL Test_CreateCompatibleDC(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/CreateP… ============================================================================== --- trunk/rostests/win32/gdi32/tests/CreatePen.c (original) +++ trunk/rostests/win32/gdi32/tests/CreatePen.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "CreatePen.c" + #include "..\gditest.h" BOOL Modified: trunk/rostests/win32/gdi32/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetObje… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetObject.c Mon Apr 30 14:44:18 2007 @@ -1,8 +1,18 @@ +#line 1 "GetObject.c" + #include "..\gditest.h" BOOL Test_General(INT* passed, INT* failed) { + struct + { + LOGBRUSH logbrush; + BYTE additional[5]; + } TestStruct; + PLOGBRUSH plogbrush; + HBRUSH hBrush; + /* Test null pointer and invalid handles */ SetLastError(ERROR_SUCCESS); TEST(GetObjectA(0, 0, NULL) == 0); @@ -40,6 +50,15 @@ SetLastError(ERROR_SUCCESS); TEST(GetObjectW((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0); TEST(GetLastError() == ERROR_INVALID_HANDLE); + + /* Test need of alignment */ + hBrush = GetStockObject(WHITE_BRUSH); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH)); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 2); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH)); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 1); + TEST(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0); return TRUE; } @@ -383,7 +402,7 @@ TEST(GetLastError() == ERROR_INVALID_HANDLE); DeleteObject(hRgn); - Test_Font(passed, failed); +// Test_Font(passed, failed); Test_Colorspace(passed, failed); Test_General(passed, failed); Test_Bitmap(passed, failed); @@ -391,7 +410,7 @@ Test_Palette(passed, failed); Test_Brush(passed, failed); Test_Pen(passed, failed); -// Test_ExtPpen(passed, failed); // not implemented yet in ROS +// Test_ExtPen(passed, failed); // not implemented yet in ROS Test_MetaDC(passed, failed); return TRUE; Modified: trunk/rostests/win32/gdi32/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/GetStoc… ============================================================================== --- trunk/rostests/win32/gdi32/tests/GetStockObject.c (original) +++ trunk/rostests/win32/gdi32/tests/GetStockObject.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "GetStockObject.c" + #include "..\gditest.h" BOOL Test_GetStockObject(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SelectO… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SelectObject.c (original) +++ trunk/rostests/win32/gdi32/tests/SelectObject.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SelectObject.c" + #include "..\gditest.h" BOOL Test_SelectObject(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetDCPe… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetDCPenColor.c (original) +++ trunk/rostests/win32/gdi32/tests/SetDCPenColor.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SetDCPenColor.c" + #include "..\gditest.h" BOOL Test_SetDCPenColor(INT* passed, INT* failed) Modified: trunk/rostests/win32/gdi32/tests/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/gdi32/tests/SetSysC… ============================================================================== --- trunk/rostests/win32/gdi32/tests/SetSysColors.c (original) +++ trunk/rostests/win32/gdi32/tests/SetSysColors.c Mon Apr 30 14:44:18 2007 @@ -1,3 +1,5 @@ +#line 1 "SetSysColors.c" + #include "..\gditest.h" #define NUM_SYSCOLORS 31

1 0

[tkreuzer] 26587: Sorry Alex, my fault. NtGdiExtGetObjectW *does* need a WORD alignment.
by tkreuzer＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: tkreuzer Date: Mon Apr 30 13:33:11 2007 New Revision: 26587 URL: http://svn.reactos.org/svn/reactos?rev=26587&view=rev Log: Sorry Alex, my fault. NtGdiExtGetObjectW *does* need a WORD alignment. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Apr 30 13:33:11 2007 @@ -1888,7 +1888,7 @@ _SEH_TRY { // Probe the buffer and copy it - ProbeForWrite(lpBuffer, cbCopyCount, 1); + ProbeForWrite(lpBuffer, cbCopyCount, sizeof(WORD)); RtlCopyMemory(lpBuffer, &Object, cbCopyCount); } _SEH_HANDLE

1 0

[gedmurphy] 26586: move rbuild project back to 7.1
by gedmurphy＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: gedmurphy Date: Mon Apr 30 12:58:53 2007 New Revision: 26586 URL: http://svn.reactos.org/svn/reactos?rev=26586&view=rev Log: move rbuild project back to 7.1 Modified: trunk/reactos/tools/rbuild/rbuild.sln trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.sln?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.sln (original) +++ trunk/reactos/tools/rbuild/rbuild.sln Mon Apr 30 12:58:53 2007 @@ -1,19 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.ActiveCfg = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug|Win32.Build.0 = Debug|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.ActiveCfg = Release|Win32 - {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release|Win32.Build.0 = Release|Win32 + GlobalSection(ProjectConfiguration) = postSolution + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.ActiveCfg = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Debug.Build.0 = Debug|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.ActiveCfg = Release|Win32 + {D9305AFB-499E-49F1-A865-99DD7E19E762}.Release.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Mon Apr 30 12:58:53 2007 @@ -1,195 +1,132 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="7.10" Name="rbuild" - ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" - > + SccProjectName="" + SccLocalPath=""> <Platforms> <Platform - Name="Win32" - /> + Name="Win32"/> </Platforms> - <ToolFiles> - </ToolFiles> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\Release" IntermediateDirectory=".\Release" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Release/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" + StringPooling="TRUE" + RuntimeLibrary="4" + EnableFunctionLevelLinking="TRUE" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Release/rbuild.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" WarningLevel="3" - SuppressStartupBanner="true" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Release/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\Release/rbuild.pdb" SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Release/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/rbuild.tlb" - HeaderFileName="" - /> + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" + RuntimeLibrary="5" + UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" - SuppressStartupBanner="true" + SuppressStartupBanner="TRUE" DebugInformationFormat="4" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1033" - /> - <Tool - Name="VCPreLinkEventTool" - /> + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Debug/rbuild.exe" LinkIncremental="1" - SuppressStartupBanner="true" - GenerateDebugInformation="true" + SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/rbuild.pdb" SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> + TargetMachine="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/rbuild.tlb" + HeaderFileName=""/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> @@ -197,1094 +134,872 @@ <Files> <Filter Name="backends" - > + Filter=""> <Filter Name="devcpp" - > - <File - RelativePath="backend\devcpp\devcpp.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\devcpp\devcpp.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\devcpp\devcpp.h" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\devcpp\devcpp.h"> </File> </Filter> <Filter Name="msvc" - > - <File - RelativePath="backend\msvc\genguid.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\msvc\genguid.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\msvc.h" - > - </File> - <File - RelativePath="backend\msvc\msvcmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\msvc.h"> + </File> + <File + RelativePath="backend\msvc\msvcmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\msvc\vcprojmaker.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\msvc\vcprojmaker.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="mingw" - > - <File - RelativePath="backend\mingw\mingw.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\mingw\mingw.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\mingw.h" - > - </File> - <File - RelativePath="backend\mingw\modulehandler.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\mingw.h"> + </File> + <File + RelativePath="backend\mingw\modulehandler.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="backend\mingw\modulehandler.h" - > - </File> - <File - RelativePath="backend\mingw\pch_detection.h" - > - </File> - <File - RelativePath="backend\mingw\proxymakefile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="backend\mingw\modulehandler.h"> + </File> + <File + RelativePath="backend\mingw\pch_detection.h"> + </File> + <File + RelativePath="backend\mingw\proxymakefile.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_sources" - > - <File - RelativePath="backend\backend.cpp" - > - <FileConfiguration - Name="Release|Win32" - > + Filter=""> + <File + RelativePath="backend\backend.cpp"> + <FileConfiguration + Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="backend_headers" - > - <File - RelativePath="backend\backend.h" - > + Filter=""> + <File + RelativePath="backend\backend.h"> </File> </Filter> </Filter> <Filter Name="rbuild_sources" - > - <File - RelativePath="automaticdependency.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="bootstrap.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="cdfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunit.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilationunitsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="compilerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="configuration.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="define.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="directory.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="exception.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="filesupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="global.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="include.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="installfile.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerflag.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="linkerscript.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="module.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="project.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="rbuild.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="stubbedcomponent.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="syssetupgenerator.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="testsupportcode.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="wineresource.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + Filter=""> + <File + RelativePath="automaticdependency.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="bootstrap.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="cdfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunit.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilationunitsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="compilerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="configuration.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="define.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="directory.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="exception.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="filesupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="global.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="include.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="installfile.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerflag.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="linkerscript.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="module.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="project.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="rbuild.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="stubbedcomponent.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="syssetupgenerator.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="testsupportcode.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="wineresource.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="rbuild_headers" - > - <File - RelativePath="exception.h" - > - </File> - <File - RelativePath="pch.h" - > - </File> - <File - RelativePath="rbuild.h" - > - </File> - <File - RelativePath="test.h" - > + Filter=""> + <File + RelativePath="exception.h"> + </File> + <File + RelativePath="pch.h"> + </File> + <File + RelativePath="rbuild.h"> + </File> + <File + RelativePath="test.h"> </File> </Filter> <Filter Name="inflib" - > - <File - RelativePath="..\..\lib\inflib\builddep.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcommon.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infcore.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhost.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infhostgen.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostget.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostglue.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\infhostput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\lib\inflib\inflib.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infpriv.h" - > - </File> - <File - RelativePath="..\..\lib\inflib\infput.c" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> + Filter=""> + <File + RelativePath="..\..\lib\inflib\builddep.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcommon.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infcore.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhost.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infhostgen.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostget.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostglue.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\infhostput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\..\lib\inflib\inflib.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infpriv.h"> + </File> + <File + RelativePath="..\..\lib\inflib\infput.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> </FileConfiguration> </File> </Filter> <Filter Name="tools" - > - <File - RelativePath="..\ssprintf.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\ssprintf.h" - > - </File> - <File - RelativePath="..\xml.cpp" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="2" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BasicRuntimeChecks="3" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\xml.h" - > + Filter=""> + <File + RelativePath="..\ssprintf.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\ssprintf.h"> + </File> + <File + RelativePath="..\xml.cpp"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + </File> + <File + RelativePath="..\xml.h"> </File> </Filter> </Files>

1 0

[dgorbachev] 26585: Add a stub for TraceMessage.
by dgorbachev＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: dgorbachev Date: Mon Apr 30 12:42:04 2007 New Revision: 26585 URL: http://svn.reactos.org/svn/reactos?rev=26585&view=rev Log: Add a stub for TraceMessage. Added: trunk/reactos/dll/win32/advapi32/misc/trace.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/advapi32.rbuild Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Mon Apr 30 12:42:04 2007 @@ -649,7 +649,7 @@ SystemFunction041@12 ;TraceEvent ;TraceEventInstance -;TraceMessage +TraceMessage ;TraceMessageVa TreeResetNamedSecurityInfoA@44 TreeResetNamedSecurityInfoW@44 Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Mon Apr 30 12:42:04 2007 @@ -34,6 +34,7 @@ <file>msi.c</file> <file>shutdown.c</file> <file>sysfunc.c</file> + <file>trace.c</file> </compilationunit> </directory> <directory name="reg"> Added: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c (added) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c Mon Apr 30 12:42:04 2007 @@ -1,0 +1,23 @@ +/* + * Advapi32.dll Event Tracing Functions + */ + +#include <advapi32.h> +#include <debug.h> + +/* + * @unimplemented + */ +ULONG CDECL +TraceMessage( + HANDLE SessionHandle, + ULONG MessageFlags, + LPGUID MessageGuid, + USHORT MessageNumber, + ...) +{ + DPRINT1("TraceMessage()\n"); + return ERROR_SUCCESS; +} + +/* EOF */

1 0

[dgorbachev] 26584: Add RtlDllShutdownInProgress().
by dgorbachev＠svn.reactos.org 30 Apr '07

30 Apr '07

Author: dgorbachev Date: Mon Apr 30 12:41:42 2007 New Revision: 26584 URL: http://svn.reactos.org/svn/reactos?rev=26584&view=rev Log: Add RtlDllShutdownInProgress(). Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Mon Apr 30 12:41:42 2007 @@ -411,6 +411,7 @@ RtlDestroyProcessParameters@4 RtlDestroyQueryDebugBuffer@4 RtlDetermineDosPathNameType_U@4 +RtlDllShutdownInProgress@0 RtlDoesFileExists_U@4 RtlDosPathNameToNtPathName_U@16 RtlDosPathNameToRelativeNtPathName_U@16 Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Mon Apr 30 12:41:42 2007 @@ -45,6 +45,7 @@ PLDR_DATA_TABLE_ENTRY Module; } TLS_DATA, *PTLS_DATA; +static BOOLEAN LdrpDllShutdownInProgress = FALSE; static PTLS_DATA LdrpTlsArray = NULL; static ULONG LdrpTlsCount = 0; static ULONG LdrpTlsSize = 0; @@ -2485,6 +2486,9 @@ DPRINT("LdrpDetachProcess() called for %wZ\n", &ExeModule->BaseDllName); + if (UnloadAll) + LdrpDllShutdownInProgress = TRUE; + CallingCount++; ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; @@ -2617,6 +2621,15 @@ /* * @implemented */ +BOOLEAN NTAPI +RtlDllShutdownInProgress (VOID) +{ + return LdrpDllShutdownInProgress; +} + +/* + * @implemented + */ NTSTATUS NTAPI LdrShutdownProcess (VOID) {

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 April 2007