Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 37074: Merging r37048, r37051, r37052, r37055 from the-real-msvc branch
by hyperion＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: hyperion Date: Wed Oct 29 15:06:44 2008 New Revision: 37074 URL: http://svn.reactos.org/svn/reactos?rev=37074&view=rev Log: Merging r37048, r37051, r37052, r37055 from the-real-msvc branch Added: trunk/reactos/drivers/bus/acpi/include/platform/acmsc.h - copied unchanged from r37048, branches/the-real-msvc/drivers/bus/acpi/include/platform/acmsc.h Removed: trunk/reactos/lib/3rdparty/mingw/strcasecmp.c trunk/reactos/lib/3rdparty/mingw/strncasecmp.c trunk/reactos/lib/3rdparty/mingw/wcscmpi.c Modified: trunk/reactos/base/system/smss/smss.h trunk/reactos/drivers/bus/acpi/include/platform/acwin.h trunk/reactos/lib/3rdparty/mingw/crt1.c trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/res.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/string/ctype.c Modified: trunk/reactos/base/system/smss/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.h?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.h [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -2,6 +2,7 @@ #define _SMSS_H_INCLUDED_ #include <stdio.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER Modified: trunk/reactos/drivers/bus/acpi/include/platform/acwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/p… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/platform/acwin.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/platform/acwin.h [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -47,14 +47,25 @@ #endif -/* ReactOS uses GCC */ +#if defined(__GNUC__) #include "acgcc.h" #undef disable -#define disable() __asm__("cli\n\t"); +#define disable() __asm__("cli\n\t") #undef enable -#define enable() __asm__("sti\n\t"); +#define enable() __asm__("sti\n\t") + +#elif defined(_MSC_VER) + +#include "acmsc.h" + +#undef disable +#define disable() __asm { cli } +#undef enable +#define enable() __asm { sti } + +#endif #undef DEBUGGER_THREADING #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED Modified: trunk/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt1.c?… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crt1.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crt1.c [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -220,6 +220,7 @@ _pei386_runtime_relocator (); #endif +#if defined(__GNUC__) #if defined(__i386__) /* Align the stack to 16 bytes for the sake of SSE ops in main or in functions inlined into main. */ @@ -233,6 +234,17 @@ #else #error Unsupported architecture #endif +#elif defined(_MSC_VER) +#if defined(_M_IX86) + /* Align the stack to 16 bytes for the sake of SSE ops in main + or in functions inlined into main. */ + __asm and esp, 0FFFFFFF0h +#else +#error TODO +#endif +#else +#error TODO +#endif /* * Call the main function. If the user does not supply one Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -13,10 +13,7 @@ <file>isascii.c</file> <file>iscsym.c</file> <file>iscsymf.c</file> - <file>strcasecmp.c</file> - <file>strncasecmp.c</file> <file>toascii.c</file> - <file>wcscmpi.c</file> <file>_wgetopt.c</file> <if property="ARCH" value="i386"> <file>pseudo-reloc.c</file> Removed: trunk/reactos/lib/3rdparty/mingw/strcasecmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/strcase… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/strcasecmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/strcasecmp.c (removed) @@ -1,21 +1,0 @@ -/* - * strcasecmp.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -strcasecmp (const char *sz1, const char *sz2) -{ - return _stricmp (sz1, sz2); -} - Removed: trunk/reactos/lib/3rdparty/mingw/strncasecmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/strncas… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/strncasecmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/strncasecmp.c (removed) @@ -1,21 +1,0 @@ -/* - * strncasecmp.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare) -{ - return _strnicmp (sz1, sz2, sizeMaxCompare); -} - Removed: trunk/reactos/lib/3rdparty/mingw/wcscmpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wcscmpi… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/wcscmpi.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/wcscmpi.c (removed) @@ -1,21 +1,0 @@ -/* - * wcscmpi.c - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. - * - * Oldnames from ANSI header string.h - * - * Some wrapper functions for those old name functions whose appropriate - * equivalents are not simply underscore prefixed. - * - */ - -#include <string.h> - -int -wcscmpi (const wchar_t * ws1, const wchar_t * ws2) -{ - return _wcsicmp (ws1, ws2); -} - Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=37074&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -79,7 +79,7 @@ /* Copy it */ strncpy(Buffer, Prefix, PrefixLength); - + /* Do the printf */ Length = _vsnprintf(Buffer + PrefixLength, sizeof(Buffer) - PrefixLength, @@ -109,7 +109,7 @@ /* Add the prefix */ Length += PrefixLength; } - + /* Build the string */ DebugString.Length = Length; DebugString.Buffer = Buffer; @@ -202,17 +202,19 @@ DbgPrint(PCCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format, ap, TRUE); va_end(ap); + return n; } /* @@ -225,17 +227,19 @@ IN PCCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", ComponentId, Level, Format, ap, TRUE); va_end(ap); + return n; } /* @@ -246,16 +250,19 @@ DbgPrintReturnControlC(PCH Format, ...) { + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal("", + n = vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format, ap, FALSE); + va_end(ap); + return n; } /* Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=37074&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -60,7 +60,7 @@ */ int push_language( USHORT *list, ULONG pos, WORD lang ) { - int i; + ULONG i; for (i = 0; i < pos; i++) if (list[i] == lang) return pos; list[pos++] = lang; return pos; Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=37074&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -31,9 +31,7 @@ #include <reactos/helper.h> #include <pseh/pseh.h> -#ifndef _MSC_VER #include <intrin.h> -#endif #endif /* RTL_H */ Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -1,11 +1,19 @@ #include <precomp.h> #include <math.h> +#if defined(__GNUC__) #define FPU_DOUBLE(var) double var; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) #define FPU_DOUBLES(var1,var2) double var1,var2; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) +#elif defined(_MSC_VER) +#define FPU_DOUBLE(var) double var; \ + __asm { fstp [var] }; __asm { fwait }; +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm { fstp [var1] }; __asm { fwait }; \ + __asm { fstp [var2] }; __asm { fwait }; +#endif /* * @implemented Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Wed Oct 29 15:06:44 2008 @@ -591,7 +591,7 @@ /* * @implemented */ -wchar_t towlower(wchar_t c) +wint_t towlower(wint_t c) { if (iswctype (c, _UPPER)) return (c - upalpha); @@ -601,7 +601,7 @@ /* * @implemented */ -wchar_t towupper(wchar_t c) +wint_t towupper(wint_t c) { if (iswctype (c, _LOWER)) return (c + upalpha);

