Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29052: Continue rbuild cleanup (Directory class)
by hpoussin＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: hpoussin Date: Sat Sep 15 12:47:56 2007 New Revision: 29052 URL: http://svn.reactos.org/svn/reactos?rev=29052&view=rev Log: Continue rbuild cleanup (Directory class) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Sep 15 12:47:56 2007 @@ -172,9 +172,9 @@ Configuration& configuration ) : Backend ( project, configuration ), manualBinutilsSetting( false ), - intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), - outputDirectory ( new Directory ( "$(OUTPUT)" ) ), - installDirectory ( new Directory ( "$(INSTALL)" ) ) + intermediateDirectory ( new Directory ( "" ) ), + outputDirectory ( new Directory ( "" ) ), + installDirectory ( new Directory ( "" ) ) { compilerPrefix = ""; } @@ -768,10 +768,10 @@ MingwBackend::GenerateDirectories () { printf ( "Creating directories..." ); - intermediateDirectory->GenerateTree ( "", configuration.Verbose ); - outputDirectory->GenerateTree ( "", configuration.Verbose ); + intermediateDirectory->GenerateTree ( IntermediateDirectory, configuration.Verbose ); + outputDirectory->GenerateTree ( OutputDirectory, configuration.Verbose ); if ( !configuration.MakeHandlesInstallDirectories ) - installDirectory->GenerateTree ( "", configuration.Verbose ); + installDirectory->GenerateTree ( InstallDirectory, configuration.Verbose ); printf ( "done\n" ); } @@ -1336,7 +1336,7 @@ void MingwBackend::GenerateDirectoryTargets () { - intermediateDirectory->CreateRule ( fMakefile, "" ); - outputDirectory->CreateRule ( fMakefile, "" ); - installDirectory->CreateRule ( fMakefile, "" ); -} + intermediateDirectory->CreateRule ( fMakefile, "$(INTERMEDIATE)" ); + outputDirectory->CreateRule ( fMakefile, "$(OUTPUT)" ); + installDirectory->CreateRule ( fMakefile, "$(INSTALL)" ); +} Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Sat Sep 15 12:47:56 2007 @@ -37,6 +37,29 @@ Directory::Directory ( const string& name_ ) : name(name_) { + size_t pos = name.find_first_of ( "$:" ); + if ( pos != string::npos ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory name '%s'", + name.c_str() ); + } + + const char* p = strpbrk ( name_.c_str (), "/\\" ); + if ( name_.c_str () == p ) + { + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s'", + name_.c_str () ); + } + + if ( p ) + { + name.erase ( p - name.c_str ()); + Add ( p + 1 ); + } } void @@ -95,7 +118,7 @@ } bool -Directory::CreateDirectory ( string path ) +Directory::CreateDirectory ( const string& path ) { size_t index = 0; size_t nextIndex; @@ -116,26 +139,24 @@ return directoryWasCreated; } -string -Directory::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} - -void -Directory::ResolveVariablesInPath ( char* buf, - const string& path ) -{ - string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); - strcpy ( buf, s.c_str () ); +void +Directory::GenerateTree ( DirectoryLocation root, + bool verbose ) +{ + switch ( root ) + { + case IntermediateDirectory: + return GenerateTree ( Environment::GetIntermediatePath (), verbose ); + case OutputDirectory: + return GenerateTree ( Environment::GetOutputPath (), verbose ); + case InstallDirectory: + return GenerateTree ( Environment::GetInstallPath (), verbose ); + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + root ); + } } void @@ -147,12 +168,10 @@ if ( parent.size () > 0 ) { char buf[256]; - if ( name.size () > 0 ) path = parent + sSep + name; else path = parent; - ResolveVariablesInPath ( buf, path ); if ( CreateDirectory ( buf ) && verbose ) printf ( "Created %s\n", buf ); } @@ -168,10 +187,10 @@ } string -Directory::EscapeSpaces ( string path ) +Directory::EscapeSpaces ( const string& path ) { string newpath; - char* p = &path[0]; + const char* p = &path[0]; while ( *p != 0 ) { if ( *p == ' ' ) @@ -188,16 +207,16 @@ const string& parent ) { string path; - - if ( parent.size() > 0 ) - { - string escapedParent = EscapeSpaces ( parent ); + string escapedName = EscapeSpaces ( name ); + + if ( escapedName.size() > 0 ) + { fprintf ( f, "%s%c%s: | %s\n", - escapedParent.c_str (), + parent.c_str (), cSep, - EscapeSpaces ( name ).c_str (), - escapedParent.c_str () ); + escapedName.c_str (), + parent.c_str () ); fprintf ( f, "\t$(ECHO_MKDIR)\n" ); @@ -205,10 +224,10 @@ fprintf ( f, "\t${mkdir} $@\n" ); - path = parent + sSep + name; + path = parent + sSep + escapedName; } else - path = name; + path = parent; for ( directory_map::iterator i = subdirs.begin(); i != subdirs.end(); Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sat Sep 15 12:47:56 2007 @@ -120,6 +120,15 @@ virtual void ProcessXML(); }; +enum DirectoryLocation +{ + SourceDirectory, + IntermediateDirectory, + OutputDirectory, + InstallDirectory, + TemporaryDirectory, +}; + class Directory { public: @@ -127,20 +136,16 @@ directory_map subdirs; Directory ( const std::string& name ); void Add ( const char* subdir ); + void GenerateTree ( DirectoryLocation root, + bool verbose ); + void CreateRule ( FILE* f, + const std::string& parent ); +private: + bool mkdir_p ( const char* path ); + bool CreateDirectory ( const std::string& path ); + std::string EscapeSpaces ( const std::string& path ); void GenerateTree ( const std::string& parent, bool verbose ); - std::string EscapeSpaces ( std::string path ); - void CreateRule ( FILE* f, - const std::string& parent ); -private: - bool mkdir_p ( const char* path ); - std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); - std::string GetEnvironmentVariable ( const std::string& name ); - void ResolveVariablesInPath ( char* buf, - const std::string& path ); - bool CreateDirectory ( std::string path ); }; @@ -300,15 +305,6 @@ HostFalse, HostDefault, HostTrue -}; - -enum DirectoryLocation -{ - SourceDirectory, - IntermediateDirectory, - OutputDirectory, - InstallDirectory, - TemporaryDirectory, }; class FileLocation Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Sat Sep 15 12:47:56 2007 @@ -111,7 +111,7 @@ NormalizeFilename ( resourceFilename ).c_str () ); string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters; - Directory( relativeDirectory ).GenerateTree( Environment::GetIntermediatePath(), false ); + Directory( relativeDirectory ).GenerateTree( IntermediateDirectory, project.configuration.Verbose ); int exitcode = system ( command.c_str () ); if ( exitcode != 0 )

