Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tretiakov] 25596: Fix bugs in IntLoadKeyboardLayout and make it work.
by tretiakov＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: tretiakov Date: Mon Jan 22 20:08:34 2007 New Revision: 25596 URL: http://svn.reactos.org/svn/reactos?rev=25596&view=rev Log: Fix bugs in IntLoadKeyboardLayout and make it work. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Mon Jan 22 20:08:34 2007 @@ -33,9 +33,6 @@ #include <wine/debug.h> -/* Directory to load key layouts from */ -#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" - /* GLOBALS *******************************************************************/ typedef struct __TRACKINGLIST { @@ -73,10 +70,11 @@ PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; ULONG Length = 0; ULONG ResLength = 0; - UNICODE_STRING Temp; + PWCHAR ReturnBuffer; InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); if( !NT_SUCCESS(Status) ) { @@ -116,13 +114,18 @@ return Status; } - Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; - Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; - /* At this point, KeyValuePartialInfo->Data contains the key data */ - RtlInitUnicodeString(ReturnedValue,L""); - RtlAppendUnicodeStringToString(ReturnedValue,&Temp); - + ReturnBuffer = LocalAlloc(0, KeyValuePartialInfo->DataLength); + if(!ReturnBuffer) + { + NtClose(KeyHandle); + LocalFree(KeyValuePartialInfo); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory(ReturnBuffer, KeyValuePartialInfo->Data, KeyValuePartialInfo->DataLength); + RtlInitUnicodeString(ReturnedValue, ReturnBuffer); + LocalFree(KeyValuePartialInfo); NtClose(KeyHandle); @@ -148,10 +151,12 @@ UNICODE_STRING LayoutFile; UNICODE_STRING FullLayoutPath; LCID LocaleId; - PWCHAR KeyboardLayoutWSTR; ULONG_PTR layout; LANGID langid; - + WCHAR FullPathBuffer[MAX_PATH]; + WCHAR LayoutKeyNameBuffer[128] = L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" + L"\\Control\\KeyboardLayouts\\"; + layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); // LocaleId = GetSystemDefaultLCID(); @@ -171,55 +176,59 @@ else layout |= layout << 16; - DPRINT("Input = %S\n", pwszKLID ); - - DPRINT("DefaultLocale = %lx\n", LocaleId); - + DPRINT("Input = %S, DefaultLocale = %lx\n", pwszKLID, LocaleId ); swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("DefaultLocale = %S\n", LocaleBuffer); RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); - RtlInitUnicodeString(&LayoutKeyName, - L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" - L"\\Control\\KeyboardLayouts\\"); - - RtlAppendUnicodeStringToString(&LayoutKeyName,&DefaultLocale); - - RtlInitUnicodeString(&LayoutValueName,L"Layout File"); - + RtlInitUnicodeString(&LayoutKeyName, LayoutKeyNameBuffer); + LayoutKeyName.MaximumLength = sizeof(LayoutKeyNameBuffer); + RtlAppendUnicodeStringToString(&LayoutKeyName, &DefaultLocale); + DPRINT("LayoutKeyName=%wZ\n", &LayoutKeyName); + RtlInitUnicodeString(&LayoutValueName, L"Layout File"); Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - - RtlFreeUnicodeString(&LayoutKeyName); - DPRINT("Read registry and got %wZ\n", &LayoutFile); - - RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); - RtlAppendUnicodeStringToString(&FullLayoutPath,&LayoutFile); - - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - - RtlFreeUnicodeString(&LayoutFile); - - KeyboardLayoutWSTR = LocalAlloc(LMEM_ZEROINIT, - FullLayoutPath.Length + sizeof(WCHAR)); - - if( !KeyboardLayoutWSTR ) + if(!NT_SUCCESS(Status)) { - DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); - RtlFreeUnicodeString(&FullLayoutPath); + DPRINT1("Failed to read registry value, %x\n", Status); return NULL; } - memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, FullLayoutPath.Length); - - KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; - - KBModule = LoadLibraryW(KeyboardLayoutWSTR); - - DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); - - if( !KBModule ) - DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + + DPRINT("Read registry and got %wZ\n", &LayoutFile); + + Status = GetSystemDirectory(FullPathBuffer, sizeof(FullPathBuffer)); + if(Status == 0 || Status > sizeof(FullPathBuffer)) + { + DPRINT1("GetSystemDirectory() failed! (%d)\n", GetLastError()); + RtlFreeUnicodeString(&LayoutFile); + return NULL; + } + + RtlInitUnicodeString(&FullLayoutPath, FullPathBuffer); + FullLayoutPath.MaximumLength = sizeof(FullPathBuffer); + if(FullLayoutPath.Length < FullLayoutPath.MaximumLength-1) + { + FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)] = '\\'; + FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)+1] = 0; + FullLayoutPath.Length+=sizeof(WCHAR); + } + Status = RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + RtlFreeUnicodeString(&LayoutFile); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("RtlAppendUnicodeStringToString() failed! (%x)\n", Status); + return NULL; + } + + KBModule = LoadLibraryEx(FullPathBuffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + + if(!KBModule ) + { + DPRINT1( "Failed to load %wZ, lasterror = %d\n", &FullLayoutPath, GetLastError() ); + return NULL; + } pAddr = GetProcAddress( KBModule, (LPCSTR) 1); offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! @@ -228,7 +237,7 @@ FreeLibrary(KBModule); - Handle = CreateFileW( KeyboardLayoutWSTR, + Handle = CreateFileW( FullPathBuffer, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -244,9 +253,6 @@ Flags); NtClose(Handle); - - LocalFree(KeyboardLayoutWSTR); - RtlFreeUnicodeString(&FullLayoutPath); return hKL; }

1 0

[janderwald] 25595: - remove obsolete file
by janderwald＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: janderwald Date: Mon Jan 22 13:43:18 2007 New Revision: 25595 URL: http://svn.reactos.org/svn/reactos?rev=25595&view=rev Log: - remove obsolete file Removed: trunk/reactos/dll/lib.mak Removed: trunk/reactos/dll/lib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/lib.mak?rev=25594&view… ============================================================================== --- trunk/reactos/dll/lib.mak (original) +++ trunk/reactos/dll/lib.mak (removed) @@ -1,5 +1,0 @@ -LIB_BASE = lib -LIB_BASE_ = $(LIB_BASE)$(SEP) - -include $(LIB_BASE_)zlib/zlib.mak -include $(LIB_BASE_)inflib/inflib.mak

1 0