1 0

[mjmartin] 37073: - Implement VirtualMemoryInformationClass of MemorySectionName for NtQueryVirtualMemory.
by mjmartin＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: mjmartin Date: Wed Oct 29 14:50:55 2008 New Revision: 37073 URL: http://svn.reactos.org/svn/reactos?rev=37073&view=rev Log: - Implement VirtualMemoryInformationClass of MemorySectionName for NtQueryVirtualMemory. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Wed Oct 29 14:50:55 2008 @@ -947,6 +947,9 @@ NTSTATUS Status = STATUS_SUCCESS; SIZE_T ResultLength = 0; KPROCESSOR_MODE PreviousMode; + WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; + UNICODE_STRING ModuleFileName; + PMEMORY_SECTION_NAME SectionName = NULL; union { MEMORY_BASIC_INFORMATION BasicInfo; @@ -985,13 +988,58 @@ return STATUS_INVALID_PARAMETER; } - Status = MiQueryVirtualMemory(ProcessHandle, - Address, - VirtualMemoryInformationClass, - &VirtualMemoryInfo, - Length, - &ResultLength ); - + /* FIXME: Move this inside MiQueryVirtualMemory */ + if (VirtualMemoryInformationClass == MemorySectionName) + { + RtlInitEmptyUnicodeString(&ModuleFileName, ModuleFileNameBuffer, sizeof(ModuleFileNameBuffer)); + Status = MmGetFileNameForAddress(Address, &ModuleFileName); + + if (NT_SUCCESS(Status)) + { + SectionName = VirtualMemoryInformation; + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + RtlInitUnicodeString(&SectionName->SectionFileName, SectionName->NameBuffer); + SectionName->SectionFileName.MaximumLength = Length; + RtlCopyUnicodeString(&SectionName->SectionFileName, &ModuleFileName); + + if (UnsafeResultLength != NULL) + { + *UnsafeResultLength = ModuleFileName.Length; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + RtlInitUnicodeString(&SectionName->SectionFileName, SectionName->NameBuffer); + SectionName->SectionFileName.MaximumLength = Length; + RtlCopyUnicodeString(&SectionName->SectionFileName, &ModuleFileName); + + if (UnsafeResultLength != NULL) + { + *UnsafeResultLength = ModuleFileName.Length; + } + } + } + return Status; + } + else + { + Status = MiQueryVirtualMemory(ProcessHandle, + Address, + VirtualMemoryInformationClass, + &VirtualMemoryInfo, + Length, + &ResultLength); + } + if (NT_SUCCESS(Status)) { if (PreviousMode != KernelMode)

