Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[sedwards] 19482: porting fixes
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

porting fixes Modified: trunk/reactos/apps/utils/net/tracert/tracert.c _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 06:02:15 UTC (rev 19481) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 06:33:19 UTC (rev 19482) @@ -28,7 +28,7 @@ */ -#include <windows.h> +//#include <windows.h> #include <winsock2.h> #include <tchar.h> #include <stdio.h> @@ -726,7 +726,7 @@ */ int main(int argc, char* argv[]) { - if (!ParseCmdline(argc, _argv)) return -1; + if (!ParseCmdline(argc, argv)) return -1; Driver();

1 0

[sedwards] 19481: porting fixes
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

porting fixes Modified: trunk/reactos/apps/utils/net/ftp/cmds.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/ftp/main.c Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ftp/cmds.c --- trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -25,7 +25,7 @@ //#include <sys/param.h> //#include <sys/wait.h> #include <sys/stat.h> -#if !defined(WIN32) +#ifndef _WIN32 #include <sys/socket.h> #include <arpa/ftp.h> #include <netinet/in.h> _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -25,7 +25,7 @@ #include <sys/stat.h> -#if !defined(WIN32) +#ifndef _WIN32 #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> _____ Modified: trunk/reactos/apps/utils/net/ftp/main.c --- trunk/reactos/apps/utils/net/ftp/main.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/main.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -28,7 +28,7 @@ /* * FTP User Program -- Command Interface. */ -#if !defined(WIN32) +#ifndef _WIN32 #include <netdb.h> #include <sys/socket.h> #include <sys/ioctl.h> _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -236,8 +236,9 @@ if (Index == (TCHAR)NULL) { PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ULONG ulOutBufLen = 0; + ulOutBufLen = 0; /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ @@ -290,8 +291,9 @@ if (Index == (TCHAR)NULL) { PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ULONG ulOutBufLen = 0; + ulOutBufLen = 0; /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ @@ -335,9 +337,12 @@ { // Declare and initialize variables PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; + DWORD dwRetVal; + pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) ); - ULONG ulOutBufLen = sizeof(IP_INTERFACE_INFO); - DWORD dwRetVal = 0; + ulOutBufLen = sizeof(IP_INTERFACE_INFO); + dwRetVal = 0; // Make an initial call to GetInterfaceInfo to get

1 0