[spetreolle] 25594: fix warnings
by spetreolle＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: spetreolle Date: Mon Jan 22 13:35:52 2007 New Revision: 25594 URL: http://svn.reactos.org/svn/reactos?rev=25594&view=rev Log: fix warnings Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jan 22 13:35:52 2007 @@ -321,7 +321,7 @@ /* Get the current value and write */ OldValue = *Free; HandleTableEntry->NextFreeTableEntry = (ULONG)OldValue; - if (InterlockedCompareExchange(Free, NewValue, OldValue) == OldValue) + if (InterlockedCompareExchange((PLONG) Free, NewValue, OldValue) == OldValue) { /* Break out, we're done. Make sure the handle value makes sense */ ASSERT((OldValue & FREE_HANDLE_MASK) < @@ -596,7 +596,7 @@ } /* Update the index of the next handle */ - Index = InterlockedExchangeAdd(&HandleTable->NextHandleNeedingPool, + Index = InterlockedExchangeAdd((PLONG) &HandleTable->NextHandleNeedingPool, SizeOfHandle(LOW_LEVEL_ENTRIES)); /* Check if need to initialize the table */ @@ -613,7 +613,7 @@ Low[LOW_LEVEL_ENTRIES - 1].NextFreeTableEntry = FirstFree; /* Change the index */ - NewFree = InterlockedCompareExchange(&HandleTable->FirstFree, + NewFree = InterlockedCompareExchange((PLONG) &HandleTable->FirstFree, Index, FirstFree); if (NewFree == FirstFree) break; @@ -631,7 +631,7 @@ ULONG LastFree, i; /* Clear the last free index */ - LastFree = InterlockedExchange(&HandleTable->LastFree, 0); + LastFree = InterlockedExchange((PLONG) &HandleTable->LastFree, 0); /* Check if we had no index */ if (!LastFree) return LastFree; @@ -647,7 +647,7 @@ if (!HandleTable->StrictFIFO) { /* Update the first free index */ - if (!InterlockedCompareExchange(&HandleTable->FirstFree, LastFree, 0)) + if (!InterlockedCompareExchange((PLONG) &HandleTable->FirstFree, LastFree, 0)) { /* We're done, exit */ return LastFree; @@ -744,7 +744,7 @@ /* Now get the next value and do the compare */ NewValue = Entry->NextFreeTableEntry; - NewValue1 = InterlockedCompareExchange(&HandleTable->FirstFree, + NewValue1 = InterlockedCompareExchange((PLONG) &HandleTable->FirstFree, NewValue, OldValue); @@ -911,7 +911,7 @@ (KeGetCurrentIrql() == APC_LEVEL)); /* Set the lock bit and make sure it wasn't earlier */ - OldValue = InterlockedOr(&HandleTableEntry->Value, + OldValue = InterlockedOr((PLONG) &HandleTableEntry->Value, EXHANDLE_TABLE_ENTRY_LOCK_BIT); ASSERT((OldValue & EXHANDLE_TABLE_ENTRY_LOCK_BIT) == 0);

1 0

[ion] 25593: - Implement ExEnumHandleTable. Had to add a small hack due to some memory freeing/init problem that requires more investigation. - Implement ObpEnumFindHandleProcedure.
by ion＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: ion Date: Mon Jan 22 12:57:10 2007 New Revision: 25593 URL: http://svn.reactos.org/svn/reactos?rev=25593&view=rev Log: - Implement ExEnumHandleTable. Had to add a small hack due to some memory freeing/init problem that requires more investigation. - Implement ObpEnumFindHandleProcedure. Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Mon Jan 22 12:57:10 2007 @@ -111,8 +111,8 @@ NTAPI ExEnumHandleTable( IN PHANDLE_TABLE HandleTable, - IN PVOID Callback, - IN OUT PVOID Param, + IN PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, + IN OUT PVOID Context, OUT PHANDLE Handle OPTIONAL ); Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Mon Jan 22 12:57:10 2007 @@ -362,6 +362,17 @@ #else // +// Handle Enumeration Callback +// +struct _HANDLE_TABLE_ENTRY; +typedef BOOLEAN +(NTAPI *PEX_ENUM_HANDLE_CALLBACK)( + IN struct _HANDLE_TABLE_ENTRY *HandleTableEntry, + IN HANDLE Handle, + IN PVOID Context +); + +// // Compatibility with Windows XP Drivers using ERESOURCE // typedef struct _ERESOURCE_XP Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jan 22 12:57:10 2007 @@ -39,7 +39,7 @@ ULONG_PTR TableBase; PHANDLE_TABLE_ENTRY Entry = NULL; EXHANDLE Handle = LookupHandle; - PCHAR Level1, Level2, Level3; + PUCHAR Level1, Level2, Level3; /* Clear the tag bits and check what the next handle is */ Handle.TagBits = 0; @@ -1239,3 +1239,61 @@ Handle.Value += SizeOfHandle(1); } } + +/* + * @implemented + */ +BOOLEAN +NTAPI +ExEnumHandleTable(IN PHANDLE_TABLE HandleTable, + IN PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, + IN OUT PVOID Context, + OUT PHANDLE EnumHandle OPTIONAL) +{ + EXHANDLE Handle; + PHANDLE_TABLE_ENTRY HandleTableEntry; + BOOLEAN Result = FALSE; + PAGED_CODE(); + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Set the initial value and loop the entries */ + Handle.Value = 0; + while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) + { + /* Validate the entry */ + if ((HandleTableEntry) && + (HandleTableEntry->Object) && + (HandleTableEntry->NextFreeTableEntry != -2) && + (HandleTableEntry->Object != (PVOID)0xCDCDCDCD)) // HACK OF ETERNAL LAPDANCE + { + /* Lock the entry */ + if (ExpLockHandleTableEntry(HandleTable, HandleTableEntry)) + { + /* Notify the callback routine */ + Result = EnumHandleProcedure(HandleTableEntry, + Handle.GenericHandleOverlay, + Context); + + /* Unlock it */ + ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); + + /* Was this the one looked for? */ + if (Result) + { + /* If so, return it if requested */ + if (EnumHandle) *EnumHandle = Handle.GenericHandleOverlay; + break; + } + } + } + + /* Go to the next entry */ + Handle.Value += SizeOfHandle(1); + } + + /* Leave the critical region and return callback result */ + KeLeaveCriticalRegion(); + return Result; +} Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Mon Jan 22 12:57:10 2007 @@ -36,20 +36,6 @@ ExGetPreviousMode (VOID) { return KeGetPreviousMode(); -} - -/* - * @unimplemented - */ -BOOLEAN -NTAPI -ExEnumHandleTable(IN PHANDLE_TABLE HandleTable, - IN PVOID Callback, - IN OUT PVOID Param, - OUT PHANDLE Handle OPTIONAL) -{ - UNIMPLEMENTED; - return FALSE; } /* Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jan 22 12:57:10 2007 @@ -177,10 +177,46 @@ IN HANDLE Handle, IN PVOID Context) { - /* FIXME: TODO */ - DPRINT1("Not yet implemented!\n"); - KEBUGCHECK(0); - return FALSE; + POBJECT_HEADER ObjectHeader; + ACCESS_MASK GrantedAccess; + ULONG HandleAttributes; + POBP_FIND_HANDLE_DATA FindData = Context; + + /* Get the object header */ + ObjectHeader = ObpGetHandleObject(HandleEntry); + + /* Make sure it's valid and matching */ + if ((FindData->ObjectHeader) && (FindData->ObjectHeader != ObjectHeader)) + { + /* No match, fail */ + return FALSE; + } + + /* Now attempt to match the object type */ + if ((FindData->ObjectType) && (FindData->ObjectType != ObjectHeader->Type)) + { + /* No match, fail */ + return FALSE; + } + + /* Check if we have extra information */ + if (FindData->HandleInformation) + { + /* Get the granted access and attributes */ + GrantedAccess = HandleEntry->GrantedAccess; + HandleAttributes = HandleEntry->ObAttributes & OBJ_HANDLE_ATTRIBUTES; + + /* Attempt to match them */ + if ((FindData->HandleInformation->HandleAttributes != HandleAttributes) || + (FindData->HandleInformation->GrantedAccess != GrantedAccess)) + { + /* No match, fail */ + return FALSE; + } + } + + /* We have a match */ + return TRUE; } POBJECT_HANDLE_COUNT_ENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Mon Jan 22 12:57:10 2007 @@ -297,6 +297,7 @@ if(!WinStaPresent) { +#if 0 /* search the process handle table for (inherited) window station handles, use a more appropriate one than WinSta0 if possible. */ if (!ObFindHandleForObject(Process, @@ -304,6 +305,7 @@ ExWindowStationObjectType, NULL, (PHANDLE)hWinSta)) +#endif { /* we had no luck searching for opened handles, use WinSta0 now */ RtlInitUnicodeString(&WinSta, L"WinSta0"); @@ -312,6 +314,7 @@ if(!DesktopPresent && hDesktop != NULL) { +#if 0 /* search the process handle table for (inherited) desktop handles, use a more appropriate one than Default if possible. */ if (!ObFindHandleForObject(Process, @@ -319,6 +322,7 @@ ExDesktopObjectType, NULL, (PHANDLE)hDesktop)) +#endif { /* we had no luck searching for opened handles, use Desktop now */ RtlInitUnicodeString(&Desktop, L"Default"); @@ -496,6 +500,10 @@ DPRINT1("Unable to create a desktop handle\n"); return NULL; } + } + else + { + DPRINT1("Got handle: %lx\n", Ret); } return Ret;