1 0

[jimtabor] 37072: - Update width info structure.
by jimtabor＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: jimtabor Date: Wed Oct 29 14:44:12 2008 New Revision: 37072 URL: http://svn.reactos.org/svn/reactos?rev=37072&view=rev Log: - Update width info structure. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Wed Oct 29 14:44:12 2008 @@ -218,11 +218,11 @@ typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; typedef LONG FIX; -typedef struct _CHWIDTHINFO -{ - LONG lMaxNegA; - LONG lMaxNegC; - LONG lMinWidthD; +typedef struct _CHWIDTHINFO // Based on FD_DEVICEMETRICS +{ + LONG lMinA; + LONG lMinC; + LONG lMinD; } CHWIDTHINFO, *PCHWIDTHINFO; typedef struct _UNIVERSAL_FONT_ID

1 0

[janderwald] 37071: - Launch Network Connections ShellFolder when clicking Network Places' properties - Dedicated to gabriel_it
by janderwald＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: janderwald Date: Wed Oct 29 12:49:00 2008 New Revision: 37071 URL: http://svn.reactos.org/svn/reactos?rev=37071&view=rev Log: - Launch Network Connections ShellFolder when clicking Network Places' properties - Dedicated to gabriel_it Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Wed Oct 29 12:49:00 2008 @@ -1404,10 +1404,10 @@ } else if (_ILIsNetHood(This->dcm.apidl[0])) { - /* FIXME - * implement nethood properties - */ - FIXME("implement network connection shell folder\n"); + //FIXME path! + ShellExecuteW(NULL, L"open", L"explorer.exe", + L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, SW_SHOWDEFAULT); return S_OK; } else if (_ILIsBitBucket(This->dcm.apidl[0]))

1 0

[cfinck] 37070: Don't decide whether to preprocess .spec files based on Kernel-Mode vs. User-Mode, but on the file extension. .pspec files are preprocessed now, while .spec files aren't. A change like this was already done in the amd64 branch before KJK rewrote the .spec stuff in rbuild. - Renamed currently preprocessed .spec files to .pspec and changed that in the .rbuild files appropriately - Renamed "IsWineModule" to "IsSpecDefinitionFile", the new name is more appropriate - Removed some chec
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: cfinck Date: Wed Oct 29 11:42:03 2008 New Revision: 37070 URL: http://svn.reactos.org/svn/reactos?rev=37070&view=rev Log: Don't decide whether to preprocess .spec files based on Kernel-Mode vs. User-Mode, but on the file extension. .pspec files are preprocessed now, while .spec files aren't. A change like this was already done in the amd64 branch before KJK rewrote the .spec stuff in rbuild. - Renamed currently preprocessed .spec files to .pspec and changed that in the .rbuild files appropriately - Renamed "IsWineModule" to "IsSpecDefinitionFile", the new name is more appropriate - Removed some checks for uppercased file extensions, we neither use them in our tree nor it will totally work as we only support them in a few places Commit dedicated to Timo ;-) Added: trunk/reactos/hal/hal/hal.pspec - copied unchanged from r37031, trunk/reactos/hal/hal/hal.spec trunk/reactos/ntoskrnl/ntoskrnl.pspec - copied unchanged from r37031, trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/subsystems/win32/win32k/win32k.pspec - copied unchanged from r37031, trunk/reactos/subsystems/win32/win32k/win32k.spec Removed: trunk/reactos/hal/hal/hal.spec trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/subsystems/win32/win32k/win32k.spec Modified: trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halarm/up/halup.rbuild trunk/reactos/hal/halx86/halmp.rbuild trunk/reactos/hal/halx86/halup.rbuild trunk/reactos/hal/halx86/halxbox.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/compilationunit.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=370… Removed: trunk/reactos/hal/hal/hal.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.spec?rev=37069… Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… Modified: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… Modified: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Removed: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Removed: trunk/reactos/subsystems/win32/win32k/win32k.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun…

