Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[fireball] 15049: Make intl.cpl really switch InstallLanguage and Default entries of NLS\Language key. Problem with freeldr solved in hacky way - it writes now e.g. "0409" and not "00000409", as it generally should.
by fireball＠svn.reactos.com 06 May '05

06 May '05

Make intl.cpl really switch InstallLanguage and Default entries of NLS\Language key. Problem with freeldr solved in hacky way - it writes now e.g. "0409" and not "00000409", as it generally should. Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-06 16:07:51 UTC (rev 15048) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-06 16:21:30 UTC (rev 15049) @@ -83,40 +83,43 @@ (LPARAM)langSel); } -/* -static VOID -ShowLanguagesList(HWND hwnd) +// Sets new locale +void SetNewLocale(LCID lcid) { - TIME_ZONE_INFORMATION TimeZoneInfo; - PTIMEZONE_ENTRY Entry; - DWORD dwIndex; - DWORD i; + // HKCU\\Control Panel\\International\\Locale = 0409 (type=0) + // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x0000000 0,"0409" (type=0) + // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0 x00000000,"0409" (type=0) - GetTimeZoneInformation(&TimeZoneInfo); + // Set locale + HKEY localeKey; + HKEY langKey; + DWORD ret; + TCHAR value[9]; - dwIndex = 0; - i = 0; - Entry = TimeZoneListHead; - while (Entry != NULL) - { - SendMessageW(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)Entry->Description); + ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); - if (!wcscmp(Entry->StandardName, TimeZoneInfo.StandardName)) - dwIndex = i; + if (ret != ERROR_SUCCESS) + { + // some serious error + //TODO: Tell user about it + return; + } - i++; - Entry = Entry->Next; - } + wsprintf(value, L"%04x", (DWORD)lcid); - SendMessageW(hwnd, - CB_SETCURSEL, - (WPARAM)dwIndex, - 0); + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, sizeof(value)); + RegCloseKey(localeKey); + + // Set language + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &langKey); + + if (ret != ERROR_SUCCESS) + return; + + RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, sizeof(value)); + RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, sizeof(value)); + RegCloseKey(langKey); } -*/ /* Property page dialog callback */ INT_PTR CALLBACK @@ -150,7 +153,6 @@ // Apply changes LCID NewLcid; int iCurSel; - char tmp[100]; // Acquire new value iCurSel = SendMessageW(hList, @@ -167,12 +169,10 @@ if (NewLcid == CB_ERR) break; - - - //TOOD: Actually set new locale - - sprintf(tmp, "%x, cursel=%d", NewLcid, iCurSel); - MessageBoxA(hwndDlg, tmp, "debug", MB_OK); + + + // Actually set new locale + SetNewLocale(NewLcid); } } break;

1 0

[weiden] 15048: - fixed ConnectNamedPipe to properly wait on completion for synchronous operations
by weiden＠svn.reactos.com 06 May '05

06 May '05

- fixed ConnectNamedPipe to properly wait on completion for synchronous operations - prevent completion port notification by not passing an APC context to the kernel when the low-order bit of the event handle is set (for asynchronous operations) Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-05-06 16:05:37 UTC (rev 15047) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-05-06 16:07:51 UTC (rev 15048) @@ -300,55 +300,71 @@ * @implemented */ BOOL STDCALL -ConnectNamedPipe(HANDLE hNamedPipe, - LPOVERLAPPED lpOverlapped) +ConnectNamedPipe(IN HANDLE hNamedPipe, + IN LPOVERLAPPED lpOverlapped) { - PIO_STATUS_BLOCK IoStatusBlock; - IO_STATUS_BLOCK Iosb; - HANDLE hEvent; - NTSTATUS Status; + NTSTATUS Status; + + if (lpOverlapped != NULL) + { + PVOID ApcContext; + + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtFsControlFile(hNamedPipe, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + FSCTL_PIPE_LISTEN, + NULL, + 0, + NULL, + 0); - if (lpOverlapped != NULL) - { - lpOverlapped->Internal = STATUS_PENDING; - hEvent = lpOverlapped->hEvent; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverlapped; - } - else - { - IoStatusBlock = &Iosb; - hEvent = NULL; - } + /* return FALSE in case of failure and pending operations! */ + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + SetLastErrorByStatus(Status); + return FALSE; + } + } + else + { + IO_STATUS_BLOCK Iosb; + + Status = NtFsControlFile(hNamedPipe, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_PIPE_LISTEN, + NULL, + 0, + NULL, + 0); - Status = NtFsControlFile(hNamedPipe, - hEvent, - NULL, - NULL, - IoStatusBlock, - FSCTL_PIPE_LISTEN, - NULL, - 0, - NULL, - 0); - if ((lpOverlapped == NULL) && (Status == STATUS_PENDING)) - { - Status = NtWaitForSingleObject(hNamedPipe, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } + /* wait in case operation is pending */ + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hNamedPipe, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } - if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) || - (Status == STATUS_PENDING)) - { - SetLastErrorByStatus(Status); - return FALSE; - } + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + } - return TRUE; + return TRUE; }