1 0

[hpoussin] 25592: Fix warnings and indentation
by hpoussin＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: hpoussin Date: Mon Jan 22 12:48:26 2007 New Revision: 25592 URL: http://svn.reactos.org/svn/reactos?rev=25592&view=rev Log: Fix warnings and indentation Modified: trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/stack.c Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c Mon Jan 22 12:48:26 2007 @@ -176,15 +176,15 @@ code = -1; goto bad; } - cin = cout = s; + cin = cout = s; if (verbose) { printf("Connected to %s.\n", hostname); (void) fflush(stdout); } if (getreply(0) > 2) { /* read startup message from server */ - closesocket(cin); - code = -1; - goto bad; + closesocket(cin); + code = -1; + goto bad; } #ifdef SO_OOBINLINE { @@ -222,26 +222,26 @@ acct = pacct; } while (user == NULL) { - const char *myname = "none"; // This needs to become the usename env - - if (myname) - printf("Name (%s:%s): ", host, myname); - else - printf("Name (%s): ", host); - (void) fflush(stdout); - (void) fgets(tmp, sizeof(tmp) - 1, stdin); - tmp[strlen(tmp) - 1] = '\0'; - if (*tmp == '\0') - user = myname; - else - user = tmp; + const char *myname = "none"; // This needs to become the usename env + + if (myname) + printf("Name (%s:%s): ", host, myname); + else + printf("Name (%s): ", host); + (void) fflush(stdout); + (void) fgets(tmp, sizeof(tmp) - 1, stdin); + tmp[strlen(tmp) - 1] = '\0'; + if (*tmp == '\0') + user = myname; + else + user = tmp; } n = command("USER %s", user); if (n == CONTINUE) { if (pass == NULL) pass = getpass("Password:"); n = command("PASS %s", pass); - fflush(stdin); + fflush(stdin); } if (n == CONTINUE) { aflag++; @@ -284,7 +284,7 @@ { va_list ap; int r; - void (*oldintr)(int), cmdabort(int); + void (*oldintr)(int); abrtflag = 0; if (debug) { @@ -301,16 +301,16 @@ return (0); } oldintr = signal(SIGINT,cmdabort); - { - char buffer[1024]; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); + { + char buffer[1024]; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); //DLJ: to work through firewalls - send the command as a single message - strcat(buffer,"\r\n"); - fprintfSocket(cout, buffer); - } + strcat(buffer,"\r\n"); + fprintfSocket(cout, buffer); + } //DLJ: the following two lines are replaced by the strcat above - seems to // make it work through firewalls. // fprintfSocket(cout, "\r\n"); @@ -335,7 +335,7 @@ register int dig; register char *cp; int originalcode = 0, continuation = 0; - void (*oldintr)(int), cmdabort(int); + void (*oldintr)(int); int pflag = 0; char *pt = pasv; @@ -460,7 +460,7 @@ void sendrequest(const char *cmd, const char *local, const char *remote, int printnames) { FILE *fin; - int dout = 0; + int dout = 0; int (*closefunc)(), _pclose(), fclose(); sig_t (*oldintr)(), (*oldintp)(); char buf[BUFSIZ], *bufp; @@ -624,39 +624,39 @@ case TYPE_A: { - char buf[1024]; + char buf[1024]; static int bufsize = 1024; int ipos=0; while ((c = getc(fin)) != EOF) { - if (c == '\n') { - while (hash && (bytes >= hashbytes)) { - (void) putchar('#'); - (void) fflush(stdout); - hashbytes += HASHBYTES; - } + if (c == '\n') { + while (hash && (bytes >= hashbytes)) { + (void) putchar('#'); + (void) fflush(stdout); + hashbytes += HASHBYTES; + } // Szurgot: The following code is unncessary on Win32. -// (void) fputcSocket(dout, '\r'); -// bytes++; - } - - if (ipos >= bufsize) { - fputSocket(dout,buf,ipos); - if(!hash) (void) putchar('.'); - ipos=0; - } - buf[ipos]=c; ++ipos; - bytes++; +// (void) fputcSocket(dout, '\r'); +// bytes++; + } + + if (ipos >= bufsize) { + fputSocket(dout,buf,ipos); + if(!hash) (void) putchar('.'); + ipos=0; + } + buf[ipos]=c; ++ipos; + bytes++; } if (ipos) { fputSocket(dout,buf,ipos); ipos=0; } if (hash) { - if (bytes < hashbytes) - (void) putchar('#'); - (void) putchar('\n'); - (void) fflush(stdout); + if (bytes < hashbytes) + (void) putchar('#'); + (void) putchar('\n'); + (void) fflush(stdout); } else { (void) putchar('.'); @@ -664,13 +664,13 @@ (void) fflush(stdout); } if (ferror(fin)) - perror(local); + perror(local); // if (ferror(dout)) { // if (errno != EPIPE) // perror("netout"); // bytes = -1; // } - break; + break; } } (void) gettimeofday(&stop, (struct timezone *)0); @@ -734,13 +734,13 @@ int printnames) { FILE *fout = stdout; - int din = 0; + int din = 0; int (*closefunc)(), _pclose(), fclose(); void (*oldintr)(int), (*oldintp)(int); int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; char msg; // static char *buf; // Szurgot: Shouldn't this go SOMEWHERE? - char buf[1024]; + char buf[1024]; static int bufsize = 1024; long bytes = 0, hashbytes = HASHBYTES; // struct @@ -783,45 +783,45 @@ if (strcmp(local, "-") && *local != '|') { #ifndef _WIN32 // This whole thing is a problem... access Won't work on non-existent files - if (access(local, 2) < 0) { - char *dir = rindex(local, '/'); - - if (errno != ENOENT && errno != EACCES) { - perror(local); - (void) signal(SIGINT, oldintr); - code = -1; - return; - } - if (dir != NULL) - *dir = 0; - d = access(dir ? local : ".", 2); - if (dir != NULL) - *dir = '/'; - if (d < 0) { - perror(local); - (void) signal(SIGINT, oldintr); - code = -1; - return; - } - if (!runique && errno == EACCES && - chmod(local, 0600) < 0) { - perror(local); - (void) signal(SIGINT, oldintr); - code = -1; - return; - } - if (runique && errno == EACCES && - (local = gunique(local)) == NULL) { - (void) signal(SIGINT, oldintr); - code = -1; - return; - } - } - else if (runique && (local = gunique(local)) == NULL) { - (void) signal(SIGINT, oldintr); - code = -1; - return; - } + if (access(local, 2) < 0) { + char *dir = rindex(local, '/'); + + if (errno != ENOENT && errno != EACCES) { + perror(local); + (void) signal(SIGINT, oldintr); + code = -1; + return; + } + if (dir != NULL) + *dir = 0; + d = access(dir ? local : ".", 2); + if (dir != NULL) + *dir = '/'; + if (d < 0) { + perror(local); + (void) signal(SIGINT, oldintr); + code = -1; + return; + } + if (!runique && errno == EACCES && + chmod(local, 0600) < 0) { + perror(local); + (void) signal(SIGINT, oldintr); + code = -1; + return; + } + if (runique && errno == EACCES && + (local = gunique(local)) == NULL) { + (void) signal(SIGINT, oldintr); + code = -1; + return; + } + } + else if (runique && (local = gunique(local)) == NULL) { + (void) signal(SIGINT, oldintr); + code = -1; + return; + } #endif } if (initconn()) { @@ -926,15 +926,15 @@ // if ((d = write(fileno(fout), buf, c)) != c) // break; while ((c = recv(din, buf, bufsize, 0)) > 0) { - write(fileno(fout), buf, c); - bytes += c; - if (hash) { - while (bytes >= hashbytes) { - (void) putchar('#'); - hashbytes += HASHBYTES; - } - (void) fflush(stdout); - } + write(fileno(fout), buf, c); + bytes += c; + if (hash) { + while (bytes >= hashbytes) { + (void) putchar('#'); + hashbytes += HASHBYTES; + } + (void) fflush(stdout); + } } if (hash && bytes > 0) { if (bytes < HASHBYTES) @@ -981,23 +981,23 @@ if (c == '\n') bare_lfs++; while (c == '\r') { - while (hash && (bytes >= hashbytes)) { - (void) putchar('#'); - (void) fflush(stdout); - hashbytes += HASHBYTES; - } - bytes++; - if ((c = fgetcSocket(din)) != '\n' || tcrflag) { - if (ferror(fout)) - goto break2; - (void) putc('\r', fout); - if (c == '\0') { - bytes++; - goto contin2; - } - if (c == EOF) - goto contin2; - } + while (hash && (bytes >= hashbytes)) { + (void) putchar('#'); + (void) fflush(stdout); + hashbytes += HASHBYTES; + } + bytes++; + if ((c = fgetcSocket(din)) != '\n' || tcrflag) { + if (ferror(fout)) + goto break2; + (void) putc('\r', fout); + if (c == '\0') { + bytes++; + goto contin2; + } + if (c == EOF) + goto contin2; + } } (void) putc(c, fout); bytes++; @@ -1089,7 +1089,7 @@ fprintfSocket(cout,"%c%c",IAC,IP); msg = (char)IAC; /* send IAC in urgent mode instead of DM because UNIX places oob mark */ -/* after urgent byte rather than before as now is protocol */ +/* after urgent byte rather than before as now is protocol */ if (send(cout,&msg,1,MSG_OOB) != 1) { perror("abort"); } @@ -1154,51 +1154,51 @@ if (passivemode) { - data = socket(AF_INET, SOCK_STREAM, 0); - if (data < 0) { - perror("ftp: socket"); - return(1); - } - if ((options & SO_DEBUG) && - setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, - sizeof (on)) < 0) - perror("ftp: setsockopt (ignored)"); - if (command("PASV") != COMPLETE) { - printf("Passive mode refused.\n"); - goto bad; - } - - /* - * What we've got at this point is a string of comma - * separated one-byte unsigned integer values. - * The first four are the an IP address. The fifth is - * the MSB of the port number, the sixth is the LSB. - * From that we'll prepare a sockaddr_in. - */ - - if (sscanf(pasv,"%d,%d,%d,%d,%d,%d", - &a0, &a1, &a2, &a3, &p0, &p1) != 6) { - printf("Passive mode address scan failure. Shouldn't happen!\n"); - goto bad; - } - - bzero(&data_addr, sizeof(data_addr)); - data_addr.sin_family = AF_INET; - a = (char *)&data_addr.sin_addr.s_addr; - a[0] = a0 & 0xff; - a[1] = a1 & 0xff; - a[2] = a2 & 0xff; - a[3] = a3 & 0xff; - p = (char *)&data_addr.sin_port; - p[0] = p0 & 0xff; - p[1] = p1 & 0xff; - - if (connect(data, (struct sockaddr *)&data_addr, - sizeof(data_addr)) < 0) { - perror("ftp: connect"); - goto bad; - } - return(0); + data = socket(AF_INET, SOCK_STREAM, 0); + if (data < 0) { + perror("ftp: socket"); + return(1); + } + if ((options & SO_DEBUG) && + setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, + sizeof (on)) < 0) + perror("ftp: setsockopt (ignored)"); + if (command("PASV") != COMPLETE) { + printf("Passive mode refused.\n"); + goto bad; + } + + /* + * What we've got at this point is a string of comma + * separated one-byte unsigned integer values. + * The first four are the an IP address. The fifth is + * the MSB of the port number, the sixth is the LSB. + * From that we'll prepare a sockaddr_in. + */ + + if (sscanf(pasv,"%d,%d,%d,%d,%d,%d", + &a0, &a1, &a2, &a3, &p0, &p1) != 6) { + printf("Passive mode address scan failure. Shouldn't happen!\n"); + goto bad; + } + + bzero(&data_addr, sizeof(data_addr)); + data_addr.sin_family = AF_INET; + a = (char *)&data_addr.sin_addr.s_addr; + a[0] = a0 & 0xff; + a[1] = a1 & 0xff; + a[2] = a2 & 0xff; + a[3] = a3 & 0xff; + p = (char *)&data_addr.sin_port; + p[0] = p0 & 0xff; + p[1] = p1 & 0xff; + + if (connect(data, (struct sockaddr *)&data_addr, + sizeof(data_addr)) < 0) { + perror("ftp: connect"); + goto bad; + } + return(0); } @@ -1262,26 +1262,26 @@ int dataconn(const char *mode) { - struct sockaddr_in from; - int s, fromlen = sizeof (from); - - if (passivemode) - return (data); - - s = accept(data, (struct sockaddr *) &from, &fromlen); - if (s < 0) { - perror("ftp: accept"); - (void) closesocket(data), data = -1; - return (int) (NULL); - } + struct sockaddr_in from; + int s, fromlen = sizeof (from); + + if (passivemode) + return (data); + + s = accept(data, (struct sockaddr *) &from, &fromlen); + if (s < 0) { + perror("ftp: accept"); + (void) closesocket(data), data = -1; + return (int) (NULL); + } if(closesocket(data)) { int iret=WSAGetLastError (); fprintf(stdout,"Error closing socket(%d)\n",iret); (void) fflush(stdout); } - data = s; - return (data); + data = s; + return (data); } void ptransfer(direction, bytes, t0, t1) @@ -1356,7 +1356,7 @@ struct comvars *ip, *op; abrtflag = 0; - oldintr = signal(SIGINT, psabort); + oldintr = signal(SIGINT, psabort); if (flag) { if (proxy) return; @@ -1415,7 +1415,7 @@ (void) strncpy(ip->mo, mapout, MAXPATHLEN - 1); (ip->mo)[strlen(ip->mo)] = '\0'; (void) strcpy(mapout, op->mo); -// (void) signal(SIGINT, oldintr); +// (void) signal(SIGINT, oldintr); if (abrtflag) { abrtflag = 0; (*oldintr)(1); @@ -1816,5 +1816,5 @@ int null(void) { - return 0; -} + return 0; +} Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c Mon Jan 22 12:48:26 2007 @@ -2249,7 +2249,7 @@ const IMAGE_SECTION_HEADER* sectp, DWORD nsect, const IMAGE_DEBUG_DIRECTORY* dbg, int nDbg) { - BOOL ret; + BOOL ret = FALSE; int i; struct msc_debug_info msc_dbg; @@ -2261,8 +2261,6 @@ _SEH_TRY { - ret = FALSE; - /* First, watch out for OMAP data */ for (i = 0; i < nDbg; i++) { Modified: trunk/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stack.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stack.c (original) +++ trunk/reactos/dll/win32/dbghelp/stack.c Mon Jan 22 12:48:26 2007 @@ -109,7 +109,7 @@ if (curr_mode == stm_start) { - THREAD_BASIC_INFORMATION info; + /*THREAD_BASIC_INFORMATION info;*/ if ((frame->AddrPC.Mode == AddrModeFlat) && (frame->AddrFrame.Mode != AddrModeFlat))