[cwittich] 19480: fix bug 838 (Sol.exe is missing it's menubar)
by cwittich＠svn.reactos.com 23 Nov '05

23 Nov '05

fix bug 838 (Sol.exe is missing it's menubar) Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/controls/regcontrol.c Modified: trunk/reactos/lib/user32/windows/class.c Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/include/win32k/ntuser.h 2005-11-23 06:00:41 UTC (rev 19480) @@ -1170,7 +1170,8 @@ PUNICODE_STRING MenuName, WNDPROC wpExtra, DWORD Flags, - DWORD Unknown7); + DWORD Unknown7, + HMENU hMenu); BOOL STDCALL _____ Modified: trunk/reactos/lib/user32/controls/regcontrol.c --- trunk/reactos/lib/user32/controls/regcontrol.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/lib/user32/controls/regcontrol.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -51,6 +51,7 @@ &MenuName, Descr->procA, REGISTERCLASS_SYSTEM, + 0, 0); } _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/lib/user32/windows/class.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -574,8 +574,9 @@ WNDCLASSEXA WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName; + HMENU hMenu; - if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || + if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXA) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || lpwcx->lpszClassName == NULL) { @@ -601,31 +602,34 @@ if (lpwcx->hInstance == NULL) ((WNDCLASSEXA*)lpwcx)->hInstance = GetModuleHandleW(NULL); - RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); + RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXA)); if (NULL == WndClass.hIconSm) { WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } - if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0) + if HIWORD(lpwcx->lpszMenuName) { + hMenu = 0; + RtlCreateUnicodeStringFromAsciiz(&MenuName, WndClass.lpszMenuName); + } + else + { MenuName.Length = MenuName.MaximumLength = 0; - MenuName.Buffer = (LPWSTR)lpwcx->lpszMenuName; - } else - { - RtlCreateUnicodeStringFromAsciiz(&MenuName, lpwcx->lpszMenuName); + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + hMenu = LoadMenuA(WndClass.hInstance, lpwcx->lpszMenuName); } - - if (IS_ATOM(lpwcx->lpszClassName)) + + if (IS_ATOM(WndClass.lpszClassName)) { ClassName.Length = ClassName.MaximumLength = 0; - ClassName.Buffer = (LPWSTR)lpwcx->lpszClassName; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; } else { - RtlCreateUnicodeStringFromAsciiz(&ClassName, lpwcx->lpszClassName); + RtlCreateUnicodeStringFromAsciiz(&ClassName, WndClass.lpszClassName); } Atom = NtUserRegisterClassExWOW( @@ -635,11 +639,12 @@ &MenuName, NULL, REGISTERCLASS_ANSI, - 0); + 0, + hMenu); - if (!IS_ATOM(lpwcx->lpszMenuName)) + if (!IS_ATOM(WndClass.lpszMenuName)) RtlFreeUnicodeString(&MenuName); - if (!IS_ATOM(lpwcx->lpszClassName)) + if (!IS_ATOM(WndClass.lpszClassName)) RtlFreeUnicodeString(&ClassName); return (ATOM)Atom; @@ -654,6 +659,7 @@ WNDCLASSEXW WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName; + HMENU hMenu; if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || @@ -688,24 +694,27 @@ WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } - if (IS_ATOM(lpwcx->lpszMenuName)) + if HIWORD(lpwcx->lpszMenuName) { + hMenu = 0; + RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName); + } + else + { MenuName.Length = MenuName.MaximumLength = 0; - MenuName.Buffer = (LPWSTR)lpwcx->lpszMenuName; - } else - { - RtlInitUnicodeString(&MenuName, lpwcx->lpszMenuName); + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + hMenu = LoadMenuW(WndClass.hInstance, lpwcx->lpszMenuName); } - if (IS_ATOM(lpwcx->lpszClassName)) + if (IS_ATOM(WndClass.lpszClassName)) { ClassName.Length = ClassName.MaximumLength = 0; - ClassName.Buffer = (LPWSTR)lpwcx->lpszClassName; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; } else { - RtlInitUnicodeString(&ClassName, lpwcx->lpszClassName); + RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } return (ATOM)NtUserRegisterClassExWOW( @@ -715,7 +724,8 @@ &MenuName, NULL, 0, - 0); + 0, + hMenu); } /* _____ Modified: trunk/reactos/subsys/win32k/include/class.h --- trunk/reactos/subsys/win32k/include/class.h 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/include/class.h 2005-11-23 06:00:41 UTC (rev 19480) @@ -17,6 +17,7 @@ HICON hIcon; HCURSOR hCursor; HBRUSH hbrBackground; + HMENU hMenu; UNICODE_STRING lpszMenuName; RTL_ATOM Atom; HICON hIconSm; _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -69,6 +69,8 @@ ASSERT(Class->refs == 0); RemoveEntryList(&Class->ListEntry); + if (Class->hMenu) + UserDestroyMenu(Class->hMenu); RtlDeleteAtomFromAtomTable(gAtomTable, Class->Atom); ExFreePool(Class); } @@ -149,7 +151,8 @@ DWORD Flags, WNDPROC wpExtra, PUNICODE_STRING MenuName, - RTL_ATOM Atom) + RTL_ATOM Atom, + HMENU hMenu) { PWNDCLASS_OBJECT Class; ULONG objectSize; @@ -188,6 +191,7 @@ Class->hInstance = lpwcx->hInstance; Class->hIcon = lpwcx->hIcon; Class->hCursor = lpwcx->hCursor; + Class->hMenu = hMenu; Class->hbrBackground = lpwcx->hbrBackground; Class->Unicode = !(Flags & REGISTERCLASS_ANSI); Class->Global = Global; @@ -414,7 +418,8 @@ PUNICODE_STRING MenuName, WNDPROC wpExtra, DWORD Flags, - DWORD Unknown7) + DWORD Unknown7, + HMENU hMenu) /* * FUNCTION: @@ -495,7 +500,7 @@ RETURN(0); } - if (!IntRegisterClass(&SafeClass, Flags, wpExtra, MenuName, Atom)) + if (!IntRegisterClass(&SafeClass, Flags, wpExtra, MenuName, Atom, hMenu)) { if (ClassName->Length) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -1462,6 +1462,10 @@ Window->IDMenu = 0; Window->Instance = hInstance; Window->hSelf = hWnd; + + if (!hMenu) + hMenu = Class->hMenu; + if (0 != (dwStyle & WS_CHILD)) { Window->IDMenu = (UINT) hMenu; _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/tools/nci/w32ksvc.db 2005-11-23 06:00:41 UTC (rev 19480) @@ -458,7 +458,7 @@ NtUserReleaseDC 2 NtUserRealChildWindowFromPoint 3 NtUserRedrawWindow 4 -NtUserRegisterClassExWOW 7 +NtUserRegisterClassExWOW 8 NtUserRegisterHotKey 4 NtUserRegisterTasklist 1 NtUserRegisterWindowMessage 1

1 0

[ion] 19479: Fix msvc/gcc NDK problem
by ion＠svn.reactos.com 23 Nov '05

23 Nov '05

Fix msvc/gcc NDK problem Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -112,7 +112,6 @@ #define TIME_ZONE_ID_UNKNOWN 0 #define TIME_ZONE_ID_STANDARD 1 #define TIME_ZONE_ID_DAYLIGHT 2 -#define TIME_ZONE_ID_INVALID 0xFFFFFFFF // // RTL Lock Type (Critical Section or Resource) @@ -669,7 +668,7 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD { struct _EXCEPTION_REGISTRATION_RECORD *Next; - PEXCEPTION_HANDLER Handler; + PEXCEPTION_ROUTINE Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; // _____ Modified: trunk/reactos/lib/rtl/rtlp.h --- trunk/reactos/lib/rtl/rtlp.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/lib/rtl/rtlp.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -75,7 +75,7 @@ PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); EXCEPTION_DISPOSITION NTAPI @@ -83,7 +83,7 @@ PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); VOID NTAPI _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -553,6 +553,13 @@ IN PVOID MapRegisterBase, IN PVOID Context); +typedef EXCEPTION_DISPOSITION +(DDKAPI *PEXCEPTION_ROUTINE)( + IN struct _EXCEPTION_RECORD *ExceptionRecord, + IN PVOID EstablisherFrame, + IN OUT struct _CONTEXT *ContextRecord, + IN OUT PVOID DispatcherContext); + typedef VOID (DDKAPI *PDRIVER_LIST_CONTROL)( IN struct _DEVICE_OBJECT *DeviceObject,

1 0

[ion] 19478: move devices.h to a more appropriate location (approximately where it's located in the nt4 ddk)
by ion＠svn.reactos.com 23 Nov '05

23 Nov '05

move devices.h to a more appropriate location (approximately where it's located in the nt4 ddk) Added: trunk/reactos/drivers/dd/sound/include/ Added: trunk/reactos/drivers/dd/sound/include/devices.h Modified: trunk/reactos/drivers/dd/sound/sound.xml Deleted: trunk/reactos/include/devices.h _____ Copied: trunk/reactos/drivers/dd/sound/include/devices.h (from rev 19476, trunk/reactos/include/devices.h) _____ Modified: trunk/reactos/drivers/dd/sound/sound.xml --- trunk/reactos/drivers/dd/sound/sound.xml 2005-11-23 03:12:52 UTC (rev 19477) +++ trunk/reactos/drivers/dd/sound/sound.xml 2005-11-23 03:54:11 UTC (rev 19478) @@ -2,6 +2,7 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <include base="sound">.\include</include> <file>dsp.c</file> <file>mixer.c</file> <file>sb16.c</file> _____ Deleted: trunk/reactos/include/devices.h --- trunk/reactos/include/devices.h 2005-11-23 03:12:52 UTC (rev 19477) +++ trunk/reactos/include/devices.h 2005-11-23 03:54:11 UTC (rev 19478) @@ -1,16 +0,0 @@ -typedef struct -{ - LPSTR LeftVolumeName; - LPSTR RightVolumeName; - ULONG DefaultVolume; - ULONG Type; - ULONG DeviceType; - char Key[4]; - LPSTR PrototypeName; - PVOID DeferredRoutine; - PVOID ExclusionRoutine; - PVOID DispatchRoutine; - PVOID DevCapsRoutine; - PVOID HwSetVolume; - ULONG IoMethod; -}SOUND_DEVICE_INIT;

1 0

[chorns] 19477: Option to disable compilation units
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

Option to disable compilation units Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -527,10 +527,13 @@ void MingwBackend::GenerateCompilationUnitSupportCode () { - printf ( "Generating compilation unit support code..." ); - CompilationUnitSupportCode compilationUnitSupportCode ( ProjectNode ); - compilationUnitSupportCode.Generate ( configuration.Verbose ); - printf ( "done\n" ); + if ( configuration.CompilationUnitsEnabled ) + { + printf ( "Generating compilation unit support code..." ); + CompilationUnitSupportCode compilationUnitSupportCode ( ProjectNode ); + compilationUnitSupportCode.Generate ( configuration.Verbose ); + printf ( "done\n" ); + } } string _____ Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -83,12 +83,12 @@ s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); if ( module.pch ) - s = s + sprintf ( s, "#include <%s>\n", NormalizeFilename ( module.pch->file.name ).c_str () ); + s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( module.pch->file.name, '\\', '/' ).c_str () ); for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) { File& file = *compilationUnit.files[i]; - s = s + sprintf ( s, "#include \"%s\"\n", file.name.c_str () ); + s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( file.name, '\\', '/' ).c_str () ); } s = s + sprintf ( s, "\n" ); _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -26,6 +26,7 @@ CleanAsYouGo = false; AutomaticDependencies = true; CheckDependenciesForModuleOnly = false; + CompilationUnitsEnabled = true; MakeHandlesInstallDirectories = false; GenerateProxyMakefilesInSourceTree = false; } _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -52,19 +52,27 @@ } string -FixSeparator ( const string& s ) +ChangeSeparator ( const string& s, + const char fromSeparator, + const char toSeparator ) { string s2(s); - char* p = strchr ( &s2[0], cBadSep ); + char* p = strchr ( &s2[0], fromSeparator ); while ( p ) { - *p++ = cSep; - p = strchr ( p, cBadSep ); + *p++ = toSeparator; + p = strchr ( p, fromSeparator ); } return s2; } string +FixSeparator ( const string& s ) +{ + return ChangeSeparator ( s, cBadSep, cSep ); +} + +string FixSeparatorForSystemCommand ( const string& s ) { string s2(s); @@ -627,12 +635,15 @@ } else if ( e.name == "compilationunit" ) { - CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); - else - non_if_data.compilationUnits.push_back ( pCompilationUnit ); - parseContext.compilationUnit = pCompilationUnit; + if ( project.configuration.CompilationUnitsEnabled ) + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + parseContext.compilationUnit = pCompilationUnit; + } subs_invalid = false; } if ( subs_invalid && e.subElements.size() > 0 ) _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -81,11 +81,13 @@ } -Project::Project ( const string& filename ) +Project::Project ( const Configuration& configuration, + const string& filename ) : xmlfile (filename), node (NULL), - head (NULL) -{ + head (NULL), + configuration (configuration) +{ ReadXml(); } _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -61,6 +61,22 @@ return true; } +bool +ParseCompilationUnitSwitch ( char switchChar2, + char* switchStart ) +{ + switch ( switchChar2 ) + { + case 'd': + configuration.CompilationUnitsEnabled = false; + break; + default: + printf ( "Unknown switch -u%c\n", + switchChar2 ); + return false; + } + return true; +} bool ParseVCProjectSwitch ( char switchChar2, @@ -148,6 +164,9 @@ case 'd': return ParseAutomaticDependencySwitch ( switchChar2, argv[index] ); + case 'u': + return ParseCompilationUnitSwitch ( switchChar2, + argv[index] ); case 'r': RootXmlFile = string(&argv[index][2]); break; @@ -196,9 +215,10 @@ printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); printf ( " needed anymore.\n" ); + printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); printf ( " -dd Disable automatic dependencies.\n" ); printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); - printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -ud Disable multiple source files per compilation unit.\n" ); printf ( " -mi Let make handle creation of install directories. Rbuild will\n" ); printf ( " not generate the directories.\n" ); printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); @@ -215,7 +235,7 @@ { string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); - Project project ( projectFilename ); + Project project ( configuration, projectFilename ); printf ( "done\n" ); project.WriteConfigurationFile (); project.ExecuteInvocations (); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-23 03:12:52 UTC (rev 19477) @@ -133,6 +133,7 @@ bool CleanAsYouGo; bool AutomaticDependencies; bool CheckDependenciesForModuleOnly; + bool CompilationUnitsEnabled; std::string CheckDependenciesForModuleOnlyModule; std::string VSProjectVersion; bool MakeHandlesInstallDirectories; @@ -189,6 +190,7 @@ std::string xmlfile; XMLElement *node, *head; public: + const Configuration& configuration; std::string name; std::string makefile; XMLIncludes xmlbuildfiles; @@ -198,7 +200,8 @@ std::vector<InstallFile*> installfiles; IfableData non_if_data; - Project ( const std::string& filename ); + Project ( const Configuration& configuration, + const std::string& filename ); ~Project (); void WriteConfigurationFile (); void ExecuteInvocations (); @@ -873,6 +876,11 @@ Replace ( const std::string& s, const std::string& find, const std::string& with ); extern std::string +ChangeSeparator ( const std::string& s, + const char fromSeparator, + const char toSeparator ); + +extern std::string FixSeparator ( const std::string& s ); extern std::string