1 0

[chorns] 15047: Add <module>_install target
by chorns＠svn.reactos.com 06 May '05

06 May '05

Add <module>_install target Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-06 16:02:04 UTC (rev 15046) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-06 16:05:37 UTC (rev 15047) @@ -283,6 +283,7 @@ h.Process (); h.GenerateInvocations (); h.GenerateCleanTarget (); + h.GenerateInstallTarget (); delete v[i]; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-06 16:02:04 UTC (rev 15046) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-06 16:05:37 UTC (rev 15047) @@ -440,6 +440,27 @@ fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() ); } +void +MingwModuleHandler::GenerateInstallTarget () const +{ + if ( module.installName.length () == 0 ) + return; + fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() ); + fprintf ( fMakefile, "%s_install:\n", module.name.c_str() ); + string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( module.GetPath () ), + backend->outputDirectory ); + string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( module.installBase + SSEP + module.installName ), + backend->installDirectory ); + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + sourceFilename.c_str (), + normalizedTargetFilename.c_str () ); +} + string MingwModuleHandler::GetObjectFilenames () { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-06 16:02:04 UTC (rev 15046) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-06 16:05:37 UTC (rev 15047) @@ -54,6 +54,7 @@ virtual std::string TypeSpecificLinkerFlags() { return ""; } void GenerateInvocations () const; void GenerateCleanTarget () const; + void GenerateInstallTarget () const; static bool ReferenceObjects ( const Module& module ); protected: std::string GetWorkingDirectory () const;

1 0

[chorns] 15046: Add missing files
by chorns＠svn.reactos.com 06 May '05

06 May '05

Add missing files Added: branches/xmlbuildsystem/reactos/lib/kbdru/kbdru.xml Added: branches/xmlbuildsystem/reactos/lib/kbdsg/kbdsg.xml _____ Added: branches/xmlbuildsystem/reactos/lib/kbdru/kbdru.xml --- branches/xmlbuildsystem/reactos/lib/kbdru/kbdru.xml 2005-05-06 15:55:28 UTC (rev 15045) +++ branches/xmlbuildsystem/reactos/lib/kbdru/kbdru.xml 2005-05-06 16:02:04 UTC (rev 15046) @@ -0,0 +1,7 @@ +<module name="kbdru" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdru.dll" warnings="true"> + <importlibrary definition="kbdru.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdru.c</file> + <file>kbdru.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/kbdru/kbdru.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: branches/xmlbuildsystem/reactos/lib/kbdsg/kbdsg.xml --- branches/xmlbuildsystem/reactos/lib/kbdsg/kbdsg.xml 2005-05-06 15:55:28 UTC (rev 15045) +++ branches/xmlbuildsystem/reactos/lib/kbdsg/kbdsg.xml 2005-05-06 16:02:04 UTC (rev 15046) @@ -0,0 +1,7 @@ +<module name="kbdsg" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsg.dll" warnings="true"> + <importlibrary definition="kbdsg.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdsg.c</file> + <file>kbdsg.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/kbdsg/kbdsg.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[weiden] 15045: - fixed DeviceIoControl to properly wait on completion for synchronous operations
by weiden＠svn.reactos.com 06 May '05

06 May '05

- fixed DeviceIoControl to properly wait on completion for synchronous operations - prevent completion port notification by not passing an APC context to the kernel when the low-order bit of the event handle is set (for asynchronous operations) Modified: trunk/reactos/lib/kernel32/file/deviceio.c _____ Modified: trunk/reactos/lib/kernel32/file/deviceio.c --- trunk/reactos/lib/kernel32/file/deviceio.c 2005-05-06 14:12:25 UTC (rev 15044) +++ trunk/reactos/lib/kernel32/file/deviceio.c 2005-05-06 15:55:28 UTC (rev 15045) @@ -20,115 +20,129 @@ */ BOOL STDCALL -DeviceIoControl( - HANDLE hDevice, - DWORD dwIoControlCode, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - LPDWORD lpBytesReturned, - LPOVERLAPPED lpOverlapped - ) +DeviceIoControl(IN HANDLE hDevice, + IN DWORD dwIoControlCode, + IN LPVOID lpInBuffer OPTIONAL, + IN DWORD nInBufferSize OPTIONAL, + OUT LPVOID lpOutBuffer OPTIONAL, + IN DWORD nOutBufferSize OPTIONAL, + OUT LPDWORD lpBytesReturned OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) { - NTSTATUS errCode = 0; - HANDLE hEvent = NULL; - PIO_STATUS_BLOCK IoStatusBlock; - IO_STATUS_BLOCK IIosb; + BOOL FsIoCtl; + NTSTATUS Status; + + FsIoCtl = ((dwIoControlCode >> 16) == FILE_DEVICE_FILE_SYSTEM); - BOOL bFsIoControlCode = FALSE; + if (lpBytesReturned != NULL) + { + *lpBytesReturned = 0; + } - DPRINT("DeviceIoControl(hDevice %x dwIoControlCode %d lpInBuffer %x " - "nInBufferSize %d lpOutBuffer %x nOutBufferSize %d " - "lpBytesReturned %x lpOverlapped %x)\n", - hDevice,dwIoControlCode,lpInBuffer,nInBufferSize,lpOutBuffer, - nOutBufferSize,lpBytesReturned,lpOverlapped); + if (lpOverlapped != NULL) + { + PVOID ApcContext; + + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); - if (lpBytesReturned == NULL) - { - DPRINT("DeviceIoControl() - returning STATUS_INVALID_PARAMETER\n"); - SetLastErrorByStatus (STATUS_INVALID_PARAMETER); - return FALSE; - } - // - // TODO: Review and approve this change by RobD. IoCtrls for Serial.sys were - // going to NtFsControlFile instead of NtDeviceIoControlFile. - // Don't know at this point if anything else is affected by this change. - // - // if (((dwIoControlCode >> 16) & FILE_DEVICE_FILE_SYSTEM) == FILE_DEVICE_FILE_SYSTEM) { - // + if (FsIoCtl) + { + Status = NtFsControlFile(hDevice, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); + } + else + { + Status = NtDeviceIoControlFile(hDevice, + lpOverlapped->hEvent, + NULL, + ApcContext, + (PIO_STATUS_BLOCK)lpOverlapped, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); + } - if ((dwIoControlCode >> 16) == FILE_DEVICE_FILE_SYSTEM) { + /* return FALSE in case of failure and pending operations! */ + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + SetLastErrorByStatus(Status); + return FALSE; + } - bFsIoControlCode = TRUE; - DPRINT("DeviceIoControl() - FILE_DEVICE_FILE_SYSTEM == TRUE %x %x\n", dwIoControlCode, dwIoControlCode >> 16); - } else { - bFsIoControlCode = FALSE; - DPRINT("DeviceIoControl() - FILE_DEVICE_FILE_SYSTEM == FALSE %x %x\n", dwIoControlCode, dwIoControlCode >> 16); - } + if (lpBytesReturned != NULL) + { + *lpBytesReturned = lpOverlapped->InternalHigh; + } + } + else + { + IO_STATUS_BLOCK Iosb; + + if (FsIoCtl) + { + Status = NtFsControlFile(hDevice, + NULL, + NULL, + NULL, + &Iosb, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); + } + else + { + Status = NtDeviceIoControlFile(hDevice, + NULL, + NULL, + NULL, + &Iosb, + dwIoControlCode, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize); + } - if(lpOverlapped != NULL) - { - hEvent = lpOverlapped->hEvent; - lpOverlapped->Internal = STATUS_PENDING; - IoStatusBlock = (PIO_STATUS_BLOCK)lpOverlapped; - } - else - { - IoStatusBlock = &IIosb; - } + /* wait in case operation is pending */ + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hDevice, + FALSE, + NULL); + if (NT_SUCCESS(Status)) + { + Status = Iosb.Status; + } + } - if (bFsIoControlCode == TRUE) - { - errCode = NtFsControlFile (hDevice, - hEvent, - NULL, - NULL, - IoStatusBlock, - dwIoControlCode, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize); - } - else - { - errCode = NtDeviceIoControlFile (hDevice, - hEvent, - NULL, - NULL, - IoStatusBlock, - dwIoControlCode, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize); - } + if (NT_SUCCESS(Status)) + { + /* lpBytesReturned must not be NULL here, in fact Win doesn't + check that case either and crashes (only after the operation + completed) */ + *lpBytesReturned = Iosb.Information; + } + else + { + SetLastErrorByStatus(Status); + return FALSE; + } + } - if (errCode == STATUS_PENDING) - { - DPRINT("DeviceIoControl() - STATUS_PENDING\n"); - if (NtWaitForSingleObject(hDevice,FALSE,NULL) < 0) - { - *lpBytesReturned = IoStatusBlock->Information; - SetLastErrorByStatus (errCode); - DPRINT("DeviceIoControl() - STATUS_PENDING wait failed.\n"); - return FALSE; - } - } - else if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus (errCode); - DPRINT("DeviceIoControl() - ERROR: %x\n", errCode); - return FALSE; - } - - if (lpOverlapped) - *lpBytesReturned = lpOverlapped->InternalHigh; - else - *lpBytesReturned = IoStatusBlock->Information; - - return TRUE; + return TRUE; }

1 0

[chorns] 15044: More sane default image base addresses
by chorns＠svn.reactos.com 06 May '05

06 May '05

More sane default image base addresses Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-06 14:02:45 UTC (rev 15043) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-06 14:12:25 UTC (rev 15044) @@ -564,21 +564,18 @@ { case Kernel: return "0xc0000000"; - case KernelModeDLL: - return "0x10000"; + case Win32DLL: + return "0x10000000"; case NativeDLL: - return "0x10000"; case NativeCUI: - return "0x10000"; - case Win32DLL: - return "0x10000"; case Win32CUI: case Test: return "0x00400000"; case Win32GUI: return "0x00400000"; + case KernelModeDLL: case KernelModeDriver: - return "0x10000"; + return "0x00010000"; case BuildTool: case StaticLibrary: case ObjectLibrary:

1 0

[hbirr] 15042: Revert my last changes.
by hbirr＠svn.reactos.com 06 May '05

06 May '05

Revert my last changes. Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-05-06 12:22:35 UTC (rev 15041) +++ trunk/reactos/lib/kernel32/process/create.c 2005-05-06 13:35:27 UTC (rev 15042) @@ -275,6 +275,7 @@ return bRetVal; } + static EXCEPTION_DISPOSITION __cdecl _except_handler(EXCEPTION_RECORD *ExceptionRecord, void * EstablisherFrame, @@ -322,34 +323,14 @@ DWORD lpParameter) { UINT uExitCode = 0; -#if 1 - PVOID OldHandler; -#endif DPRINT("BaseProcessStart(..) - setting up exception frame.\n"); -#if 1 - __asm__ __volatile__ ("movl %%fs:0, %0\n\t" \ - "movl %1, %%fs:0\n\t" \ - : "=r" (OldHandler) - : "r" (_except_handler)); -#else - /* FIXME: - * We cannot use push (__try1) and pop (__except1). - * Gcc doesn't like it, if anyone changes the stack layout. - */ __try1(_except_handler) -#endif { uExitCode = (lpStartAddress)((PVOID)lpParameter); - } -#if 1 - __asm__ __volatile__ ("movl %0, %%fs:0\n\t" \ - : - : "r" (OldHandler)); -#else - __except1 -#endif + } __except1 + ExitProcess(uExitCode); }

1 0

[chorns] 15041: Build dhcp
by chorns＠svn.reactos.com 06 May '05

06 May '05

Build dhcp Added: branches/xmlbuildsystem/reactos/subsys/system/dhcp/dhcp.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml _____ Added: branches/xmlbuildsystem/reactos/subsys/system/dhcp/dhcp.xml --- branches/xmlbuildsystem/reactos/subsys/system/dhcp/dhcp.xml 2005-05-06 12:17:29 UTC (rev 15040) +++ branches/xmlbuildsystem/reactos/subsys/system/dhcp/dhcp.xml 2005-05-06 12:22:35 UTC (rev 15041) @@ -0,0 +1,26 @@ +<module name="dhcp" type="win32gui" installbase="system32" installname="dhcp.exe" warnings="true"> + <include base="dhcp">.</include> + <include base="dhcp">include</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>adapter.c</file> + <file>alloc.c</file> + <file>api.c</file> + <file>compat.c</file> + <file>dhclient.c</file> + <file>dispatch.c</file> + <file>hash.c</file> + <file>options.c</file> + <file>pipe.c</file> + <file>privsep.c</file> + <file>socket.c</file> + <file>tables.c</file> + <file>timer.c</file> + <file>util.c</file> + <file>dhcp.rc</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/subsys/system/dhcp/dhcp.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-05-06 12:17:29 UTC (rev 15040) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-05-06 12:22:35 UTC (rev 15041) @@ -7,6 +7,9 @@ <directory name="cmd"> <xi:include href="cmd/cmd.xml" /> </directory> +<directory name="dhcp"> + <xi:include href="dhcp/dhcp.xml" /> +</directory> <directory name="explorer"> <xi:include href="explorer/explorer.xml" /> </directory>

1 0

[hbirr] 15040: Do not modify the stack layout of a function by using inline assembler.
by hbirr＠svn.reactos.com 06 May '05

06 May '05

Do not modify the stack layout of a function by using inline assembler. Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-05-06 11:53:35 UTC (rev 15039) +++ trunk/reactos/lib/kernel32/process/create.c 2005-05-06 12:17:29 UTC (rev 15040) @@ -275,7 +275,6 @@ return bRetVal; } - static EXCEPTION_DISPOSITION __cdecl _except_handler(EXCEPTION_RECORD *ExceptionRecord, void * EstablisherFrame, @@ -323,14 +322,34 @@ DWORD lpParameter) { UINT uExitCode = 0; +#if 1 + PVOID OldHandler; +#endif DPRINT("BaseProcessStart(..) - setting up exception frame.\n"); +#if 1 + __asm__ __volatile__ ("movl %%fs:0, %0\n\t" \ + "movl %1, %%fs:0\n\t" \ + : "=r" (OldHandler) + : "r" (_except_handler)); +#else + /* FIXME: + * We cannot use push (__try1) and pop (__except1). + * Gcc doesn't like it, if anyone changes the stack layout. + */ __try1(_except_handler) +#endif { uExitCode = (lpStartAddress)((PVOID)lpParameter); - } __except1 - + } +#if 1 + __asm__ __volatile__ ("movl %0, %%fs:0\n\t" \ + : + : "r" (OldHandler)); +#else + __except1 +#endif ExitProcess(uExitCode); }

1 0

[hpoussin] 15039: Revert ntoskrnl/cm/regobj.c back to revision 14017
by hpoussin＠svn.reactos.com 06 May '05

06 May '05

Revert ntoskrnl/cm/regobj.c back to revision 14017 Modified: trunk/reactos/ntoskrnl/cm/regobj.c _____ Modified: trunk/reactos/ntoskrnl/cm/regobj.c --- trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-06 11:20:10 UTC (rev 15038) +++ trunk/reactos/ntoskrnl/cm/regobj.c 2005-05-06 11:53:35 UTC (rev 15039) @@ -91,7 +91,7 @@ { ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return Status; } if (FoundObject == NULL) @@ -107,7 +107,7 @@ { ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); } @@ -140,7 +140,7 @@ wcscat(TargetPath.Buffer, EndPtr); } - ExFreePool(FullPath->Buffer); + RtlFreeUnicodeString(FullPath); RtlFreeUnicodeString(&LinkPath); FullPath->Length = TargetPath.Length; FullPath->MaximumLength = TargetPath.MaximumLength; @@ -153,7 +153,7 @@ *NextObject = NULL; - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return(STATUS_REPARSE); } } @@ -173,7 +173,7 @@ { ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return(Status); } /* Add the keep-alive reference */ @@ -224,8 +224,8 @@ wcscat(TargetPath.Buffer, EndPtr); } - ExFreePool(FullPath->Buffer); - ExFreePool(LinkPath.Buffer); + RtlFreeUnicodeString(FullPath); + RtlFreeUnicodeString(&LinkPath); FullPath->Length = TargetPath.Length; FullPath->MaximumLength = TargetPath.MaximumLength; FullPath->Buffer = TargetPath.Buffer; @@ -237,7 +237,7 @@ *NextObject = NULL; - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return(STATUS_REPARSE); } } @@ -258,7 +258,7 @@ *NextObject = FoundObject; - ExFreePool(KeyName.Buffer); + RtlFreeUnicodeString(&KeyName); return(STATUS_SUCCESS); }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
82
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 May 2005