1 0

[cfinck] 37069: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: cfinck Date: Wed Oct 29 11:31:50 2008 New Revision: 37069 URL: http://svn.reactos.org/svn/reactos?rev=37069&view=rev Log: Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c Modified: branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Wed Oct 29 11:31:50 2008 @@ -198,19 +198,12 @@ static VOID -GeneralOnInit(HWND hwnd, - PINFO pInfo) -{ - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hGeneralPage = hwnd; - +GeneralOnInit(PINFO pInfo) +{ SetWindowPos(pInfo->hGeneralPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -256,13 +249,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - GeneralOnInit(hDlg, (PINFO)lParam); + pInfo->hGeneralPage = hDlg; + GeneralOnInit(pInfo); return TRUE; case WM_COMMAND: @@ -746,23 +740,16 @@ static VOID -DisplayOnInit(HWND hwnd, - PINFO pInfo) +DisplayOnInit(PINFO pInfo) { DISPLAY_DEVICEW displayDevice; DWORD iDevNum = 0; BOOL GotDev = FALSE; - SetWindowLongPtrW(hwnd, - GWLP_USERDATA, - (LONG_PTR)pInfo); - - pInfo->hDisplayPage = hwnd; - SetWindowPos(pInfo->hDisplayPage, NULL, - 2, - 22, + 13, + 110, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); @@ -836,13 +823,14 @@ WPARAM wParam, LPARAM lParam) { - PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg, + PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), GWLP_USERDATA); switch (message) { case WM_INITDIALOG: - DisplayOnInit(hDlg, (PINFO)lParam); + pInfo->hDisplayPage = hDlg; + DisplayOnInit(pInfo); return TRUE; case WM_DRAWITEM: @@ -986,11 +974,10 @@ pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); if (pInfo->hTab) { - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_GENERAL), - pInfo->hTab, - (DLGPROC)GeneralDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_GENERAL), + hwnd, + (DLGPROC)GeneralDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM)); @@ -1001,11 +988,10 @@ (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); } - if (CreateDialogParamW(hInst, - MAKEINTRESOURCEW(IDD_DISPLAY), - pInfo->hTab, - (DLGPROC)DisplayDlgProc, - (LPARAM)pInfo)) + if (CreateDialogW(hInst, + MAKEINTRESOURCEW(IDD_DISPLAY), + hwnd, + (DLGPROC)DisplayDlgProc)) { WCHAR str[256]; ZeroMemory(&item, sizeof(TCITEM));

1 0

[sginsberg] 37068: - KeSetTimerEx: When canceling the insertion of an expired timer, don't forget to exit the dispatcher and return. Fixes crashes exposed by kernel32 Winetest "timer", caused by KiTimerTableListHead suddenly having broken entries. - Also fix a comment -- KiExitDispatcher doesn't release the dispatcher lock, it is done in KxInsertTimer
by sginsberg＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: sginsberg Date: Wed Oct 29 11:24:36 2008 New Revision: 37068 URL: http://svn.reactos.org/svn/reactos?rev=37068&view=rev Log: - KeSetTimerEx: When canceling the insertion of an expired timer, don't forget to exit the dispatcher and return. Fixes crashes exposed by kernel32 Winetest "timer", caused by KiTimerTableListHead suddenly having broken entries. - Also fix a comment -- KiExitDispatcher doesn't release the dispatcher lock, it is done in KxInsertTimer Modified: trunk/reactos/ntoskrnl/ke/timerobj.c Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Wed Oct 29 11:24:36 2008 @@ -398,6 +398,10 @@ /* Check if we need to do an interrupt */ if (RequestInterrupt) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Exit the dispatcher and return the old state */ + KiExitDispatcher(OldIrql); + return Inserted; } /* Set the time as Absolute */ @@ -419,7 +423,7 @@ Timer->Header.SignalState = FALSE; KxInsertTimer(Timer, Hand); - /* Release Dispatcher Lock */ + /* Exit the dispatcher */ KiExitDispatcher(OldIrql); /* Return old state */