1 0

[hpoussin] 25591: Fix indentation
by hpoussin＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: hpoussin Date: Mon Jan 22 12:46:01 2007 New Revision: 25591 URL: http://svn.reactos.org/svn/reactos?rev=25591&view=rev Log: Fix indentation Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/global.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/rbuild/syssetupgenerator.cpp trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/devcp… ============================================================================== --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp (original) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Mon Jan 22 12:46:01 2007 @@ -152,7 +152,7 @@ void DevCppBackend::ProcessFile(string &filepath) { // Remove the .\ at the start of the filenames - if ((filepath[0] == '.') && (filepath[1] == '\\')) filepath.erase(0, 2); + if ((filepath[0] == '.') && (filepath[1] == '\\')) filepath.erase(0, 2); if(!FileExists(filepath)) return; 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 Mon Jan 22 12:46:01 2007 @@ -106,7 +106,7 @@ size_t i; for ( i = 0; i < compilationUnits.size (); i++ ) { - CompilationUnit& compilationUnit = *compilationUnits[i]; + CompilationUnit& compilationUnit = *compilationUnits[i]; if ( compilationUnit.files.size () != 1 ) return false; } @@ -148,7 +148,7 @@ MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( module, this ); - h->AddImplicitLibraries ( module ); + h->AddImplicitLibraries ( module ); if ( use_pch && CanEnablePreCompiledHeaderSupportForModule ( module ) ) h->EnablePreCompiledHeaderSupport (); if ( module.host == HostDefault ) @@ -761,16 +761,16 @@ if ( nasmCommand.find("yasm") != std::string::npos ) { versionCommand = ssprintf ( "%s --version", - nasmCommand.c_str (), - NUL, - NUL ); + nasmCommand.c_str (), + NUL, + NUL ); } else { versionCommand = ssprintf ( "%s -v", - nasmCommand.c_str (), - NUL, - NUL ); + nasmCommand.c_str (), + NUL, + NUL ); } return GetVersionString( versionCommand ); } @@ -871,7 +871,7 @@ if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) && ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) || - ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) + ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) ) return false; else return true; @@ -1153,7 +1153,7 @@ installDirectory ) ); return system32ConfigDirectory + sSep + "default " + system32ConfigDirectory + sSep + "sam " + - system32ConfigDirectory + sSep + "security " + + system32ConfigDirectory + sSep + "security " + system32ConfigDirectory + sSep + "software " + system32ConfigDirectory + sSep + "system"; } @@ -1181,7 +1181,7 @@ fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst.inf\n", cSep, system32ConfigDirectory.c_str (), - cSep, cSep ); + cSep, cSep ); fprintf ( fMakefile, "\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jan 22 12:46:01 2007 @@ -535,10 +535,10 @@ MingwModuleHandler::GetReferencedObjectLibraryModuleCleanTargets ( vector<string>& moduleNames ) const { for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) - { - Library& library = *module.non_if_data.libraries[i]; + { + Library& library = *module.non_if_data.libraries[i]; if ( library.importedModule->type == ObjectLibrary ) - moduleNames.push_back ( GetModuleCleanTarget ( *library.importedModule ) ); + moduleNames.push_back ( GetModuleCleanTarget ( *library.importedModule ) ); } } @@ -550,7 +550,7 @@ fprintf ( fMakefile, ".PHONY: %s_clean\n", - module.name.c_str() ); + module.name.c_str() ); vector<string> referencedModuleNames; GetReferencedObjectLibraryModuleCleanTargets ( referencedModuleNames ); fprintf ( fMakefile, @@ -1188,7 +1188,7 @@ string generatedHeaderFilename = GetRpcServerHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); - string generatedServerFilename = PassThruCacheDirectory ( + string generatedServerFilename = PassThruCacheDirectory ( basename + "_s.c", backend->intermediateDirectory ); CLEAN_FILE(generatedServerFilename); @@ -1239,7 +1239,7 @@ string generatedHeaderFilename = GetRpcClientHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); - string generatedClientFilename = PassThruCacheDirectory ( + string generatedClientFilename = PassThruCacheDirectory ( basename + "_c.c", backend->intermediateDirectory ); CLEAN_FILE(generatedClientFilename); @@ -1493,10 +1493,10 @@ { vector<string> objectFiles; GetObjectsVector ( module.non_if_data, - objectFiles ); + objectFiles ); vector<string> lines; MergeStringVector ( objectFiles, - lines ); + lines ); for ( size_t i = 0; i < lines.size (); i++ ) { fprintf ( fMakefile, @@ -1518,14 +1518,14 @@ void MingwModuleHandler::GenerateRunStripCode () const { - fprintf ( fMakefile, - "ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" ); + fprintf ( fMakefile, + "ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" ); fprintf ( fMakefile, "\t$(ECHO_STRIP)\n" ); fprintf ( fMakefile, "\t${strip} -s -x -X $@\n\n" ); - fprintf ( fMakefile, - "endif\n" ); + fprintf ( fMakefile, + "endif\n" ); } void @@ -2331,7 +2331,7 @@ string linkerParameters = ssprintf ( "-Wl,-T,%s%cntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.GetBasePath ().c_str (), - cSep, + cSep, module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -3232,8 +3232,8 @@ string livecdIni = "boot" + sSep + "bootdata" + sSep + "livecd.ini"; OutputCopyCommand ( livecdIni, - "freeldr.ini", - livecdDirectory ); + "freeldr.ini", + livecdDirectory ); } void @@ -3244,8 +3244,8 @@ backend->outputDirectory ); CreateDirectory ( livecdDirectory + sSep + "loader" ); OutputCopyCommand ( freeldr, - "setupldr.sys", - livecdDirectory + sSep + "loader" ); + "setupldr.sys", + livecdDirectory + sSep + "loader" ); } void @@ -3260,7 +3260,7 @@ fprintf ( fMakefile, "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst.inf\n", cSep, reactosSystem32ConfigDirectory.c_str (), - cSep, cSep, cSep, cSep ); + cSep, cSep, cSep, cSep ); } void Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Jan 22 12:46:01 2007 @@ -791,9 +791,9 @@ void MSVCBackend::_generate_dsw_header ( FILE* OUT ) { - fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\r\n" ); - fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r\n" ); - fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Microsoft Developer Studio Workspace File, Format Version 6.00\r\n" ); + fprintf ( OUT, "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r\n" ); + fprintf ( OUT, "\r\n" ); } void @@ -803,21 +803,21 @@ std::string dsp_file, const std::vector<Dependency*>& dependencies ) { - dsp_file = DosSeparator ( std::string(".\\") + dsp_file ); - + dsp_file = DosSeparator ( std::string(".\\") + dsp_file ); + // TODO FIXME - must they be sorted? - //@dependencies = sort(@dependencies); - - fprintf ( OUT, "###############################################################################\r\n" ); - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() ); - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "Package=<5>\r\n" ); - fprintf ( OUT, "{{{\r\n" ); - fprintf ( OUT, "}}}\r\n" ); - fprintf ( OUT, "\r\n" ); - fprintf ( OUT, "Package=<4>\r\n" ); - fprintf ( OUT, "{{{\r\n" ); + //@dependencies = sort(@dependencies); + + fprintf ( OUT, "###############################################################################\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Project: \"%s\"=%s - Package Owner=<4>\r\n", module.name.c_str(), dsp_file.c_str() ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<5>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); + fprintf ( OUT, "}}}\r\n" ); + fprintf ( OUT, "\r\n" ); + fprintf ( OUT, "Package=<4>\r\n" ); + fprintf ( OUT, "{{{\r\n" ); for ( size_t i = 0; i < dependencies.size(); i++ ) { Dependency& dependency = *dependencies[i]; @@ -860,7 +860,7 @@ std::string dsp_file = DspFileName ( module ); // TODO FIXME - more wine hacks? - /*if ( module.name == "gdi32" ) + /*if ( module.name == "gdi32" ) { for ( size_t idir = 0; idir < gdi32_dirs.size(); idir++ ) { @@ -869,9 +869,9 @@ dependencies.push_back ( Replace ( "gdi32_" + dir2, "/", "_" ) ); } - }*/ + }*/ _generate_dsw_project ( OUT, module, dsp_file, module.dependencies ); - } - _generate_dsw_footer ( OUT ); + } + _generate_dsw_footer ( OUT ); } 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 Mon Jan 22 12:46:01 2007 @@ -70,7 +70,7 @@ { size_t i; - string vcproj_file = VcprojFileName(module); + string vcproj_file = VcprojFileName(module); string username = getenv ( "USERNAME" ); string computername = getenv ( "COMPUTERNAME" ); @@ -345,7 +345,7 @@ fprintf ( OUT, "%s", escaped.c_str() ); } fprintf ( OUT, "\"\r\n" ); - fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); + fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h"); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd 5=/MT @@ -630,12 +630,12 @@ fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"nasmw $(InputPath) -f coff -o "$(OutDir)\\$(InputName).obj"\"\r\n"); fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); } - else if ((tolower(source_file.at(source_file.size() - 1)) == 's')) - { - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); - } + else if ((tolower(source_file.at(source_file.size() - 1)) == 's')) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\$(InputName).obj"\"\r\n",include_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } //} Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Jan 22 12:46:01 2007 @@ -43,7 +43,7 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: + case ExportDriver: case NativeDLL: case NativeCUI: case Win32DLL: Modified: trunk/reactos/tools/rbuild/global.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/global.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/global.cpp (original) +++ trunk/reactos/tools/rbuild/global.cpp Mon Jan 22 12:46:01 2007 @@ -31,40 +31,40 @@ void InitializeEnvironment () { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + char *SepValue, *ExePostfixValue, *ExePrefixValue;; - SepValue = getenv ( "SEP" ); - if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) ) - { - cSep = SepValue[0]; - sSep = SepValue; - } - else - { - cSep = DEF_CSEP; - sSep = DEF_SSEP; - } - if ( cSep == DEF_CSEP ) - { - cBadSep = DEF_CBAD_SEP; - sBadSep = DEF_SBAD_SEP; - } - else - { - cBadSep = DEF_CSEP; - sBadSep = DEF_SSEP; - } - ExePostfixValue = getenv ( "EXEPOSTFIX" ); - ExePrefixValue = getenv ( "EXEPREFIX" ); - if ( ( ExePostfixValue == NULL || 0 == strlen ( ExePostfixValue ) ) && - ( ExePrefixValue == NULL || 0 == strlen ( ExePrefixValue ) ) ) - { - ExePostfix = DEF_EXEPOSTFIX; - ExePrefix = DEF_EXEPREFIX; - } - else - { - ExePostfix = ExePostfixValue ? ExePostfixValue : ""; - ExePrefix = ExePrefixValue ? ExePrefixValue : ""; - } + SepValue = getenv ( "SEP" ); + if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) ) + { + cSep = SepValue[0]; + sSep = SepValue; + } + else + { + cSep = DEF_CSEP; + sSep = DEF_SSEP; + } + if ( cSep == DEF_CSEP ) + { + cBadSep = DEF_CBAD_SEP; + sBadSep = DEF_SBAD_SEP; + } + else + { + cBadSep = DEF_CSEP; + sBadSep = DEF_SSEP; + } + ExePostfixValue = getenv ( "EXEPOSTFIX" ); + ExePrefixValue = getenv ( "EXEPREFIX" ); + if ( ( ExePostfixValue == NULL || 0 == strlen ( ExePostfixValue ) ) && + ( ExePrefixValue == NULL || 0 == strlen ( ExePrefixValue ) ) ) + { + ExePostfix = DEF_EXEPOSTFIX; + ExePrefix = DEF_EXEPREFIX; + } + else + { + ExePostfix = ExePostfixValue ? ExePostfixValue : ""; + ExePrefix = ExePrefixValue ? ExePrefixValue : ""; + } } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Jan 22 12:46:01 2007 @@ -785,8 +785,8 @@ return Kernel; if ( attribute.value == "kernelmodedll" ) return KernelModeDLL; - if ( attribute.value == "exportdriver" ) - return ExportDriver; + if ( attribute.value == "exportdriver" ) + return ExportDriver; if ( attribute.value == "kernelmodedriver" ) return KernelModeDriver; if ( attribute.value == "nativedll" ) @@ -855,7 +855,7 @@ return ".dll"; case KernelModeDriver: case BootLoader: - case ExportDriver: + case ExportDriver: return ".sys"; case BootSector: return ".o"; @@ -887,8 +887,8 @@ case Kernel: return "NtProcessStartup"; case KernelModeDLL: - case KernelModeDriver: - case ExportDriver: + case KernelModeDriver: + case ExportDriver: return "DriverEntry@8"; case NativeDLL: return "DllMainCRTStartup@12"; @@ -947,7 +947,7 @@ return "0x00400000"; case KernelModeDLL: case KernelModeDriver: - case ExportDriver: + case ExportDriver: return "0x00010000"; case BuildTool: case StaticLibrary: @@ -982,10 +982,10 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: + case ExportDriver: case NativeDLL: case Win32DLL: - return true; + return true; case KernelModeDriver: case NativeCUI: case Win32CUI: @@ -1019,7 +1019,7 @@ { case Kernel: case KernelModeDLL: - case ExportDriver: + case ExportDriver: case NativeDLL: case Win32DLL: case KernelModeDriver: @@ -1514,7 +1514,7 @@ return true; case Kernel: case KernelModeDLL: - case ExportDriver: + case ExportDriver: case NativeDLL: case NativeCUI: case Win32CUI: Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Jan 22 12:46:01 2007 @@ -227,7 +227,6 @@ void Project::ExecuteInvocations () { - fprintf( stderr, "ExecuteInvocations\n" ); for ( size_t i = 0; i < modules.size (); i++ ) modules[i]->InvokeModule (); } Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Mon Jan 22 12:46:01 2007 @@ -256,13 +256,13 @@ printf ( " -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); - - std::map<std::string,Backend::Factory*>::iterator iter; - for (iter = Backend::Factory::map_begin(); iter != Backend::Factory::map_end(); iter++) - { - Backend::Factory *factory = iter->second; - printf ( " %-10s %s\n", factory->Name(), factory->Description()); - } + + std::map<std::string,Backend::Factory*>::iterator iter; + for (iter = Backend::Factory::map_begin(); iter != Backend::Factory::map_end(); iter++) + { + Backend::Factory *factory = iter->second; + printf ( " %-10s %s\n", factory->Name(), factory->Description()); + } return 1; } try Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgener… ============================================================================== --- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original) +++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Mon Jan 22 12:46:01 2007 @@ -101,12 +101,12 @@ InfHostCloseFile ( inf ); } - if ( 0 != InfHostAddLine ( context, NULL ) || - 0 != InfHostAddField ( context, GetDirectoryId ( module ).c_str () ) || - 0 != InfHostAddField ( context, "" ) || - 0 != InfHostAddField ( context, module.installName.c_str () ) || - 0 != InfHostAddField ( context, GetFlags ( module ).c_str () ) ) - { + if ( 0 != InfHostAddLine ( context, NULL ) || + 0 != InfHostAddField ( context, GetDirectoryId ( module ).c_str () ) || + 0 != InfHostAddField ( context, "" ) || + 0 != InfHostAddField ( context, module.installName.c_str () ) || + 0 != InfHostAddField ( context, GetFlags ( module ).c_str () ) ) + { InfHostFreeContext ( context ); InfHostCloseFile ( inf ); throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp Mon Jan 22 12:46:01 2007 @@ -409,7 +409,7 @@ s = s + sprintf ( s, "{\n" ); s = s + sprintf ( s, " _SetPriorityClass(_GetCurrentProcess(), HIGH_PRIORITY_CLASS);\n" ); s = s + sprintf ( s, " _SetThreadPriority(_GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);\n" ); - s = s + sprintf ( s, " InitializeTests();\n" ); + s = s + sprintf ( s, " InitializeTests();\n" ); s = s + sprintf ( s, " RegisterTests();\n" ); s = s + sprintf ( s, " SetupOnce();\n" ); s = s + sprintf ( s, " PerformTests(ConsoleWrite, NULL);\n" );