1 0

[tkreuzer] 29051: revert 29027, because it breaks context menus.
by tkreuzer＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: tkreuzer Date: Sat Sep 15 02:46:38 2007 New Revision: 29051 URL: http://svn.reactos.org/svn/reactos?rev=29051&view=rev Log: revert 29027, because it breaks context menus. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Sat Sep 15 02:46:38 2007 @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ - TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ + TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -641,7 +641,6 @@ if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); - DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); KeRosDumpStackFrames(NULL, 20); } else @@ -1061,7 +1060,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1070,24 +1069,22 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; - HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(phObj); - hObj = *phObj; - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); + ASSERT(hObj); + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1099,13 +1096,16 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* On Windows the higher 16 bit of the type field don't contain the - full type from the handle, but the base type. - (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ - OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); - + /* FIXME: On Windows the higher 16 bit of the type field don't always match + the type from the handle, it is probably a storage type + (type = pen, storage = brush) */ + NewType = GDI_HANDLE_GET_TYPE(*hObj); + NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; + + /* This is the type that the object should have right now, save it */ + OldType = NewType; /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType = OldType | GDI_ENTRY_STOCK_MASK; + NewType |= GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,8 +1146,7 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); - *phObj = hObj; + *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); /* we're done, successfully converted the object */ return TRUE; @@ -1301,7 +1300,6 @@ else { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); - DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); } } else if(PrevProcId == LockedProcessId)

1 0

[janderwald] 29050: - reenable module definition
by janderwald＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: janderwald Date: Sat Sep 15 01:44:11 2007 New Revision: 29050 URL: http://svn.reactos.org/svn/reactos?rev=29050&view=rev Log: - reenable module definition Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Sep 15 01:44:11 2007 @@ -439,10 +439,9 @@ fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); } -#if 0 if (module.importLibrary != NULL) - fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); -#endif + fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->source->name.c_str ()); + fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); bool use_msvcrt_lib = false; for ( i = 0; i < libraries.size(); i++ )

1 0

[janderwald] 29049: - remove a non working hack
by janderwald＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: janderwald Date: Sat Sep 15 01:06:38 2007 New Revision: 29049 URL: http://svn.reactos.org/svn/reactos?rev=29049&view=rev Log: - remove a non working hack Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Sat Sep 15 01:06:38 2007 @@ -8,11 +8,7 @@ #define REACTOS_STR_INTERNAL_NAME "hdwwiz\0" #define REACTOS_STR_ORIGINAL_FILENAME "hdwwiz.cpl\0" -#ifdef _MSC_VER -#include <../../../reactos/version.rc> -#else #include <reactos/version.rc> -#endif 123 24 DISCARDABLE "manifest.xml"

1 0