1 0

[weiden] 19476: remove incorrect includes
by weiden＠svn.reactos.com 23 Nov '05

23 Nov '05

remove incorrect includes Modified: trunk/reactos/w32api/include/objsel.h _____ Modified: trunk/reactos/w32api/include/objsel.h --- trunk/reactos/w32api/include/objsel.h 2005-11-23 01:39:45 UTC (rev 19475) +++ trunk/reactos/w32api/include/objsel.h 2005-11-23 01:40:19 UTC (rev 19476) @@ -21,12 +21,9 @@ extern "C" { #endif -#include <unknwn.h> -#include <oaidl.h> -#include <objidl.h> - -#if defined (_MSC_VER) -#define INITGUID +/* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...}, + * but that's not a good idea when EXTERN_C is extern... */ +#ifndef DEFINE_GUID #include <initguid.h> #endif

1 0

[weiden] 19475: define IID_ISecurityInformation in a separate file not using the precomp.h
by weiden＠svn.reactos.com 23 Nov '05

23 Nov '05

define IID_ISecurityInformation in a separate file not using the precomp.h Modified: trunk/reactos/lib/aclui/aclui.xml Added: trunk/reactos/lib/aclui/guid.c Modified: trunk/reactos/lib/aclui/misc.c _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-11-23 00:27:26 UTC (rev 19474) +++ trunk/reactos/lib/aclui/aclui.xml 2005-11-23 01:39:45 UTC (rev 19475) @@ -18,6 +18,7 @@ <library>uxtheme</library> <file>aclui.c</file> <file>checklist.c</file> + <file>guid.c</file> <file>misc.c</file> <file>aclui.rc</file> <pch>precomp.h</pch> _____ Added: trunk/reactos/lib/aclui/guid.c --- trunk/reactos/lib/aclui/guid.c 2005-11-23 00:27:26 UTC (rev 19474) +++ trunk/reactos/lib/aclui/guid.c 2005-11-23 01:39:45 UTC (rev 19475) @@ -0,0 +1,25 @@ +/* + * ReactOS Access Control List Editor + * Copyright (C) 2004-2005 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <initguid.h> +#include <windows.h> +#include <aclui.h> +#include <objsel.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Property changes on: trunk/reactos/lib/aclui/guid.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-11-23 00:27:26 UTC (rev 19474) +++ trunk/reactos/lib/aclui/misc.c 2005-11-23 01:39:45 UTC (rev 19475) @@ -26,10 +26,6 @@ * UPDATE HISTORY: * 07/01/2005 Created */ -#define INITGUID -#include <windows.h> -#include <aclui.h> - #include <precomp.h> static PCWSTR ObjectPickerAttributes[] =

1 0

[cwittich] 19474: updated german translation
by cwittich＠svn.reactos.com 23 Nov '05

23 Nov '05

updated german translation Modified: trunk/reactos/subsys/system/regedit/De.rc _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-11-23 00:15:45 UTC (rev 19473) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-11-23 00:27:26 UTC (rev 19474) @@ -38,17 +38,17 @@ IDR_REGEDIT_MENU MENU DISCARDABLE BEGIN - POPUP "&Registry" + POPUP "&Datei" BEGIN - MENUITEM "Registry &importieren...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Importieren...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "Registry &exportieren...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Exportieren...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Mit Netzwerkregistry verbinden...", + MENUITEM "&Mit Netzwerkregistrierung verbinden...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "&Von Netzwerkregistry trennen...", + MENUITEM "&Von Netzwerkregistrierung trennen...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED MENUITEM SEPARATOR @@ -67,6 +67,8 @@ MENUITEM "&Zeichenkette", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binõrwert", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Mehrteilige Zeichenkette", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Erweiterbare Zeichenkette", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Berechtigungen...", ID_EDIT_PERMISSIONS @@ -77,7 +79,7 @@ MENUITEM "Schl³sselname &kopieren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Suchen\tStrg+F", ID_EDIT_FIND, GRAYED - MENUITEM "&Nõchstes finden\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&Weitersuchen\tF3", ID_EDIT_FINDNEXT, GRAYED END POPUP "&Ansicht" BEGIN @@ -91,14 +93,14 @@ BEGIN MENUITEM "Zu den Favoriten &hinzuf³gen", ID_FAVOURITES_ADDTOFAVOURITES , GRAYED - MENUITEM "Aus den Favoriten &l÷schen", ID_FAVOURITES_REMOVEFAVOURITE + MENUITEM "Aus den Favoriten &entfernen", ID_FAVOURITES_REMOVEFAVOURITE , GRAYED END POPUP "&Hilfe" BEGIN MENUITEM "&Hilfethemen\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&?ber Registry Editor", ID_HELP_ABOUT + MENUITEM "&Info", ID_HELP_ABOUT END END @@ -121,6 +123,8 @@ MENUITEM "&Zeichenkette", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binõrwert", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Mehrteilige Zeichenkette", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Erweiterbare Zeichenkette", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END END @@ -330,16 +334,52 @@ BEGIN END -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" +CAPTION "Zu Favoriten hinzuf³gen" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,130,24,50,14 + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "A&bbrechen",IDCANCEL,129,24,50,14 + LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 + EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL END +IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Favoriten entfernen" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,107,114,50,14 + PUSHBUTTON "A&bbrechen",IDCANCEL,7,114,50,14 + CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Favorit(en) auswõhlen:",IDC_STATIC,7,7,99,12 +END +IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&Weitersuchen",IDOK,197,7,50,14 + PUSHBUTTON "A&bbrechen",IDCANCEL,197,24,50,14 + GROUPBOX "Look at",IDC_STATIC,7,25,63,51 + LTEXT "Suche &nach:",IDC_STATIC,7,8,37,10 + EDITTEXT IDD_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Schl³ssel",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Werte",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,48,36,8 + CONTROL "&Daten",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,60,42,8 + CONTROL "Nur &ganze Zeichenkette",IDC_MATCHSTRING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 + CONTROL "Gro?-/Kleinschreibung beachten",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,83,48,90,12 +END + + /* * TEXTINCLUDE */

1 0

[turner] 19473: RegSetValueExW was including the comparison in the size param and therefore not writing the wallpaper path to the registry. The wallpaper now stays after a reboot.
by turner＠svn.reactos.com 23 Nov '05

23 Nov '05

RegSetValueExW was including the comparison in the size param and therefore not writing the wallpaper path to the registry. The wallpaper now stays after a reboot. Modified: trunk/reactos/lib/user32/misc/desktop.c _____ Modified: trunk/reactos/lib/user32/misc/desktop.c --- trunk/reactos/lib/user32/misc/desktop.c 2005-11-23 00:09:17 UTC (rev 19472) +++ trunk/reactos/lib/user32/misc/desktop.c 2005-11-23 00:15:45 UTC (rev 19473) @@ -293,8 +293,8 @@ L"Control Panel\\Desktop", 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) { - Ret = RegSetValueExW(hKey, L"Wallpaper", 0, REG_SZ, (lpWallpaper != NULL ? (LPBYTE)lpWallpaper : (LPBYTE)L""), - (lpWallpaper != NULL ? (lstrlenW(lpWallpaper) + 1) * sizeof(WCHAR) : sizeof(WCHAR)) == ERROR_SUCCESS); + Ret = (RegSetValueExW(hKey, L"Wallpaper", 0, REG_SZ, (lpWallpaper != NULL ? (LPBYTE)lpWallpaper : (LPBYTE)L""), + (lpWallpaper != NULL ? (lstrlenW(lpWallpaper) + 1) * sizeof(WCHAR) : sizeof(WCHAR))) == ERROR_SUCCESS); RegCloseKey(hKey); } }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005