1 0

[spetreolle] 25590: fix case (2nd try)
by spetreolle＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: spetreolle Date: Mon Jan 22 12:33:42 2007 New Revision: 25590 URL: http://svn.reactos.org/svn/reactos?rev=25590&view=rev Log: fix case (2nd try) Modified: trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild trunk/rosapps/tests/directory.rbuild Modified: trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/Imagelistviewer/imag… ============================================================================== --- trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild (original) +++ trunk/rosapps/tests/Imagelistviewer/imagelistviewer.rbuild Mon Jan 22 12:33:42 2007 @@ -1,8 +1,8 @@ -<module name="imagelistviewer" type="win32gui" installbase="bin" installname="imagelistviewer.exe"> +<module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> - <include base="imagelistviewer">.</include> + <include base="Imagelistviewer">.</include> <library>kernel32</library> <library>user32</library> <library>setupapi</library> Modified: trunk/rosapps/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/tests/directory.rbuild (original) +++ trunk/rosapps/tests/directory.rbuild Mon Jan 22 12:33:42 2007 @@ -115,7 +115,7 @@ <directory name="icontest"> <xi:include href="icontest/icontest.rbuild" /> </directory> -<directory name="imagelistviewer"> +<directory name="Imagelistviewer"> <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> </directory>