1 0

[janderwald] 37067: - Improve error checking - Remove extensions which should be hidden (*.lnk) - CID 82
by janderwald＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: janderwald Date: Wed Oct 29 11:19:09 2008 New Revision: 37067 URL: http://svn.reactos.org/svn/reactos?rev=37067&view=rev Log: - Improve error checking - Remove extensions which should be hidden (*.lnk) - CID 82 Modified: trunk/reactos/dll/win32/shell32/shfldr_admintools.c Modified: trunk/reactos/dll/win32/shell32/shfldr_admintools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_a… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_admintools.c [iso-8859-1] Wed Oct 29 11:19:09 2008 @@ -424,8 +424,8 @@ if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) wcscpy(pszPath, This->szTarget); - else - HCR_GetClassNameW(&CLSID_AdminFolderShortcut, pszPath, MAX_PATH); + else if (!HCR_GetClassNameW(&CLSID_AdminFolderShortcut, pszPath, MAX_PATH)) + hr = E_FAIL; } else if (_ILIsPidlSimple(pidl)) { @@ -436,12 +436,23 @@ wcscpy(pszPath, This->szTarget); pOffset = PathAddBackslashW(pszPath); if (pOffset) - _ILSimpleGetTextW(pidl, pOffset, MAX_PATH + 1 - (pOffset - pszPath)); + { + if (!_ILSimpleGetTextW(pidl, pOffset, MAX_PATH + 1 - (pOffset - pszPath))) + hr = E_FAIL; + } + else + hr = E_FAIL; } else - { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH + 1); - } + { + if (_ILSimpleGetTextW(pidl, pszPath, MAX_PATH + 1)) + { + if (SHELL_FS_HideExtension(pszPath)) + PathRemoveExtensionW(pszPath); + } + else + hr = E_FAIL; + } } else if (_ILIsSpecialFolder(pidl)) { @@ -449,10 +460,10 @@ if (bSimplePidl) { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); - } - - if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) + if (!_ILSimpleGetTextW(pidl, pszPath, MAX_PATH)) + hr = E_FAIL; + } + else if ((dwFlags & SHGDN_FORPARSING) && !bSimplePidl) { int len = 0; @@ -473,11 +484,11 @@ { strRet->uType = STRRET_WSTR; strRet->u.pOleStr = pszPath; + TRACE ("-- (%p)->(%s,0x%08x)\n", This, debugstr_w(strRet->u.pOleStr), hr); } else CoTaskMemFree(pszPath); - TRACE ("-- (%p)->(%s,0x%08x)\n", This, debugstr_w(strRet->u.pOleStr), hr); return hr; }

1 0

[cfinck] 37066: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: cfinck Date: Wed Oct 29 11:17:20 2008 New Revision: 37066 URL: http://svn.reactos.org/svn/reactos?rev=37066&view=rev Log: - Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c Modified: branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 29 11:17:20 2008 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1" Modified: branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed Oct 29 11:17:20 2008 @@ -756,6 +756,7 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE);

1 0

[cfinck] 37065: Change the version to 0.3.7 (also in the Explorer start menu bitmap)
by cfinck＠svn.reactos.org 29 Oct '08

29 Oct '08

Author: cfinck Date: Wed Oct 29 11:15:19 2008 New Revision: 37065 URL: http://svn.reactos.org/svn/reactos?rev=37065&view=rev Log: Change the version to 0.3.7 (also in the Explorer start menu bitmap) Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_7/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_7/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/base/s… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_7/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/reactos/include/reactos/version.h [iso-8859-1] Wed Oct 29 11:15:19 2008 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 7 #define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

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