[janderwald] 29048: - include intermediate path for msvc projects since buildno.h and friends are now generated there
by janderwald＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: janderwald Date: Sat Sep 15 01:05:46 2007 New Revision: 29048 URL: http://svn.reactos.org/svn/reactos?rev=29048&view=rev Log: - include intermediate path for msvc projects since buildno.h and friends are now generated there Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Sep 15 01:05:46 2007 @@ -220,8 +220,11 @@ baseaddr = prop.value; } } - - string include_string; + /* include intermediate path for reactos.rc */ + string version = intdir + "\\include\\reactos"; + includes.push_back (version); + + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" );

1 0

[cfinck] 29047: This is hopefully the last fix needed to build LiveCD on Unix hosts again
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:34:24 2007 New Revision: 29047 URL: http://svn.reactos.org/svn/reactos?rev=29047&view=rev Log: This is hopefully the last fix needed to build LiveCD on Unix hosts again Modified: trunk/reactos/lib/cmlib/cmdata.h Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=290… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Fri Sep 14 23:34:24 2007 @@ -20,7 +20,11 @@ #ifndef _CM_ +#ifdef CMLIB_HOST +#include <host/pshpack1.h> +#else #include <pshpack1.h> +#endif typedef struct _CM_VIEW_OF_FILE { @@ -147,7 +151,11 @@ UCHAR Data[0]; } CM_KEY_SECURITY, *PCM_KEY_SECURITY; +#ifdef CMLIB_HOST +#include <host/poppack.h> +#else #include <poppack.h> +#endif #endif

1 0

[cfinck] 29046: Small change in the slovak translation of Solitaire (patch by Mario Kacmar, kario AT szm DOT sk)
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:26:20 2007 New Revision: 29046 URL: http://svn.reactos.org/svn/reactos?rev=29046&view=rev Log: Small change in the slovak translation of Solitaire (patch by Mario Kacmar, kario AT szm DOT sk) Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Fri Sep 14 23:26:20 2007 @@ -31,7 +31,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 221, 96 -CAPTION "Select Card Back" +CAPTION "Výber rubu kariet" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -40,7 +40,7 @@ CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 - PUSHBUTTON "Cancel", IDCANCEL, 162, 77, 54, 13 + PUSHBUTTON "Zrui", IDCANCEL, 162, 77, 54, 13 END

1 0

[cfinck] 29045: And here comes the next fix, this time for fixing the LiveCD build
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:23:36 2007 New Revision: 29045 URL: http://svn.reactos.org/svn/reactos?rev=29045&view=rev Log: And here comes the next fix, this time for fixing the LiveCD build Modified: trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Fri Sep 14 23:23:36 2007 @@ -43,7 +43,11 @@ #define HvGetCellType(Cell) \ ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) +#ifdef CMLIB_HOST +#include <host/pshpack1.h> +#else #include <pshpack1.h> +#endif /** * @name HBASE_BLOCK @@ -127,7 +131,11 @@ LONG Size; } HCELL, *PHCELL; +#ifdef CMLIB_HOST +#include <host/poppack.h> +#else #include <poppack.h> +#endif #define IsFreeCell(Cell)(Cell->Size >= 0) #define IsUsedCell(Cell)(Cell->Size < 0)

1 0

[cfinck] 29044: Forgot to change these ones as well. But somehow it compiled fine under Windows, even without these changes.
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:13:03 2007 New Revision: 29044 URL: http://svn.reactos.org/svn/reactos?rev=29044&view=rev Log: Forgot to change these ones as well. But somehow it compiled fine under Windows, even without these changes. Modified: trunk/reactos/tools/wrc/newstruc.c Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=2… ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Fri Sep 14 23:13:03 2007 @@ -32,7 +32,7 @@ #include "utils.h" #include "parser.h" -#include <pshpack2.h> +#include <host/pshpack2.h> typedef struct { DWORD biSize; @@ -41,7 +41,7 @@ WORD biPlanes; WORD biBitCount; } BITMAPOS2HEADER; -#include <poppack.h> +#include <host/poppack.h> /* Generate new_* functions that have no parameters (NOTE: no ';') */ __NEW_STRUCT_FUNC(dialog)

1 0

[cfinck] 29043: Forgot to change these ones
by cfinck＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: cfinck Date: Fri Sep 14 23:02:21 2007 New Revision: 29043 URL: http://svn.reactos.org/svn/reactos?rev=29043&view=rev Log: Forgot to change these ones Modified: trunk/reactos/include/host/typedefs.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h (original) +++ trunk/reactos/include/host/typedefs.h Fri Sep 14 23:02:21 2007 @@ -75,7 +75,7 @@ #define MAXUSHORT USHRT_MAX -#include <pshpack4.h> +#include <host/pshpack4.h> typedef struct _RTL_BITMAP { ULONG SizeOfBitMap; @@ -117,7 +117,7 @@ USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -#include <poppack.h> +#include <host/poppack.h> typedef const UNICODE_STRING *PCUNICODE_STRING;

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