1 0

[spetreolle] 25589: fix case
by spetreolle＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: spetreolle Date: Mon Jan 22 12:24:42 2007 New Revision: 25589 URL: http://svn.reactos.org/svn/reactos?rev=25589&view=rev Log: fix case Modified: trunk/rosapps/tests/directory.rbuild Modified: trunk/rosapps/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/tests/directory.rbuild (original) +++ trunk/rosapps/tests/directory.rbuild Mon Jan 22 12:24:42 2007 @@ -116,7 +116,7 @@ <xi:include href="icontest/icontest.rbuild" /> </directory> <directory name="imagelistviewer"> - <xi:include href="imagelistviewer/imagelistviewer.rbuild" /> + <xi:include href="Imagelistviewer/imagelistviewer.rbuild" /> </directory>

1 0

[janderwald] 25588: - Italian translation by Daniele Forsi (dforsi at gmail dot com) - fixes bug 1990 See issue #1990 for more details.
by janderwald＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: janderwald Date: Mon Jan 22 12:14:32 2007 New Revision: 25588 URL: http://svn.reactos.org/svn/reactos?rev=25588&view=rev Log: - Italian translation by Daniele Forsi (dforsi at gmail dot com) - fixes bug 1990 See issue #1990 for more details. Added: trunk/reactos/dll/win32/syssetup/syssetup_It.rc (with props) Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc Mon Jan 22 12:14:32 2007 @@ -51,3 +51,4 @@ #include "syssetup_Es.rc" #include "syssetup_Hu.rc" #include "syssetup_Uk.rc" +#include "syssetup_It.rc" Added: trunk/reactos/dll/win32/syssetup/syssetup_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup_It.rc (added) +++ trunk/reactos/dll/win32/syssetup/syssetup_It.rc Mon Jan 22 12:14:32 2007 @@ -1,0 +1,214 @@ +/* + * PROJECT: System Setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/syssetup/syssetup_It.rc + * PURPOSE: Italian Translation of dll/win32/syssetup/syssetup_En.rc + * PROGRAMMERS: Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * Copyright (C) 2007 Daniele Forsi (dforsi at gmail.com) Italian Translation + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Benvenuti alla configurazione guidata di ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Questa procedura guidata installa ReactOS su questo computer. La procedura "\ + "deve raccogliere alcune informazioni sull'utente e sul computer "\ + "per configurare ReactOS adeguatamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Selezionare Continua per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Gli sviluppatori di ReactOS desiderano citare i seguenti progetti Open Source, "\ + "che sono stati usati (in tutto o in parte) per creare ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS è soggetto alla licenza GPL, per cui se si desidera riusarlo o ridistribuirlo "\ + "(in tutto o in parte) è necessario rispettare la GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&Mostra la GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Selezionare Continua per proseguire con la configurazione.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Scrivere il proprio nome completo e il nome della propria ditta o organizzazione.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizzazione:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri. "\ + "Se si è in rete, il nome del computer deve essere univoco.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "Nome del &computer:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "Questa procedura creerà su questo computer un account utente chiamato Administrator. "\ + "Si potrà usare questo account se si necessita l'accesso completo al computer.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "Password per &Administrator:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfermare la password:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Le impostazioni linguistiche del sistema devono coincidere con la lingua degli applicativi "\ + "che si desidera usare. Le impostazioni linguistiche dell'utente stabiliscono come appaiono "\ + "i numeri, i valori monetari e le date.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "Il formato della tastiera stabilisce i caratteri che appaiono quando si preme un tasto.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Per cambiare il formato della tastiera, selezionare Personalizza.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "P&ersonalizza...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Data e ora", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Fuso orario", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Cambia automaticamente con l'ora &legale", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installazione di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 + LTEXT "", IDC_ITEM, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "L'installazione di ReactOS è completata" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Completamento della procedura guidata di installazione di ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "La procedura guidata di installazione di ReactOS è completata.\n\n" \ + "Selezionando Fine, il computer sarà riavviato.", IDC_STATIC, 115, 40, 195, 100 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 + LTEXT "Se c'è un CD in un lettore, è necessario rimuoverlo. Poi, per riavviare "\ + "il computer, selezionare Fine.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Riconoscimenti" + IDS_ACKSUBTITLE "Le spalle su cui ReactOS poggia e le informazioni sulla licenza" + IDS_OWNERTITLE "Personalizzare il software" + IDS_OWNERSUBTITLE "La procedura usa queste informazioni su di voi per personalizzare ReactOS." + IDS_COMPUTERTITLE "Il nome del computer e la password di Administrator" + IDS_COMPUTERSUBTITLE "È necessario fornire un nome e una password di Administrator per il proprio computer." + IDS_LOCALETITLE "Impostazioni regionali" + IDS_LOCALESUBTITLE "È possibile personalizzare ReactOS per regioni e lingue differenti." + IDS_DATETIMETITLE "Data e ora" + IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio computer." + IDS_PROCESSTITLE "Titolo della pagina di avanzamento" + IDS_PROCESSSUBTITLE "Sottotitolo della pagina di avanzamento" +END + +STRINGTABLE +BEGIN + IDS_CMT_WINEFILE "Lancia Winefile" + IDS_CMT_IBROWSER "Lancia iBrowser" + IDS_CMT_GETFIREFOX "Scarica/installa Firefox" + IDS_CMT_DOWNLOADER "Scarica e installa varie applicazioni" +END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessori" + IDS_CMT_CALC "Calcolatrice" + IDS_CMT_CMD "Apri la finestra dei comandi" + IDS_CMT_EXPLORER "Lancia Explorer" + IDS_CMT_NOTEPAD "Lancia l'editor dei testi" + IDS_CMT_REGEDIT "Lancia l'editor del registro" + IDS_CMT_WORDPAD "Lancia l'editor dei documenti" + IDS_CMT_SCREENSHOT "Salva una schermata" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Giochi" + IDS_CMT_SOLITAIRE "Solitario" + IDS_CMT_WINEMINE "Campo minato" +END + +STRINGTABLE +BEGIN +IDS_REACTOS_SETUP "Installazione di ReactOS" + IDS_UNKNOWN_ERROR "Errore sconosciuto" + IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." + IDS_LOADLIBRARY_FAILED "LoadLibrary fallito: " + IDS_GETPROCADDR_FAILED "GetProcAddr fallito: " + IDS_REGSVR_FAILED "DllRegisterServer fallito: " + IDS_DLLINSTALL_FAILED "DllInstall fallito: " + IDS_TIMEOUT "Tempo scaduto durante la registrazione" + IDS_REASON_UNKNOWN "" +END + +/* EOF */ Propchange: trunk/reactos/dll/win32/syssetup/syssetup_It.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ion] 25587: - Proper fix for the bug that 25558 attempted to fix. Kernel-mode registry handles now work (they didn't before 25558). - Also the system now boots again since this fix is correct.
by ion＠svn.reactos.org 22 Jan '07

22 Jan '07

Author: ion Date: Mon Jan 22 11:46:56 2007 New Revision: 25587 URL: http://svn.reactos.org/svn/reactos?rev=25587&view=rev Log: - Proper fix for the bug that 25558 attempted to fix. Kernel-mode registry handles now work (they didn't before 25558). - Also the system now boots again since this fix is correct. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Mon Jan 22 11:46:56 2007 @@ -49,7 +49,8 @@ */ { HANDLE_TABLE_ENTRY NewEntry; - PEPROCESS Process, CurrentProcess; + PEPROCESS CurrentProcess; + PVOID HandleTable; POBJECT_HEADER ObjectHeader; HANDLE Handle; KAPC_STATE ApcState; @@ -90,22 +91,20 @@ if ((HandleAttributes & OBJ_KERNEL_HANDLE) && ExGetPreviousMode() == KernelMode) { - Process = PsInitialSystemProcess; - if (Process != CurrentProcess) + HandleTable = ObpKernelHandleTable; + if (PsGetCurrentProcess() != PsInitialSystemProcess) { - KeStackAttachProcess(&Process->Pcb, + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); AttachedToProcess = TRUE; } } else { - Process = CurrentProcess; - /* mask out the OBJ_KERNEL_HANDLE attribute */ - HandleAttributes &= ~OBJ_KERNEL_HANDLE; - } - - Handle = ExCreateHandle(Process->ObjectTable, + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + Handle = ExCreateHandle(HandleTable, &NewEntry); if (AttachedToProcess)

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